From 4ce6f0e15f669f52a2a1d0e4cea5b09a0b8f47b8 Mon Sep 17 00:00:00 2001 From: "rui.zheng" Date: Sat, 12 Aug 2017 21:39:08 +0800 Subject: [PATCH] fix typos --- cmd/gost/main.go | 8 ++++---- examples/forward/udp/cli.go | 2 +- node.go | 2 +- snapcraft.yaml | 9 ++++++--- ss.go | 2 +- ssh.go | 2 +- 6 files changed, 14 insertions(+), 11 deletions(-) diff --git a/cmd/gost/main.go b/cmd/gost/main.go index df08252..0b193ee 100644 --- a/cmd/gost/main.go +++ b/cmd/gost/main.go @@ -251,9 +251,9 @@ func serve(chain *gost.Chain) error { wsOpts.WriteBufferSize, _ = strconv.Atoi(node.Values.Get("wbuf")) ln, err = gost.WSSListener(node.Addr, tlsCfg, wsOpts) case "kcp": - config, err := parseKCPConfig(node.Values.Get("c")) - if err != nil { - return err + config, er := parseKCPConfig(node.Values.Get("c")) + if er != nil { + return er } ln, err = gost.KCPListener(node.Addr, config) case "ssh": @@ -314,7 +314,7 @@ func serve(chain *gost.Chain) error { return err } } else { - // By default allow for everyting + // By default allow for everything whitelist, _ = gost.ParsePermissions("*:*:*") } diff --git a/examples/forward/udp/cli.go b/examples/forward/udp/cli.go index 42dd16b..ff9c823 100644 --- a/examples/forward/udp/cli.go +++ b/examples/forward/udp/cli.go @@ -24,7 +24,7 @@ func main() { for i := 0; i < concurrency; i++ { go udpEchoLoop() } - select{} + select {} } func udpEchoLoop() { diff --git a/node.go b/node.go index 17bc187..32211b8 100644 --- a/node.go +++ b/node.go @@ -22,7 +22,7 @@ type Node struct { // ParseNode parses the node info. // The proxy node string pattern is [scheme://][user:pass@host]:port. -// Scheme can be devided into two parts by character '+', such as: http+tls. +// Scheme can be divided into two parts by character '+', such as: http+tls. func ParseNode(s string) (node Node, err error) { if !strings.Contains(s, "://") { s = "auto://" + s diff --git a/snapcraft.yaml b/snapcraft.yaml index ca7909b..b6dd77e 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -13,11 +13,14 @@ apps: plugs: [network, network-bind, home] parts: + go: + source-tag: go1.8.3 gost: + after: [go] source: . + source-type: git + source-branch: master plugin: go go-packages: [github.com/ginuerzh/gost/cmd/gost] go-importpath: github.com/ginuerzh/gost - after: [go] - go: - source-tag: go1.8.3 + diff --git a/ss.go b/ss.go index 079015d..e66a1d0 100644 --- a/ss.go +++ b/ss.go @@ -150,7 +150,7 @@ func (h *shadowHandler) Handle(conn net.Conn) { const ( idType = 0 // address type index - idIP0 = 1 // ip addres start index + idIP0 = 1 // ip address start index idDmLen = 1 // domain address length index idDm0 = 2 // domain address start index diff --git a/ssh.go b/ssh.go index b1a48be..a9604f3 100644 --- a/ssh.go +++ b/ssh.go @@ -17,7 +17,7 @@ import ( "golang.org/x/crypto/ssh" ) -// Applicaple SSH Request types for Port Forwarding - RFC 4254 7.X +// Applicable SSH Request types for Port Forwarding - RFC 4254 7.X const ( DirectForwardRequest = "direct-tcpip" // RFC 4254 7.2 RemoteForwardRequest = "tcpip-forward" // RFC 4254 7.1