From e2f0fe71f4a58892238cf34d1d1e0bc495c23201 Mon Sep 17 00:00:00 2001 From: "arraykeys@gmail.com" Date: Mon, 30 Oct 2017 14:20:13 +0800 Subject: [PATCH] Signed-off-by: arraykeys@gmail.com --- CHANGELOG | 3 +++ main.go | 2 +- release.sh | 2 +- services/tunnel_client.go | 2 +- utils/functions.go | 11 +++++++++-- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 8977cda..6c8313b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,7 @@ proxy更新日志 +v3.5 +1.优化了kcp参数,速度有所提升. + v3.4 1.tcp代理增加了kcp协议传输数据. 2.优化了死循环检查,增加了添加本地IP参数,当VPS在nat设备后面, diff --git a/main.go b/main.go index e72f370..9da43dd 100644 --- a/main.go +++ b/main.go @@ -9,7 +9,7 @@ import ( "syscall" ) -const APP_VERSION = "3.4" +const APP_VERSION = "3.5" func main() { err := initConfig() diff --git a/release.sh b/release.sh index c194392..cfc1aee 100755 --- a/release.sh +++ b/release.sh @@ -1,5 +1,5 @@ #!/bin/bash -VER="3.4" +VER="3.5" RELEASE="release-${VER}" rm -rf .cert mkdir .cert diff --git a/services/tunnel_client.go b/services/tunnel_client.go index ea5a080..d51f7df 100644 --- a/services/tunnel_client.go +++ b/services/tunnel_client.go @@ -72,7 +72,7 @@ func (s *TunnelClient) InitHeartbeatDeamon() { log.Printf("heartbeat connection read err: %s", err) break } else { - log.Printf("heartbeat from bridge") + //log.Printf("heartbeat from bridge") } } close(readDie) diff --git a/utils/functions.go b/utils/functions.go index eabeab9..afa0635 100755 --- a/utils/functions.go +++ b/utils/functions.go @@ -119,8 +119,15 @@ func ConnectHost(hostAndPort string, timeout int) (conn net.Conn, err error) { return } func ConnectKCPHost(hostAndPort, method, key string) (conn net.Conn, err error) { - conn, err = kcp.DialWithOptions(hostAndPort, GetKCPBlock(method, key), 10, 3) - return + kcpconn, err := kcp.DialWithOptions(hostAndPort, GetKCPBlock(method, key), 10, 3) + if err != nil { + return + } + kcpconn.SetNoDelay(1, 40, 0, 1) + kcpconn.SetWindowSize(128, 512) + kcpconn.SetMtu(1400) + kcpconn.SetACKNoDelay(false) + return kcpconn, err } func ListenTls(ip string, port int, certBytes, keyBytes []byte) (ln *net.Listener, err error) { var cert tls.Certificate