From 02aaf121891d79cec8a4920ffe6dca61bbe97eb6 Mon Sep 17 00:00:00 2001
From: Guy Lewin <guy.lewin@microsoft.com>
Date: Tue, 3 Mar 2020 17:53:36 -0500
Subject: [PATCH] style: TCPMuxHTTPConnectPort --> TcpMuxHttpConnectPort

---
 models/config/proxy.go         |  2 +-
 models/config/server_common.go | 10 +++++-----
 server/proxy/tcpmux.go         |  2 +-
 server/service.go              |  6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/models/config/proxy.go b/models/config/proxy.go
index efc8c7b4..591011f9 100644
--- a/models/config/proxy.go
+++ b/models/config/proxy.go
@@ -642,7 +642,7 @@ func (cfg *TcpMuxProxyConf) CheckForSvr(serverCfg ServerCommonConf) (err error)
 		return fmt.Errorf("proxy [%s] incorrect multiplexer [%s]", cfg.ProxyName, cfg.Multiplexer)
 	}
 
-	if cfg.Multiplexer == consts.HttpConnectTcpMultiplexer && serverCfg.TCPMuxHTTPConnectPort == 0 {
+	if cfg.Multiplexer == consts.HttpConnectTcpMultiplexer && serverCfg.TcpMuxHttpConnectPort == 0 {
 		return fmt.Errorf("proxy [%s] type [tcpmux] with multiplexer [httpconnect] requires tcpmux_httpconnect_port configuration", cfg.ProxyName)
 	}
 
diff --git a/models/config/server_common.go b/models/config/server_common.go
index e8d4098c..54703ce1 100644
--- a/models/config/server_common.go
+++ b/models/config/server_common.go
@@ -59,11 +59,11 @@ type ServerCommonConf struct {
 	// requests. By default, this value is 0.
 	VhostHttpsPort int `json:"vhost_https_port"`
 
-	// TCPMuxHTTPConnectPort specifies the port that the server listens for TCP
+	// TcpMuxHttpConnectPort specifies the port that the server listens for TCP
 	// HTTP CONNECT requests. If the value is 0, the server will not multiplex TCP
 	// requests on one single port. If it's not - it will listen on this value for
 	// HTTP CONNECT requests. By default, this value is 0.
-	TCPMuxHTTPConnectPort int `json:"tcpmux_httpconnect_port"`
+	TcpMuxHttpConnectPort int `json:"tcpmux_httpconnect_port"`
 
 	// VhostHttpTimeout specifies the response header timeout for the Vhost
 	// HTTP server, in seconds. By default, this value is 60.
@@ -161,7 +161,7 @@ func GetDefaultServerConf() ServerCommonConf {
 		ProxyBindAddr:          "0.0.0.0",
 		VhostHttpPort:          0,
 		VhostHttpsPort:         0,
-		TCPMuxHTTPConnectPort:  0,
+		TcpMuxHttpConnectPort:  0,
 		VhostHttpTimeout:       60,
 		DashboardAddr:          "0.0.0.0",
 		DashboardPort:          0,
@@ -271,10 +271,10 @@ func UnmarshalServerConfFromIni(content string) (cfg ServerCommonConf, err error
 			err = fmt.Errorf("Parse conf error: invalid tcpmux_httpconnect_port")
 			return
 		} else {
-			cfg.TCPMuxHTTPConnectPort = int(v)
+			cfg.TcpMuxHttpConnectPort = int(v)
 		}
 	} else {
-		cfg.TCPMuxHTTPConnectPort = 0
+		cfg.TcpMuxHttpConnectPort = 0
 	}
 
 	if tmpStr, ok = conf.Get("common", "vhost_http_timeout"); ok {
diff --git a/server/proxy/tcpmux.go b/server/proxy/tcpmux.go
index 0c29744c..108e68d2 100644
--- a/server/proxy/tcpmux.go
+++ b/server/proxy/tcpmux.go
@@ -41,7 +41,7 @@ func (pxy *TcpMuxProxy) httpConnectListen(domain string, addrs []string) ([]stri
 	}
 	pxy.xl.Info("tcpmux httpconnect multiplexer listens for host [%s]", routeConfig.Domain)
 	pxy.listeners = append(pxy.listeners, l)
-	return append(addrs, util.CanonicalAddr(routeConfig.Domain, pxy.serverCfg.TCPMuxHTTPConnectPort)), nil
+	return append(addrs, util.CanonicalAddr(routeConfig.Domain, pxy.serverCfg.TcpMuxHttpConnectPort)), nil
 }
 
 func (pxy *TcpMuxProxy) httpConnectRun() (remoteAddr string, err error) {
diff --git a/server/service.go b/server/service.go
index 1b2db495..ec015a1f 100644
--- a/server/service.go
+++ b/server/service.go
@@ -223,9 +223,9 @@ func NewService(cfg config.ServerCommonConf) (svr *Service, err error) {
 	}
 
 	// Create tcpmux httpconnect multiplexer.
-	if cfg.TCPMuxHTTPConnectPort > 0 {
+	if cfg.TcpMuxHttpConnectPort > 0 {
 		var l net.Listener
-		l, err = net.Listen("tcp", fmt.Sprintf("%s:%d", cfg.ProxyBindAddr, cfg.TCPMuxHTTPConnectPort))
+		l, err = net.Listen("tcp", fmt.Sprintf("%s:%d", cfg.ProxyBindAddr, cfg.TcpMuxHttpConnectPort))
 		if err != nil {
 			err = fmt.Errorf("Create server listener error, %v", err)
 			return
@@ -236,7 +236,7 @@ func NewService(cfg config.ServerCommonConf) (svr *Service, err error) {
 			err = fmt.Errorf("Create vhost tcpMuxer error, %v", err)
 			return
 		}
-		log.Info("tcpmux httpconnect multiplexer listen on %s:%d", cfg.ProxyBindAddr, cfg.TCPMuxHTTPConnectPort)
+		log.Info("tcpmux httpconnect multiplexer listen on %s:%d", cfg.ProxyBindAddr, cfg.TcpMuxHttpConnectPort)
 	}
 
 	// frp tls listener