Cancel dial on source connection close

minekube · Dec 19, 2022 · 922bb13 · 922bb13
1 parent 5fd7e3f
commit 922bb13
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/.web/docs/guide/lite.md b/.web/docs/guide/lite.md
@@ -33,11 +33,11 @@ config:
     enabled: true
     routes:
       - host: abc.example.com
-        backend: 10.0.0.3:25566
-      - host: '*.minecraft.com'
-        backend: 10.0.0.2:25567
+        backend: 10.0.0.3:25568
+      - host: '*.example.com'
+        backend: 10.0.0.1:25567
       - host: [ example.com, localhost ]
-        backend: [ 10.0.0.1:25568 ]
+        backend: [ 10.0.0.2:25566 ]
 ```
 
 

diff --git a/pkg/edition/java/proxy/session_handshake.go b/pkg/edition/java/proxy/session_handshake.go
@@ -2,6 +2,7 @@ package proxy
 
 import (
 	"bytes"
+	"context"
 	"fmt"
 	"io"
 	"net"
@@ -259,9 +260,15 @@ func (h *handshakeSessionHandler) forwardLite(handshake *packet.Handshake, pc *p
 	log = log.WithValues("backend", backendAddr)
 
 	timeout := time.Duration(h.config().ConnectionTimeout) * time.Millisecond
-	dst, err := net.DialTimeout(src.RemoteAddr().Network(), backendAddr, timeout)
+	ctx, cancel := context.WithTimeout(h.conn.Context(), timeout)
+	defer cancel()
+
+	var dialer net.Dialer
+	dst, err := dialer.DialContext(ctx, src.RemoteAddr().Network(), backendAddr)
 	if err != nil {
-		log.Info("failed to connect to backend", "error", err.Error())
+		if ctx.Err() == nil {
+			log.Info("failed to connect to backend", "error", err.Error())
+		}
 		return
 	}
 	defer func() { _ = dst.Close() }()