diff options
| -rw-r--r-- | TODO | 1 | ||||
| -rw-r--r-- | pkg/config/config.go | 2 | ||||
| -rw-r--r-- | pkg/server/hook/look-http.go | 58 | ||||
| -rw-r--r-- | pkg/server/tunnel.go | 6 |
4 files changed, 63 insertions, 4 deletions
@@ -46,3 +46,4 @@ note: DONE group owner of socket dir/file command line option for socket 18. systemd socket activation +19. implement simple client, server protocol instead of unixpacket diff --git a/pkg/config/config.go b/pkg/config/config.go index 906c4b9..5184b7e 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -8,7 +8,7 @@ import ( const TimeFormat = "2006-01-02/15:04:05" -const BufSize = 1024 +const BufSize = 64 * 1024 const IoTimeout = 5 * time.Second diff --git a/pkg/server/hook/look-http.go b/pkg/server/hook/look-http.go new file mode 100644 index 0000000..d467563 --- /dev/null +++ b/pkg/server/hook/look-http.go @@ -0,0 +1,58 @@ +package hook + +import ( + "bufio" + "strings" + "tunnel/pkg/server/env" + "tunnel/pkg/server/opts" + "tunnel/pkg/server/queue" +) + +type lookHttpHook struct{} + +type lookHttp struct { + env env.Env +} + +func (look *lookHttp) Send(rq, wq queue.Q) error { + q := queue.New() + s := bufio.NewScanner(q.Reader()) + + go func() { + for b := range rq { + q <- b + wq <- b + } + + close(q) + }() + + if s.Scan() { + if w := strings.Split(s.Text(), " "); len(w) > 1 { + switch m := strings.ToUpper(w[0]); m { + case "CONNECT", "GET", "POST": + look.env.Set("look.info", m+" "+w[1]) + } + } + } + + q.Dry() + + return nil +} + +func (look *lookHttp) Recv(rq, wq queue.Q) error { + return queue.Copy(rq, wq) +} + +func (lookHttpHook) Open(env env.Env) (interface{}, error) { + return &lookHttp{env: env}, nil +} + +func newLookHttpHook(opts opts.Opts, env env.Env) (hook, error) { + return lookHttpHook{}, nil +} + +func init() { + register("look-http", newLookHttpHook) +} diff --git a/pkg/server/tunnel.go b/pkg/server/tunnel.go index 1bb21b4..79734b9 100644 --- a/pkg/server/tunnel.go +++ b/pkg/server/tunnel.go @@ -203,8 +203,8 @@ func (s *stream) info() string { d = s.until.Sub(s.since).Milliseconds() } - return fmt.Sprintf("%.3fs %d/%d -> %d/%d", - float64(d)/1000.0, + return fmt.Sprintf("%.3fs [%s] %d/%d -> %d/%d", + float64(d)/1000.0, s.env.Get("look.info"), s.m.in.tx, s.m.in.rx, s.m.out.rx, @@ -501,7 +501,7 @@ func showRecent(r *request) { foreachTunnel(r.c.s.tunnels, func(t *tunnel) { t.mu.Lock() streams = append(streams, t.recent...) - defer t.mu.Unlock() + t.mu.Unlock() }) sort.SliceStable(streams, func(i, j int) bool { |