From 045d5102d899e6f7efec88d5289e1998561ca764 Mon Sep 17 00:00:00 2001
From: Guy Lewin <guy.lewin@microsoft.com>
Date: Tue, 3 Mar 2020 17:02:15 -0500
Subject: [PATCH] style: remove some naked returns

---
 server/proxy/tcpmux.go | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/server/proxy/tcpmux.go b/server/proxy/tcpmux.go
index 64fcab6c..ebb0c3f7 100644
--- a/server/proxy/tcpmux.go
+++ b/server/proxy/tcpmux.go
@@ -33,10 +33,10 @@ type TcpMuxProxy struct {
 
 func (pxy *TcpMuxProxy) Run() (remoteAddr string, err error) {
 	xl := pxy.xl
-	routeConfig := &vhost.VhostRouteConfig{}
 
 	switch pxy.cfg.Multiplexer {
 	case consts.HttpConnectTcpMultiplexer:
+		routeConfig := &vhost.VhostRouteConfig{}
 		defer func() {
 			if err != nil {
 				pxy.Close()
@@ -49,10 +49,9 @@ func (pxy *TcpMuxProxy) Run() (remoteAddr string, err error) {
 			}
 
 			routeConfig.Domain = domain
-			l, errRet := pxy.rc.TcpMuxHttpConnectMuxer.Listen(pxy.ctx, routeConfig)
-			if errRet != nil {
-				err = errRet
-				return
+			l, err := pxy.rc.TcpMuxHttpConnectMuxer.Listen(pxy.ctx, routeConfig)
+			if err != nil {
+				return remoteAddr, err
 			}
 			xl.Info("tcpmux httpconnect multiplexer listens for host [%s]", routeConfig.Domain)
 			pxy.listeners = append(pxy.listeners, l)
@@ -61,10 +60,9 @@ func (pxy *TcpMuxProxy) Run() (remoteAddr string, err error) {
 
 		if pxy.cfg.SubDomain != "" {
 			routeConfig.Domain = pxy.cfg.SubDomain + "." + pxy.serverCfg.SubDomainHost
-			l, errRet := pxy.rc.TcpMuxHttpConnectMuxer.Listen(pxy.ctx, routeConfig)
-			if errRet != nil {
-				err = errRet
-				return
+			l, err := pxy.rc.TcpMuxHttpConnectMuxer.Listen(pxy.ctx, routeConfig)
+			if err != nil {
+				return remoteAddr, err
 			}
 			xl.Info("tcpmux httpconnect multiplexer listens for host [%s]", routeConfig.Domain)
 			pxy.listeners = append(pxy.listeners, l)
@@ -73,7 +71,7 @@ func (pxy *TcpMuxProxy) Run() (remoteAddr string, err error) {
 
 		pxy.startListenHandler(pxy, HandleUserTcpConnection)
 		remoteAddr = strings.Join(addrs, ",")
-		return
+		return remoteAddr, err
 	default:
 	}
 	return "", fmt.Errorf("unknown multiplexer [%s]", pxy.cfg.Multiplexer)