support tcp stream multiplexing by smux

models/config/client_common.go

@@ -36,6 +36,7 @@ type ClientCommonConf struct {
 	LogMaxDays        int64
 	PrivilegeToken    string
 	PoolCount         int
+	TcpMux            bool
 	User              string
 	HeartBeatInterval int64
 	HeartBeatTimeout  int64
@@ -53,6 +54,7 @@ func GetDeaultClientCommonConf() *ClientCommonConf {
 		LogMaxDays:        3,
 		PrivilegeToken:    "",
 		PoolCount:         1,
+		TcpMux:            true,
 		User:              "",
 		HeartBeatInterval: 30,
 		HeartBeatTimeout:  90,
@@ -120,6 +122,13 @@ func LoadClientCommonConf(conf ini.File) (cfg *ClientCommonConf, err error) {
 		}
 	}
 
+	tmpStr, ok = conf.Get("common", "tcp_mux")
+	if ok && tmpStr == "false" {
+		cfg.TcpMux = false
+	} else {
+		cfg.TcpMux = true
+	}
+
 	tmpStr, ok = conf.Get("common", "user")
 	if ok {
 		cfg.User = tmpStr

models/config/server_common.go

@@ -49,6 +49,7 @@ type ServerCommonConf struct {
 	PrivilegeToken string
 	AuthTimeout    int64
 	SubDomainHost  string
+	TcpMux         bool
 
 	// if PrivilegeAllowPorts is not nil, tcp proxies which remote port exist in this map can be connected
 	PrivilegeAllowPorts map[int64]struct{}
@@ -76,7 +77,8 @@ func GetDefaultServerCommonConf() *ServerCommonConf {
 		PrivilegeToken:   "",
 		AuthTimeout:      900,
 		SubDomainHost:    "",
-		MaxPoolCount:     10,
+		TcpMux:           true,
+		MaxPoolCount:     5,
 		HeartBeatTimeout: 90,
 		UserConnTimeout:  10,
 	}
@@ -265,6 +267,13 @@ func LoadServerCommonConf(conf ini.File) (cfg *ServerCommonConf, err error) {
 		cfg.SubDomainHost = strings.ToLower(strings.TrimSpace(tmpStr))
 	}
 
+	tmpStr, ok = conf.Get("common", "tcp_mux")
+	if ok && tmpStr == "false" {
+		cfg.TcpMux = false
+	} else {
+		cfg.TcpMux = true
+	}
+
 	tmpStr, ok = conf.Get("common", "heartbeat_timeout")
 	if ok {
 		v, errRet := strconv.ParseInt(tmpStr, 10, 64)