From cf234a11f62e7e6ae511afdede152c9014a8f7d2 Mon Sep 17 00:00:00 2001 From: Antonio Mika Date: Mon, 26 Aug 2024 16:36:13 -0400 Subject: [PATCH] Simplify logic for sni and tcp load balancers --- utils/utils.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/utils.go b/utils/utils.go index 5b30b4f..23734fe 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -697,7 +697,7 @@ func GetOpenPort(addr string, port uint32, state *State, sshConn *SSHConnection, checkedPort, err := CheckPort(checkerPort, viper.GetString("port-bind-range")) _, ok := state.TCPListeners.Load(listenAddr) - if err == nil && (!viper.GetBool("tcp-load-balancer") || (viper.GetBool("tcp-load-balancer") && !ok) || (sniProxyEnabled && !ok)) { + if err == nil && !ok && (viper.GetBool("tcp-load-balancer") || viper.GetBool("sni-load-balancer")) { ln, listenErr := Listen(listenAddr) if listenErr != nil { err = listenErr @@ -720,7 +720,7 @@ func GetOpenPort(addr string, port uint32, state *State, sshConn *SSHConnection, listenAddr = GenerateAddress(bindAddr, bindPort) holder, ok := state.TCPListeners.Load(listenAddr) - if ok && (!sniProxyEnabled && viper.GetBool("tcp-load-balancer") || (sniProxyEnabled && viper.GetBool("sni-load-balancer"))) { + if ok && ((!sniProxyEnabled && viper.GetBool("tcp-load-balancer")) || sniProxyEnabled) { tH = holder ok = false }