Signed-off-by: arraykeys@gmail.com <arraykeys@gmail.com>

Update README.md

CHANGELOG

@@ -1,4 +1,11 @@
 proxy更新日志
+v3.8
+1.增加了日志输出到文件--log参数,比如: --log proxy.log,日志就会输出到proxy.log方便排除问题.
+
+v3.7
+1.修复了socks代理不能正常和上级代理通讯的问题.
+
+
 v3.6
 1.http(s),socks代理,集成了外部HTTP API认证,可以通过外部API对用户名和密码进行认证.
 2.手册http(s),socks代理认证部分增加了集成外部HTTP API认证的使用说明.

README.md

@@ -14,7 +14,8 @@ Proxy是golang实现的高性能http,https,websocket,tcp,udp,socks5代理服务
 - 多协议支持,支持HTTP(S),TCP,UDP,Websocket,SOCKS5代理.  
 - 支持内网穿透,协议支持TCP和UDP.  
 - SSH中转,HTTP(S),SOCKS5代理支持SSH中转,上级Linux服务器不需要任何服务端,本地一个proxy即可开心上网.  
-- 支持[KCP](https://github.com/xtaci/kcp-go)协议,HTTP(S),SOCKS5代理支持KCP协议传输数据,降低延迟,提升浏览体验.  
+- [KCP](https://github.com/xtaci/kcp-go)协议支持,HTTP(S),SOCKS5代理支持KCP协议传输数据,降低延迟,提升浏览体验.  
+- 集成外部API，HTTP(S),SOCKS5代理认证功能可以与外部HTTP API集成，可以方便的通过外部系统控制代理用户．  
   
 ### Why need these?  
 - 当由于某某原因,我们不能访问我们在其它地方的服务,我们可以通过多个相连的proxy节点建立起一个安全的隧道访问我们的服务.  
@@ -26,7 +27,7 @@ Proxy是golang实现的高性能http,https,websocket,tcp,udp,socks5代理服务
 - ...  
 
  
-本页是v3.6手册,其他版本手册请点击下面链接查看.  
+本页是v3.6-v3.7手册,其他版本手册请点击下面链接查看.  
 - [v3.5手册](https://github.com/snail007/goproxy/tree/v3.5)
 - [v3.4手册](https://github.com/snail007/goproxy/tree/v3.4)
 - [v3.3手册](https://github.com/snail007/goproxy/tree/v3.3)
@@ -35,6 +36,9 @@ Proxy是golang实现的高性能http,https,websocket,tcp,udp,socks5代理服务
 - [v3.0手册](https://github.com/snail007/goproxy/tree/v3.0)
 - [v2.x手册](https://github.com/snail007/goproxy/tree/v2.2)  
 
+### 怎么找到组织?  
+[点击加入交流组织](https://gitter.im/go-proxy/Lobby?utm_source=share-link&utm_medium=link&utm_campaign=share-link)  
+
 ### 安装 
 1. [快速安装](#自动安装)
 1. [手动安装](#手动安装)
@@ -119,7 +123,7 @@ wget https://github.com/reddec/monexec/releases/download/v0.1.1/monexec_0.1.1_li
 下载地址:https://github.com/snail007/goproxy/releases  
 ```shell  
 cd /root/proxy/  
-wget https://github.com/snail007/goproxy/releases/download/v3.6/proxy-linux-amd64.tar.gz  
+wget https://github.com/snail007/goproxy/releases/download/v3.8/proxy-linux-amd64.tar.gz  
 ```  
 #### **3.下载自动安装脚本**  
 ```shell  
@@ -399,7 +403,7 @@ VPS(IP:22.22.22.33)执行:
     `./proxy tserver --udp -r ":53@:53" -P "127.0.0.1:33080" -C proxy.crt -K proxy.key`  
 
 1. 在公司机器A上面执行  
-    `./proxy tclient --udp -P "22.22.22.22:33080" -C proxy.crt -K proxy.key`  
+    `./proxy tclient -P "22.22.22.22:33080" -C proxy.crt -K proxy.key`  
 
 1. 完成  
   
@@ -556,7 +560,7 @@ KCP协议需要-B参数设置一个密码用于加密解密数据
 
 ### TODO  
 - http,socks代理多个上级负载均衡?
-- 内网穿透server<->bridge心跳机制?
+- 内网穿透增加multiplexing模式?
 - 欢迎加群反馈...
 
 ### 如何使用源码?   

config.go

@@ -38,6 +38,8 @@ func initConfig() (err error) {
 	app.Author("snail").Version(APP_VERSION)
 	debug := app.Flag("debug", "debug log output").Default("false").Bool()
 	daemon := app.Flag("daemon", "run proxy in background").Default("false").Bool()
+	logfile := app.Flag("log", "log file path").Default("").String()
+
 	//########http#########
 	http := app.Command("http", "proxy on http mode")
 	httpArgs.Parent = http.Flag("parent", "parent address, such as: \"23.32.32.19:28008\"").Default("").Short('P').String()
@@ -102,6 +104,7 @@ func initConfig() (err error) {
 	tunnelServerArgs.IsUDP = tunnelServer.Flag("udp", "proxy on udp tunnel server mode").Default("false").Bool()
 	tunnelServerArgs.Key = tunnelServer.Flag("k", "client key").Default("default").String()
 	tunnelServerArgs.Route = tunnelServer.Flag("route", "local route to client's network, such as :PROTOCOL://LOCAL_IP:LOCAL_PORT@[CLIENT_KEY]CLIENT_LOCAL_HOST:CLIENT_LOCAL_PORT").Short('r').Default("").Strings()
+	tunnelServerArgs.Mux = tunnelServer.Flag("mux", "use multiplexing mode").Default("false").Bool()
 
 	//########tunnel-client#########
 	tunnelClient := app.Command("tclient", "proxy on tunnel client mode")
@@ -110,6 +113,7 @@ func initConfig() (err error) {
 	tunnelClientArgs.KeyFile = tunnelClient.Flag("key", "key file for tls").Short('K').Default("proxy.key").String()
 	tunnelClientArgs.Timeout = tunnelClient.Flag("timeout", "tcp timeout with milliseconds").Short('t').Default("2000").Int()
 	tunnelClientArgs.Key = tunnelClient.Flag("k", "key same with server").Default("default").String()
+	tunnelClientArgs.Mux = tunnelClient.Flag("mux", "use multiplexing mode").Default("false").Bool()
 
 	//########tunnel-bridge#########
 	tunnelBridge := app.Command("tbridge", "proxy on tunnel bridge mode")
@@ -117,6 +121,7 @@ func initConfig() (err error) {
 	tunnelBridgeArgs.KeyFile = tunnelBridge.Flag("key", "key file for tls").Short('K').Default("proxy.key").String()
 	tunnelBridgeArgs.Timeout = tunnelBridge.Flag("timeout", "tcp timeout with milliseconds").Short('t').Default("2000").Int()
 	tunnelBridgeArgs.Local = tunnelBridge.Flag("local", "local ip:port to listen").Short('p').Default(":33080").String()
+	tunnelBridgeArgs.Mux = tunnelBridge.Flag("mux", "use multiplexing mode").Default("false").Bool()
 
 	//########ssh#########
 	socks := app.Command("socks", "proxy on ssh mode")
@@ -168,7 +173,16 @@ func initConfig() (err error) {
 		flags |= log.Ltime
 	}
 	log.SetFlags(flags)
-	poster()
+
+	if *logfile != "" {
+		f, e := os.OpenFile(*logfile, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0600)
+		if e != nil {
+			log.Fatal(e)
+		}
+		log.SetOutput(f)
+	} else {
+		poster()
+	}
 	//regist services and run service
 	services.Regist("http", services.NewHTTP(), httpArgs)
 	services.Regist("tcp", services.NewTCP(), tcpArgs)

install_auto.sh

@@ -6,7 +6,7 @@ fi
 mkdir /tmp/proxy
 cd /tmp/proxy
 wget https://github.com/reddec/monexec/releases/download/v0.1.1/monexec_0.1.1_linux_amd64.tar.gz
-wget https://github.com/snail007/goproxy/releases/download/v3.6/proxy-linux-amd64.tar.gz
+wget https://github.com/snail007/goproxy/releases/download/v3.8/proxy-linux-amd64.tar.gz
 
 # install monexec
 tar zxvf monexec_0.1.1_linux_amd64.tar.gz

main.go

@@ -9,7 +9,7 @@ import (
 	"syscall"
 )
 
-const APP_VERSION = "3.6"
+const APP_VERSION = "3.8"
 
 func main() {
 	err := initConfig()

release.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-VER="3.6"
+VER="3.8"
 RELEASE="release-${VER}"
 rm -rf .cert
 mkdir .cert

services/args.go

@@ -16,6 +16,8 @@ const (
 	CONN_SERVER_HEARBEAT = uint8(3)
 	CONN_SERVER          = uint8(4)
 	CONN_CLIENT          = uint8(5)
+	CONN_SERVER_MUX      = uint8(6)
+	CONN_CLIENT_MUX      = uint8(7)
 )
 
 type TunnelServerArgs struct {
@@ -31,6 +33,7 @@ type TunnelServerArgs struct {
 	Timeout   *int
 	Route     *[]string
 	Mgr       *TunnelServerManager
+	Mux       *bool
 }
 type TunnelClientArgs struct {
 	Parent    *string
@@ -40,6 +43,7 @@ type TunnelClientArgs struct {
 	KeyBytes  []byte
 	Key       *string
 	Timeout   *int
+	Mux       *bool
 }
 type TunnelBridgeArgs struct {
 	Parent    *string
@@ -49,6 +53,7 @@ type TunnelBridgeArgs struct {
 	KeyBytes  []byte
 	Local     *string
 	Timeout   *int
+	Mux       *bool
 }
 type TCPArgs struct {
 	Parent              *string

services/socks.go

@@ -492,11 +492,11 @@ func (s *Socks) getOutConn(methodBytes, reqBytes []byte, host string) (outConn n
 			err = fmt.Errorf("write req detail fail,%s", err)
 			return
 		}
-		// _, err = outConn.Read(buf)
+		_, err = outConn.Read(buf)
-		// if err != nil {
+		if err != nil {
-		// 	err = fmt.Errorf("read req reply fail,%s", err)
+			err = fmt.Errorf("read req reply fail,%s", err)
-		// 	return
+			return
-		// }
+		}
 		//result := buf[:n]
 		//log.Printf("result:%v", result)
 

services/tunnel_bridge.go

@@ -17,8 +17,8 @@ type TunnelBridge struct {
 	cfg                TunnelBridgeArgs
 	serverConns        utils.ConcurrentMap
 	clientControlConns utils.ConcurrentMap
-	cmServer           utils.ConnManager
+	// cmServer           utils.ConnManager
-	cmClient           utils.ConnManager
+	// cmClient           utils.ConnManager
 }
 
 func NewTunnelBridge() Service {
@@ -26,8 +26,8 @@ func NewTunnelBridge() Service {
 		cfg:                TunnelBridgeArgs{},
 		serverConns:        utils.NewConcurrentMap(),
 		clientControlConns: utils.NewConcurrentMap(),
-		cmServer:           utils.NewConnManager(),
+		// cmServer:           utils.NewConnManager(),
-		cmClient:           utils.NewConnManager(),
+		// cmClient:           utils.NewConnManager(),
 	}
 }
 
@@ -92,7 +92,7 @@ func (s *TunnelBridge) Start(args interface{}) (err error) {
 					time.Sleep(time.Second * 3)
 					continue
 				} else {
-					s.cmServer.Add(serverID, ID, &inConn)
+					// s.cmServer.Add(serverID, ID, &inConn)
 					break
 				}
 			}
@@ -114,11 +114,11 @@ func (s *TunnelBridge) Start(args interface{}) (err error) {
 			serverConn := serverConnItem.(ServerConn).Conn
 			utils.IoBind(*serverConn, inConn, func(err interface{}) {
 				s.serverConns.Remove(ID)
-				s.cmClient.RemoveOne(key, ID)
+				// s.cmClient.RemoveOne(key, ID)
-				s.cmServer.RemoveOne(serverID, ID)
+				// s.cmServer.RemoveOne(serverID, ID)
 				log.Printf("conn %s released", ID)
 			})
-			s.cmClient.Add(key, ID, &inConn)
+			// s.cmClient.Add(key, ID, &inConn)
 			log.Printf("conn %s created", ID)
 
 		case CONN_CLIENT_CONTROL:
@@ -136,101 +136,101 @@ func (s *TunnelBridge) Start(args interface{}) (err error) {
 			s.clientControlConns.Set(key, &inConn)
 			log.Printf("set client %s control conn", key)
 
-		case CONN_SERVER_HEARBEAT:
+			// case CONN_SERVER_HEARBEAT:
-			var serverID string
+			// 	var serverID string
-			err = utils.ReadPacketData(reader, &serverID)
+			// 	err = utils.ReadPacketData(reader, &serverID)
-			if err != nil {
+			// 	if err != nil {
-				log.Printf("read error,ERR:%s", err)
+			// 		log.Printf("read error,ERR:%s", err)
-				return
+			// 		return
-			}
+			// 	}
-			log.Printf("server heartbeat connection, id: %s", serverID)
+			// 	log.Printf("server heartbeat connection, id: %s", serverID)
-			writeDie := make(chan bool)
+			// 	writeDie := make(chan bool)
-			readDie := make(chan bool)
+			// 	readDie := make(chan bool)
-			go func() {
+			// 	go func() {
-				for {
+			// 		for {
-					inConn.SetWriteDeadline(time.Now().Add(time.Second * 3))
+			// 			inConn.SetWriteDeadline(time.Now().Add(time.Second * 3))
-					_, err = inConn.Write([]byte{0x00})
+			// 			_, err = inConn.Write([]byte{0x00})
-					inConn.SetWriteDeadline(time.Time{})
+			// 			inConn.SetWriteDeadline(time.Time{})
-					if err != nil {
+			// 			if err != nil {
-						log.Printf("server heartbeat connection write err %s", err)
+			// 				log.Printf("server heartbeat connection write err %s", err)
-						break
+			// 				break
-					}
+			// 			}
-					time.Sleep(time.Second * 3)
+			// 			time.Sleep(time.Second * 3)
-				}
+			// 		}
-				close(writeDie)
+			// 		close(writeDie)
-			}()
+			// 	}()
-			go func() {
+			// 	go func() {
-				for {
+			// 		for {
-					signal := make([]byte, 1)
+			// 			signal := make([]byte, 1)
-					inConn.SetReadDeadline(time.Now().Add(time.Second * 6))
+			// 			inConn.SetReadDeadline(time.Now().Add(time.Second * 6))
-					_, err := inConn.Read(signal)
+			// 			_, err := inConn.Read(signal)
-					inConn.SetReadDeadline(time.Time{})
+			// 			inConn.SetReadDeadline(time.Time{})
-					if err != nil {
+			// 			if err != nil {
-						log.Printf("server heartbeat connection read err: %s", err)
+			// 				log.Printf("server heartbeat connection read err: %s", err)
-						break
+			// 				break
-					} else {
+			// 			} else {
-						// log.Printf("heartbeat from server ,id:%s", serverID)
+			// 				// log.Printf("heartbeat from server ,id:%s", serverID)
-					}
+			// 			}
-				}
+			// 		}
-				close(readDie)
+			// 		close(readDie)
-			}()
+			// 	}()
-			select {
+			// 	select {
-			case <-readDie:
+			// 	case <-readDie:
-			case <-writeDie:
+			// 	case <-writeDie:
-			}
+			// 	}
-			utils.CloseConn(&inConn)
+			// 	utils.CloseConn(&inConn)
-			s.cmServer.Remove(serverID)
+			// 	s.cmServer.Remove(serverID)
-			log.Printf("server heartbeat conn %s released", serverID)
+			// 	log.Printf("server heartbeat conn %s released", serverID)
-		case CONN_CLIENT_HEARBEAT:
+			// case CONN_CLIENT_HEARBEAT:
-			var clientID string
+			// 	var clientID string
-			err = utils.ReadPacketData(reader, &clientID)
+			// 	err = utils.ReadPacketData(reader, &clientID)
-			if err != nil {
+			// 	if err != nil {
-				log.Printf("read error,ERR:%s", err)
+			// 		log.Printf("read error,ERR:%s", err)
-				return
+			// 		return
-			}
+			// 	}
-			log.Printf("client heartbeat connection, id: %s", clientID)
+			// 	log.Printf("client heartbeat connection, id: %s", clientID)
-			writeDie := make(chan bool)
+			// 	writeDie := make(chan bool)
-			readDie := make(chan bool)
+			// 	readDie := make(chan bool)
-			go func() {
+			// 	go func() {
-				for {
+			// 		for {
-					inConn.SetWriteDeadline(time.Now().Add(time.Second * 3))
+			// 			inConn.SetWriteDeadline(time.Now().Add(time.Second * 3))
-					_, err = inConn.Write([]byte{0x00})
+			// 			_, err = inConn.Write([]byte{0x00})
-					inConn.SetWriteDeadline(time.Time{})
+			// 			inConn.SetWriteDeadline(time.Time{})
-					if err != nil {
+			// 			if err != nil {
-						log.Printf("client heartbeat connection write err %s", err)
+			// 				log.Printf("client heartbeat connection write err %s", err)
-						break
+			// 				break
-					}
+			// 			}
-					time.Sleep(time.Second * 3)
+			// 			time.Sleep(time.Second * 3)
-				}
+			// 		}
-				close(writeDie)
+			// 		close(writeDie)
-			}()
+			// 	}()
-			go func() {
+			// 	go func() {
-				for {
+			// 		for {
-					signal := make([]byte, 1)
+			// 			signal := make([]byte, 1)
-					inConn.SetReadDeadline(time.Now().Add(time.Second * 6))
+			// 			inConn.SetReadDeadline(time.Now().Add(time.Second * 6))
-					_, err := inConn.Read(signal)
+			// 			_, err := inConn.Read(signal)
-					inConn.SetReadDeadline(time.Time{})
+			// 			inConn.SetReadDeadline(time.Time{})
-					if err != nil {
+			// 			if err != nil {
-						log.Printf("client control connection read err: %s", err)
+			// 				log.Printf("client control connection read err: %s", err)
-						break
+			// 				break
-					} else {
+			// 			} else {
-						// log.Printf("heartbeat from client ,id:%s", clientID)
+			// 				// log.Printf("heartbeat from client ,id:%s", clientID)
-					}
+			// 			}
-				}
+			// 		}
-				close(readDie)
+			// 		close(readDie)
-			}()
+			// 	}()
-			select {
+			// 	select {
-			case <-readDie:
+			// 	case <-readDie:
-			case <-writeDie:
+			// 	case <-writeDie:
-			}
+			// 	}
-			utils.CloseConn(&inConn)
+			// 	utils.CloseConn(&inConn)
-			s.cmClient.Remove(clientID)
+			// 	s.cmClient.Remove(clientID)
-			if s.clientControlConns.Has(clientID) {
+			// 	if s.clientControlConns.Has(clientID) {
-				item, _ := s.clientControlConns.Get(clientID)
+			// 		item, _ := s.clientControlConns.Get(clientID)
-				(*item.(*net.Conn)).Close()
+			// 		(*item.(*net.Conn)).Close()
-			}
+			// 	}
-			s.clientControlConns.Remove(clientID)
+			// 	s.clientControlConns.Remove(clientID)
-			log.Printf("client heartbeat conn %s released", clientID)
+			// 	log.Printf("client heartbeat conn %s released", clientID)
 		}
 	})
 	if err != nil {

services/tunnel_client.go

@@ -11,79 +11,80 @@ import (
 )
 
 type TunnelClient struct {
-	cfg      TunnelClientArgs
+	cfg TunnelClientArgs
-	cm       utils.ConnManager
+	// cm       utils.ConnManager
 	ctrlConn net.Conn
 }
 
 func NewTunnelClient() Service {
 	return &TunnelClient{
 		cfg: TunnelClientArgs{},
-		cm:  utils.NewConnManager(),
+		// cm:  utils.NewConnManager(),
 	}
 }
 
 func (s *TunnelClient) InitService() {
-	s.InitHeartbeatDeamon()
+	// s.InitHeartbeatDeamon()
 }
-func (s *TunnelClient) InitHeartbeatDeamon() {
-	log.Printf("heartbeat started")
-	go func() {
-		var heartbeatConn net.Conn
-		var ID = *s.cfg.Key
-		for {
 
-			//close all connection
+// func (s *TunnelClient) InitHeartbeatDeamon() {
-			s.cm.RemoveAll()
+// 	log.Printf("heartbeat started")
-			if s.ctrlConn != nil {
+// 	go func() {
-				s.ctrlConn.Close()
+// 		var heartbeatConn net.Conn
-			}
+// 		var ID = *s.cfg.Key
-			utils.CloseConn(&heartbeatConn)
+// 		for {
-			heartbeatConn, err := s.GetInConn(CONN_CLIENT_HEARBEAT, ID)
+
-			if err != nil {
+// 			//close all connection
-				log.Printf("heartbeat connection err: %s, retrying...", err)
+// 			s.cm.RemoveAll()
-				time.Sleep(time.Second * 3)
+// 			if s.ctrlConn != nil {
-				utils.CloseConn(&heartbeatConn)
+// 				s.ctrlConn.Close()
-				continue
+// 			}
-			}
+// 			utils.CloseConn(&heartbeatConn)
-			log.Printf("heartbeat connection created,id:%s", ID)
+// 			heartbeatConn, err := s.GetInConn(CONN_CLIENT_HEARBEAT, ID)
-			writeDie := make(chan bool)
+// 			if err != nil {
-			readDie := make(chan bool)
+// 				log.Printf("heartbeat connection err: %s, retrying...", err)
-			go func() {
+// 				time.Sleep(time.Second * 3)
-				for {
+// 				utils.CloseConn(&heartbeatConn)
-					heartbeatConn.SetWriteDeadline(time.Now().Add(time.Second * 3))
+// 				continue
-					_, err = heartbeatConn.Write([]byte{0x00})
+// 			}
-					heartbeatConn.SetWriteDeadline(time.Time{})
+// 			log.Printf("heartbeat connection created,id:%s", ID)
-					if err != nil {
+// 			writeDie := make(chan bool)
-						log.Printf("heartbeat connection write err %s", err)
+// 			readDie := make(chan bool)
-						break
+// 			go func() {
-					}
+// 				for {
-					time.Sleep(time.Second * 3)
+// 					heartbeatConn.SetWriteDeadline(time.Now().Add(time.Second * 3))
-				}
+// 					_, err = heartbeatConn.Write([]byte{0x00})
-				close(writeDie)
+// 					heartbeatConn.SetWriteDeadline(time.Time{})
-			}()
+// 					if err != nil {
-			go func() {
+// 						log.Printf("heartbeat connection write err %s", err)
-				for {
+// 						break
-					signal := make([]byte, 1)
+// 					}
-					heartbeatConn.SetReadDeadline(time.Now().Add(time.Second * 6))
+// 					time.Sleep(time.Second * 3)
-					_, err := heartbeatConn.Read(signal)
+// 				}
-					heartbeatConn.SetReadDeadline(time.Time{})
+// 				close(writeDie)
-					if err != nil {
+// 			}()
-						log.Printf("heartbeat connection read err: %s", err)
+// 			go func() {
-						break
+// 				for {
-					} else {
+// 					signal := make([]byte, 1)
-						//log.Printf("heartbeat from bridge")
+// 					heartbeatConn.SetReadDeadline(time.Now().Add(time.Second * 6))
-					}
+// 					_, err := heartbeatConn.Read(signal)
-				}
+// 					heartbeatConn.SetReadDeadline(time.Time{})
-				close(readDie)
+// 					if err != nil {
-			}()
+// 						log.Printf("heartbeat connection read err: %s", err)
-			select {
+// 						break
-			case <-readDie:
+// 					} else {
-			case <-writeDie:
+// 						//log.Printf("heartbeat from bridge")
-			}
+// 					}
-		}
+// 				}
-	}()
+// 				close(readDie)
-}
+// 			}()
+// 			select {
+// 			case <-readDie:
+// 			case <-writeDie:
+// 			}
+// 		}
+// 	}()
+// }
 func (s *TunnelClient) CheckArgs() {
 	if *s.cfg.Parent != "" {
 		log.Printf("use tls parent %s", *s.cfg.Parent)
@@ -96,7 +97,7 @@ func (s *TunnelClient) CheckArgs() {
 	s.cfg.CertBytes, s.cfg.KeyBytes = utils.TlsBytes(*s.cfg.CertFile, *s.cfg.KeyFile)
 }
 func (s *TunnelClient) StopService() {
-	s.cm.RemoveAll()
+	// s.cm.RemoveAll()
 }
 func (s *TunnelClient) Start(args interface{}) (err error) {
 	s.cfg = args.(TunnelClientArgs)
@@ -106,7 +107,7 @@ func (s *TunnelClient) Start(args interface{}) (err error) {
 
 	for {
 		//close all conn
-		s.cm.Remove(*s.cfg.Key)
+		// s.cm.Remove(*s.cfg.Key)
 		if s.ctrlConn != nil {
 			s.ctrlConn.Close()
 		}
@@ -171,7 +172,7 @@ func (s *TunnelClient) ServeUDP(localAddr, ID, serverID string) {
 	var err error
 	// for {
 	for {
-		s.cm.RemoveOne(*s.cfg.Key, ID)
+		// s.cm.RemoveOne(*s.cfg.Key, ID)
 		inConn, err = s.GetInConn(CONN_CLIENT, *s.cfg.Key, ID, serverID)
 		if err != nil {
 			utils.CloseConn(&inConn)
@@ -182,7 +183,7 @@ func (s *TunnelClient) ServeUDP(localAddr, ID, serverID string) {
 			break
 		}
 	}
-	s.cm.Add(*s.cfg.Key, ID, &inConn)
+	// s.cm.Add(*s.cfg.Key, ID, &inConn)
 	log.Printf("conn %s created", ID)
 
 	for {
@@ -275,8 +276,8 @@ func (s *TunnelClient) ServeConn(localAddr, ID, serverID string) {
 	}
 	utils.IoBind(inConn, outConn, func(err interface{}) {
 		log.Printf("conn %s released", ID)
-		s.cm.RemoveOne(*s.cfg.Key, ID)
+		// s.cm.RemoveOne(*s.cfg.Key, ID)
 	})
-	s.cm.Add(*s.cfg.Key, ID, &inConn)
+	// s.cm.Add(*s.cfg.Key, ID, &inConn)
 	log.Printf("conn %s created", ID)
 }

services/tunnel_server.go

@@ -24,7 +24,7 @@ type TunnelServerManager struct {
 	udpChn   chan UDPItem
 	sc       utils.ServerChannel
 	serverID string
-	cm       utils.ConnManager
+	// cm       utils.ConnManager
 }
 
 func NewTunnelServerManager() Service {
@@ -32,7 +32,7 @@ func NewTunnelServerManager() Service {
 		cfg:      TunnelServerArgs{},
 		udpChn:   make(chan UDPItem, 50000),
 		serverID: utils.Uniqueid(),
-		cm:       utils.NewConnManager(),
+		// cm:       utils.NewConnManager(),
 	}
 }
 func (s *TunnelServerManager) Start(args interface{}) (err error) {
@@ -91,7 +91,7 @@ func (s *TunnelServerManager) Clean() {
 	s.StopService()
 }
 func (s *TunnelServerManager) StopService() {
-	s.cm.RemoveAll()
+	// s.cm.RemoveAll()
 }
 func (s *TunnelServerManager) CheckArgs() {
 	if *s.cfg.CertFile == "" || *s.cfg.KeyFile == "" {
@@ -100,62 +100,63 @@ func (s *TunnelServerManager) CheckArgs() {
 	s.cfg.CertBytes, s.cfg.KeyBytes = utils.TlsBytes(*s.cfg.CertFile, *s.cfg.KeyFile)
 }
 func (s *TunnelServerManager) InitService() {
-	s.InitHeartbeatDeamon()
+	// s.InitHeartbeatDeamon()
-}
-func (s *TunnelServerManager) InitHeartbeatDeamon() {
-	log.Printf("heartbeat started")
-	go func() {
-		var heartbeatConn net.Conn
-		var ID string
-		for {
-			//close all connection
-			s.cm.Remove(ID)
-			utils.CloseConn(&heartbeatConn)
-			heartbeatConn, ID, err := s.GetOutConn(CONN_SERVER_HEARBEAT)
-			if err != nil {
-				log.Printf("heartbeat connection err: %s, retrying...", err)
-				time.Sleep(time.Second * 3)
-				utils.CloseConn(&heartbeatConn)
-				continue
-			}
-			log.Printf("heartbeat connection created,id:%s", ID)
-			writeDie := make(chan bool)
-			readDie := make(chan bool)
-			go func() {
-				for {
-					heartbeatConn.SetWriteDeadline(time.Now().Add(time.Second * 3))
-					_, err = heartbeatConn.Write([]byte{0x00})
-					heartbeatConn.SetWriteDeadline(time.Time{})
-					if err != nil {
-						log.Printf("heartbeat connection write err %s", err)
-						break
-					}
-					time.Sleep(time.Second * 3)
-				}
-				close(writeDie)
-			}()
-			go func() {
-				for {
-					signal := make([]byte, 1)
-					heartbeatConn.SetReadDeadline(time.Now().Add(time.Second * 6))
-					_, err := heartbeatConn.Read(signal)
-					heartbeatConn.SetReadDeadline(time.Time{})
-					if err != nil {
-						log.Printf("heartbeat connection read err: %s", err)
-						break
-					} else {
-						// log.Printf("heartbeat from bridge")
-					}
-				}
-				close(readDie)
-			}()
-			select {
-			case <-readDie:
-			case <-writeDie:
-			}
-		}
-	}()
 }
+
+// func (s *TunnelServerManager) InitHeartbeatDeamon() {
+// 	log.Printf("heartbeat started")
+// 	go func() {
+// 		var heartbeatConn net.Conn
+// 		var ID string
+// 		for {
+// 			//close all connection
+// 			s.cm.Remove(ID)
+// 			utils.CloseConn(&heartbeatConn)
+// 			heartbeatConn, ID, err := s.GetOutConn(CONN_SERVER_HEARBEAT)
+// 			if err != nil {
+// 				log.Printf("heartbeat connection err: %s, retrying...", err)
+// 				time.Sleep(time.Second * 3)
+// 				utils.CloseConn(&heartbeatConn)
+// 				continue
+// 			}
+// 			log.Printf("heartbeat connection created,id:%s", ID)
+// 			writeDie := make(chan bool)
+// 			readDie := make(chan bool)
+// 			go func() {
+// 				for {
+// 					heartbeatConn.SetWriteDeadline(time.Now().Add(time.Second * 3))
+// 					_, err = heartbeatConn.Write([]byte{0x00})
+// 					heartbeatConn.SetWriteDeadline(time.Time{})
+// 					if err != nil {
+// 						log.Printf("heartbeat connection write err %s", err)
+// 						break
+// 					}
+// 					time.Sleep(time.Second * 3)
+// 				}
+// 				close(writeDie)
+// 			}()
+// 			go func() {
+// 				for {
+// 					signal := make([]byte, 1)
+// 					heartbeatConn.SetReadDeadline(time.Now().Add(time.Second * 6))
+// 					_, err := heartbeatConn.Read(signal)
+// 					heartbeatConn.SetReadDeadline(time.Time{})
+// 					if err != nil {
+// 						log.Printf("heartbeat connection read err: %s", err)
+// 						break
+// 					} else {
+// 						// log.Printf("heartbeat from bridge")
+// 					}
+// 				}
+// 				close(readDie)
+// 			}()
+// 			select {
+// 			case <-readDie:
+// 			case <-writeDie:
+// 			}
+// 		}
+// 	}()
+// }
 func (s *TunnelServerManager) GetOutConn(typ uint8) (outConn net.Conn, ID string, err error) {
 	outConn, err = s.GetConn()
 	if err != nil {
@@ -241,11 +242,11 @@ func (s *TunnelServer) Start(args interface{}) (err error) {
 				}
 			}
 			utils.IoBind(inConn, outConn, func(err interface{}) {
-				s.cfg.Mgr.cm.RemoveOne(s.cfg.Mgr.serverID, ID)
+				// s.cfg.Mgr.cm.RemoveOne(s.cfg.Mgr.serverID, ID)
 				log.Printf("%s conn %s released", *s.cfg.Key, ID)
 			})
 			//add conn
-			s.cfg.Mgr.cm.Add(s.cfg.Mgr.serverID, ID, &inConn)
+			// s.cfg.Mgr.cm.Add(s.cfg.Mgr.serverID, ID, &inConn)
 			log.Printf("%s conn %s created", *s.cfg.Key, ID)
 		})
 		if err != nil {

utils/functions.go

@@ -42,7 +42,8 @@ func IoBind(dst io.ReadWriteCloser, src io.ReadWriteCloser, fn func(err interfac
 					log.Printf("bind crashed %s", err)
 				}
 			}()
-			_, err := io.Copy(dst, src)
+			//_, err := io.Copy(dst, src)
+			err := ioCopy(dst, src)
 			e1 <- err
 		}()
 		go func() {
@@ -51,7 +52,8 @@ func IoBind(dst io.ReadWriteCloser, src io.ReadWriteCloser, fn func(err interfac
 					log.Printf("bind crashed %s", err)
 				}
 			}()
-			_, err := io.Copy(src, dst)
+			//_, err := io.Copy(src, dst)
+			err := ioCopy(src, dst)
 			e2 <- err
 		}()
 		var err interface{}