diff --git a/cmd/frpc/sub/nathole.go b/cmd/frpc/sub/nathole.go index a07d6852..b76c8ab7 100644 --- a/cmd/frpc/sub/nathole.go +++ b/cmd/frpc/sub/nathole.go @@ -47,7 +47,7 @@ var natholeDiscoveryCmd = &cobra.Command{ Use: "discover", Short: "Discover nathole information from stun server", RunE: func(cmd *cobra.Command, args []string) error { - // ignore error here, because we can use command line pameters + // ignore error here, because we can use command line parameters cfg, _, _, _, err := config.LoadClientConfig(cfgFile, strictConfigMode) if err != nil { cfg = &v1.ClientCommonConfig{} diff --git a/server/service.go b/server/service.go index b0db0327..4eddbf28 100644 --- a/server/service.go +++ b/server/service.go @@ -193,7 +193,7 @@ func NewService(cfg *v1.ServerConfig) (*Service, error) { if err != nil { return nil, fmt.Errorf("create vhost tcpMuxer error, %v", err) } - log.Infof("tcpmux httpconnect multiplexer listen on %s, passthough: %v", address, cfg.TCPMuxPassthrough) + log.Infof("tcpmux httpconnect multiplexer listen on %s, passthrough: %v", address, cfg.TCPMuxPassthrough) } // Init all plugins diff --git a/test/e2e/legacy/basic/server.go b/test/e2e/legacy/basic/server.go index 4399439d..418910aa 100644 --- a/test/e2e/legacy/basic/server.go +++ b/test/e2e/legacy/basic/server.go @@ -28,7 +28,7 @@ var _ = ginkgo.Describe("[Feature: Server Manager]", func() { tcpPortName := port.GenName("TCP", port.WithRangePorts(10000, 11000)) udpPortName := port.GenName("UDP", port.WithRangePorts(12000, 13000)) clientConf += fmt.Sprintf(` - [tcp-allowded-in-range] + [tcp-allowed-in-range] type = tcp local_port = {{ .%s }} remote_port = {{ .%s }} diff --git a/test/e2e/pkg/ssh/client.go b/test/e2e/pkg/ssh/client.go index b45e39da..d2525871 100644 --- a/test/e2e/pkg/ssh/client.go +++ b/test/e2e/pkg/ssh/client.go @@ -75,11 +75,11 @@ func (c *TunnelClient) serveListener() { if err != nil { return } - go c.hanldeConn(conn) + go c.handleConn(conn) } } -func (c *TunnelClient) hanldeConn(conn net.Conn) { +func (c *TunnelClient) handleConn(conn net.Conn) { defer conn.Close() local, err := net.Dial("tcp", c.localAddr) if err != nil { diff --git a/test/e2e/v1/basic/server.go b/test/e2e/v1/basic/server.go index a3fe5992..274102a2 100644 --- a/test/e2e/v1/basic/server.go +++ b/test/e2e/v1/basic/server.go @@ -33,7 +33,7 @@ var _ = ginkgo.Describe("[Feature: Server Manager]", func() { udpPortName := port.GenName("UDP", port.WithRangePorts(12000, 13000)) clientConf += fmt.Sprintf(` [[proxies]] - name = "tcp-allowded-in-range" + name = "tcp-allowed-in-range" type = "tcp" localPort = {{ .%s }} remotePort = {{ .%s }}