From 2c5259a594f5d8ddf12691deb6a79a0b566f024e Mon Sep 17 00:00:00 2001 From: Mikhail Osipov Date: Thu, 7 May 2020 01:06:07 +0300 Subject: rename look to info --- pkg/server/hook/info-http.go | 55 ++++++++++++++++++++++++++++++++++++++++++++ pkg/server/hook/look-http.go | 55 -------------------------------------------- pkg/server/tunnel.go | 2 +- 3 files changed, 56 insertions(+), 56 deletions(-) create mode 100644 pkg/server/hook/info-http.go delete mode 100644 pkg/server/hook/look-http.go (limited to 'pkg') diff --git a/pkg/server/hook/info-http.go b/pkg/server/hook/info-http.go new file mode 100644 index 0000000..7941072 --- /dev/null +++ b/pkg/server/hook/info-http.go @@ -0,0 +1,55 @@ +package hook + +import ( + "bufio" + "tunnel/pkg/http" + "tunnel/pkg/server/env" + "tunnel/pkg/server/opts" + "tunnel/pkg/server/queue" +) + +type infoHttpHook struct{} + +type infoHttp struct { + env env.Env +} + +func (info *infoHttp) 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 method, uri, _, ok := http.ParseRequestLine(s.Text()); ok { + info.env.Set("info", method+" "+uri) + } + } + + q.Dry() + + return nil +} + +func (info *infoHttp) Recv(rq, wq queue.Q) error { + return queue.Copy(rq, wq) +} + +func (infoHttpHook) Open(env env.Env) (interface{}, error) { + return &infoHttp{env: env}, nil +} + +func newInfoHttpHook(opts opts.Opts, env env.Env) (hook, error) { + return infoHttpHook{}, nil +} + +func init() { + register("info-http", newInfoHttpHook) +} diff --git a/pkg/server/hook/look-http.go b/pkg/server/hook/look-http.go deleted file mode 100644 index 50ec663..0000000 --- a/pkg/server/hook/look-http.go +++ /dev/null @@ -1,55 +0,0 @@ -package hook - -import ( - "bufio" - "tunnel/pkg/http" - "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 method, uri, _, ok := http.ParseRequestLine(s.Text()); ok { - look.env.Set("look.info", method+" "+uri) - } - } - - 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 e47215e..309c272 100644 --- a/pkg/server/tunnel.go +++ b/pkg/server/tunnel.go @@ -205,7 +205,7 @@ func (s *stream) info() string { } return fmt.Sprintf("%.3fs [%s] %d/%d -> %d/%d", - float64(d)/1000.0, s.env.Get("look.info"), + float64(d)/1000.0, s.env.Get("info"), s.m.in.tx, s.m.in.rx, s.m.out.rx, -- cgit v1.2.3-70-g09d2