Don't return error if upstream doesn't respond

kfsoftware · Apr 5, 2022 · 4b87ffc · 4b87ffc
1 parent 0275ff8
commit 4b87ffc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/cmd/server/server.go b/cmd/server/server.go
@@ -122,8 +122,8 @@ func (c serverCmd) run() error {
 			err = c.returnResponse(initialConn, messages.TunnelStatus_OK)
 			if err != nil {
 				mutex.Unlock()
-				_ = muxListener.Close()
 				delete(sessions, sni)
+				_ = muxListener.Close()
 				log.Trace().Msgf("failed to write message", conn.RemoteAddr().String())
 				err = c.returnResponse(initialConn, messages.TunnelStatus_ERROR)
 				if err != nil {
@@ -134,8 +134,8 @@ func (c serverCmd) run() error {
 			err = initialConn.Close()
 			if err != nil {
 				mutex.Unlock()
-				_ = muxListener.Close()
 				delete(sessions, sni)
+				_ = muxListener.Close()
 				log.Trace().Msgf("failed to close connection", conn.RemoteAddr().String())
 				err = c.returnResponse(initialConn, messages.TunnelStatus_ERROR)
 				if err != nil {

diff --git a/pkg/tunnel/tunnel.go b/pkg/tunnel/tunnel.go
@@ -88,15 +88,14 @@ func (c tunnelClient) startSNIProxy(session *yamux.Session, remoteAddress string
 		destConn, err := net.DialTimeout("tcp", remoteAddress, time.Second*5)
 		if err != nil {
 			log.Trace().Msgf("Failed to connect to remote address: %v", err)
-			conn.Write([]byte("Failed to connect to remote address"))
 			connCloseErr := conn.Close()
 			if connCloseErr != nil {
 				log.Trace().Msgf("Failed to close connection: %v", connCloseErr)
 			}
 			if destConn != nil {
 				destConn.Close()
 			}
-			return err
+			continue
 		}
 		log.Debug().Msgf("client %s connected", conn.RemoteAddr().String())
 		copyConn := func(writer, reader net.Conn) {