diff options
Diffstat (limited to 'pkg/server/module')
| -rw-r--r-- | pkg/server/module/alpha.go | 8 | ||||
| -rw-r--r-- | pkg/server/module/auth.go | 26 | ||||
| -rw-r--r-- | pkg/server/module/hex.go | 2 | ||||
| -rw-r--r-- | pkg/server/module/module.go | 12 |
4 files changed, 24 insertions, 24 deletions
diff --git a/pkg/server/module/alpha.go b/pkg/server/module/alpha.go index 9eb1e2c..4552c50 100644 --- a/pkg/server/module/alpha.go +++ b/pkg/server/module/alpha.go @@ -1,14 +1,14 @@ package module import ( - "tunnel/pkg/server/queue" - "unicode" "bufio" "io" + "tunnel/pkg/server/queue" + "unicode" ) -func alpha(cb func (rune) rune) Pipe { - return func (rq, wq queue.Q) error { +func alpha(cb func(rune) rune) Pipe { + return func(rq, wq queue.Q) error { r := bufio.NewReader(rq.Reader()) for { diff --git a/pkg/server/module/auth.go b/pkg/server/module/auth.go index 5dbdccb..f167874 100644 --- a/pkg/server/module/auth.go +++ b/pkg/server/module/auth.go @@ -1,16 +1,16 @@ package module import ( - "tunnel/pkg/server/queue" - "tunnel/pkg/server/opts" - "tunnel/pkg/server/env" - "tunnel/pkg/netstring" - "encoding/hex" - "crypto/rand" "crypto/md5" + "crypto/rand" + "encoding/hex" "errors" "fmt" "io" + "tunnel/pkg/netstring" + "tunnel/pkg/server/env" + "tunnel/pkg/server/opts" + "tunnel/pkg/server/queue" ) const ChallengeLen = 16 @@ -26,10 +26,10 @@ type auth struct { hash string recvChallenge chan struct{} - recvHash chan struct{} + recvHash chan struct{} fail chan struct{} - ok chan struct{} + ok chan struct{} } var errDupChallenge = errors.New("peer duplicates challenge") @@ -150,17 +150,17 @@ func getAuthSecret(env env.Env) string { func (m authModule) Open(env env.Env) (Pipe, Pipe) { a := &auth{ - secret: getAuthSecret(env), + secret: getAuthSecret(env), recvChallenge: make(chan struct{}), - recvHash: make(chan struct{}), - fail: make(chan struct{}), - ok: make(chan struct{}), + recvHash: make(chan struct{}), + fail: make(chan struct{}), + ok: make(chan struct{}), } return a.Send, a.Recv } func init() { - register("auth", func (opts.Opts, env.Env) (module, error) { + register("auth", func(opts.Opts, env.Env) (module, error) { return authModule{}, nil }) } diff --git a/pkg/server/module/hex.go b/pkg/server/module/hex.go index 9b80e0d..b632c11 100644 --- a/pkg/server/module/hex.go +++ b/pkg/server/module/hex.go @@ -1,8 +1,8 @@ package module import ( - "tunnel/pkg/server/queue" "encoding/hex" + "tunnel/pkg/server/queue" ) func hexEncoder(rq, wq queue.Q) error { diff --git a/pkg/server/module/module.go b/pkg/server/module/module.go index 87bdd20..69fb90b 100644 --- a/pkg/server/module/module.go +++ b/pkg/server/module/module.go @@ -1,14 +1,14 @@ package module import ( - "tunnel/pkg/server/queue" - "tunnel/pkg/server/opts" - "tunnel/pkg/server/env" "fmt" "log" + "tunnel/pkg/server/env" + "tunnel/pkg/server/opts" + "tunnel/pkg/server/queue" ) -type moduleInitFunc func (opts.Opts, env.Env) (module, error) +type moduleInitFunc func(opts.Opts, env.Env) (module, error) var modules = map[string]moduleInitFunc{} @@ -21,7 +21,7 @@ type M interface { String() string } -type Pipe func (rq, wq queue.Q) error +type Pipe func(rq, wq queue.Q) error func (p Pipe) Open(env env.Env) (Pipe, Pipe) { return p, nil @@ -58,7 +58,7 @@ func register(name string, f moduleInitFunc) { } func registerPipe(name string, p Pipe) { - register(name, func (opts.Opts, env.Env) (module, error) { + register(name, func(opts.Opts, env.Env) (module, error) { return p, nil }) } |
