diff --git a/sdk/android-ios/dns.go b/sdk/android-ios/dns.go index abd843f..508e914 100644 --- a/sdk/android-ios/dns.go +++ b/sdk/android-ios/dns.go @@ -92,7 +92,7 @@ func (s *DNS) InitService() (err error) { nil, &net.Dialer{ Timeout: 5 * time.Second, - KeepAlive: 5 * time.Second, + KeepAlive: 2 * time.Second, }, ) if err != nil { @@ -133,7 +133,7 @@ func (s *DNS) StopService() { if e != nil { s.log.Printf("stop dns service crashed,%s", e) } else { - s.log.Printf("service dns stoped") + s.log.Printf("service dns stopped") } }() Stop(s.serviceKey) diff --git a/sdk/android-ios/sdk.go b/sdk/android-ios/sdk.go index f05b701..57ef6b4 100644 --- a/sdk/android-ios/sdk.go +++ b/sdk/android-ios/sdk.go @@ -85,8 +85,8 @@ func StartWithLog(serviceID, serviceArgsStr string, loggerCallback LogCallback) nolog := app.Flag("nolog", "turn off logging").Default("false").Bool() kcpArgs.Key = app.Flag("kcp-key", "pre-shared secret between client and server").Default("secrect").String() kcpArgs.Crypt = app.Flag("kcp-method", "encrypt/decrypt method, can be: aes, aes-128, aes-192, salsa20, blowfish, twofish, cast5, 3des, tea, xtea, xor, sm4, none").Default("aes").Enum("aes", "aes-128", "aes-192", "salsa20", "blowfish", "twofish", "cast5", "3des", "tea", "xtea", "xor", "sm4", "none") - kcpArgs.Mode = app.Flag("kcp-mode", "profiles: fast3, fast2, fast, normal, manual").Default("fast").Enum("fast3", "fast2", "fast", "normal", "manual") - kcpArgs.MTU = app.Flag("kcp-mtu", "set maximum transmission unit for UDP packets").Default("450").Int() + kcpArgs.Mode = app.Flag("kcp-mode", "profiles: fast3, fast2, fast, normal, manual").Default("fast3").Enum("fast3", "fast2", "fast", "normal", "manual") + kcpArgs.MTU = app.Flag("kcp-mtu", "set maximum transmission unit for UDP packets").Default("1350").Int() kcpArgs.SndWnd = app.Flag("kcp-sndwnd", "set send window size(num of packets)").Default("1024").Int() kcpArgs.RcvWnd = app.Flag("kcp-rcvwnd", "set receive window size(num of packets)").Default("1024").Int() kcpArgs.DataShard = app.Flag("kcp-ds", "set reed-solomon erasure coding - datashard").Default("10").Int() diff --git a/services/http/http.go b/services/http/http.go index 16ca2c4..405aaed 100644 --- a/services/http/http.go +++ b/services/http/http.go @@ -238,7 +238,7 @@ func (s *HTTP) StopService() { if e != nil { s.log.Printf("stop http(s) service crashed,%s", e) } else { - s.log.Printf("service http(s) stoped") + s.log.Printf("service http(s) stopped") } s.basicAuth = utils.BasicAuth{} s.cfg = HTTPArgs{} @@ -425,7 +425,7 @@ func (s *HTTP) OutToTCP(useProxy bool, address string, inConn *net.Conn, req *ut //https或者http,上级是代理,proxy需要转发 outConn.SetDeadline(time.Now().Add(time.Millisecond * time.Duration(*s.cfg.Timeout))) //直连目标或上级非代理或非SNI,,清理HTTP头部的代理头信息 - if !useProxy || *s.cfg.ParentType == "ssh" && !req.IsSNI { + if (!useProxy || *s.cfg.ParentType == "ssh") && !req.IsSNI { _, err = outConn.Write(utils.RemoveProxyHeaders(req.HeadBuf)) } else { _, err = outConn.Write(req.HeadBuf) diff --git a/services/mux/mux_bridge.go b/services/mux/mux_bridge.go index c3f76c6..c31c241 100644 --- a/services/mux/mux_bridge.go +++ b/services/mux/mux_bridge.go @@ -81,7 +81,7 @@ func (s *MuxBridge) StopService() { if e != nil { s.log.Printf("stop bridge service crashed,%s", e) } else { - s.log.Printf("service bridge stoped") + s.log.Printf("service bridge stopped") } s.cfg = MuxBridgeArgs{} s.clientControlConns = nil diff --git a/services/mux/mux_client.go b/services/mux/mux_client.go index 1cdcaf6..46a45ec 100644 --- a/services/mux/mux_client.go +++ b/services/mux/mux_client.go @@ -111,7 +111,7 @@ func (s *MuxClient) StopService() { if e != nil { s.log.Printf("stop client service crashed,%s", e) } else { - s.log.Printf("service client stoped") + s.log.Printf("service client stopped") } s.cfg = MuxClientArgs{} s.jumper = nil diff --git a/services/mux/mux_server.go b/services/mux/mux_server.go index 5d5fb2f..8f4ce87 100644 --- a/services/mux/mux_server.go +++ b/services/mux/mux_server.go @@ -207,7 +207,7 @@ func (s *MuxServer) StopService() { if e != nil { s.log.Printf("stop server service crashed,%s", e) } else { - s.log.Printf("service server stoped") + s.log.Printf("service server stopped") } s.cfg = MuxServerArgs{} s.jumper = nil diff --git a/services/socks/socks.go b/services/socks/socks.go index a0c4a40..92eefe0 100644 --- a/services/socks/socks.go +++ b/services/socks/socks.go @@ -230,7 +230,7 @@ func (s *Socks) StopService() { if e != nil { s.log.Printf("stop socks service crashed,%s", e) } else { - s.log.Printf("service socks stoped") + s.log.Printf("service socks stopped") } s.basicAuth = utils.BasicAuth{} s.cfg = SocksArgs{} diff --git a/services/sps/sps.go b/services/sps/sps.go index e9d40e3..12c5bbf 100644 --- a/services/sps/sps.go +++ b/services/sps/sps.go @@ -193,7 +193,7 @@ func (s *SPS) StopService() { if e != nil { s.log.Printf("stop sps service crashed,%s", e) } else { - s.log.Printf("service sps stoped") + s.log.Printf("service sps stopped") } s.basicAuth = utils.BasicAuth{} s.cfg = SPSArgs{} @@ -254,7 +254,7 @@ func (s *SPS) Start(args interface{}, log *logger.Logger) (err error) { err = sc.ListenTCP(s.callback) } else if *s.cfg.LocalType == "tls" { err = sc.ListenTLS(s.cfg.CertBytes, s.cfg.KeyBytes, s.cfg.CaCertBytes, s.callback) - } else if *s.cfg.LocalType == "tcp" { + } else if *s.cfg.LocalType == "kcp" { err = sc.ListenKCP(s.cfg.KCP, s.callback, s.log) } if *s.cfg.ParentServiceType == "socks" { diff --git a/services/tcp/tcp.go b/services/tcp/tcp.go index c6ae279..1325aaf 100644 --- a/services/tcp/tcp.go +++ b/services/tcp/tcp.go @@ -100,7 +100,7 @@ func (s *TCP) StopService() { if e != nil { s.log.Printf("stop tcp service crashed,%s", e) } else { - s.log.Printf("service tcp stoped") + s.log.Printf("service tcp stopped") } s.cfg = TCPArgs{} s.jumper = nil diff --git a/services/tunnel/tunnel_bridge.go b/services/tunnel/tunnel_bridge.go index 5cdc7f3..3f29994 100644 --- a/services/tunnel/tunnel_bridge.go +++ b/services/tunnel/tunnel_bridge.go @@ -72,7 +72,7 @@ func (s *TunnelBridge) StopService() { if e != nil { s.log.Printf("stop tbridge service crashed,%s", e) } else { - s.log.Printf("service tbridge stoped") + s.log.Printf("service tbridge stopped") } s.cfg = TunnelBridgeArgs{} s.clientControlConns = nil diff --git a/services/tunnel/tunnel_client.go b/services/tunnel/tunnel_client.go index 3787685..f00e8a0 100644 --- a/services/tunnel/tunnel_client.go +++ b/services/tunnel/tunnel_client.go @@ -95,7 +95,7 @@ func (s *TunnelClient) StopService() { if e != nil { s.log.Printf("stop tclient service crashed,%s", e) } else { - s.log.Printf("service tclient stoped") + s.log.Printf("service tclient stopped") } s.cfg = TunnelClientArgs{} s.ctrlConn = nil diff --git a/services/tunnel/tunnel_server.go b/services/tunnel/tunnel_server.go index f6d13ce..442848d 100644 --- a/services/tunnel/tunnel_server.go +++ b/services/tunnel/tunnel_server.go @@ -176,7 +176,7 @@ func (s *TunnelServer) StopService() { if e != nil { s.log.Printf("stop server service crashed,%s", e) } else { - s.log.Printf("service server stoped") + s.log.Printf("service server stopped") } s.cfg = TunnelServerArgs{} s.jumper = nil diff --git a/services/udp/udp.go b/services/udp/udp.go index f585b9a..1382dec 100644 --- a/services/udp/udp.go +++ b/services/udp/udp.go @@ -94,7 +94,7 @@ func (s *UDP) StopService() { if e != nil { s.log.Printf("stop udp service crashed,%s", e) } else { - s.log.Printf("service udp stoped") + s.log.Printf("service udp stopped") } s.cfg = UDPArgs{} s.log = nil