Fix TCP IP version selection when conn is LOCAL.

kzemek · kzemek · commit e6156cbc7991 · 2021-02-26T15:19:41.000+01:00
diff --git a/tcp.go b/tcp.go
@@ -51,7 +51,11 @@ func tcpHandleConnection(conn net.Conn, logger *zap.Logger) {
 	}
 
 	targetAddr := Opts.TargetAddr6
-	if AddrVersion(saddr) == 4 {
+	if saddr == nil {
+		if AddrVersion(conn.RemoteAddr()) == 4 {
+			targetAddr = Opts.TargetAddr4
+		}
+	} else if AddrVersion(saddr) == 4 {
 		targetAddr = Opts.TargetAddr4
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,11 @@ func tcpHandleConnection(conn net.Conn, logger *zap.Logger) {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`targetAddr := Opts.TargetAddr6`
`54`		`- if AddrVersion(saddr) == 4 {`
	`54`	`+ if saddr == nil {`
	`55`	`+ if AddrVersion(conn.RemoteAddr()) == 4 {`
	`56`	`+ targetAddr = Opts.TargetAddr4`
	`57`	`+ }`
	`58`	`+ } else if AddrVersion(saddr) == 4 {`
`55`	`59`	`targetAddr = Opts.TargetAddr4`
`56`	`60`	`}`
`57`	`61`