Fix resolve action incorrectly overwriting UDP domain destination

nekohasekai · nekohasekai · commit 2874c389b1b6 · 2024-12-28T15:31:53.000+08:00
diff --git a/route/route.go b/route/route.go
@@ -473,7 +473,7 @@ match:
 	}
 	if !preMatch && inputPacketConn != nil && !metadata.Destination.IsFqdn() && !metadata.Destination.Addr.IsGlobalUnicast() {
 		var timeout time.Duration
-		if metadata.InboundType == C.TypeSOCKS {
+		if metadata.InboundType == C.TypeSOCKS || metadata.InboundType == C.TypeMixed {
 			timeout = C.TCPTimeout
 		}
 		newBuffer, newPacketBuffers, newErr := r.actionSniff(ctx, metadata, &rule.RuleActionSniff{Timeout: timeout}, inputConn, inputPacketConn)
@@ -572,7 +572,7 @@ func (r *Router) actionSniff(
 					return
 				}
 			} else {
-				if !metadata.Destination.Addr.IsGlobalUnicast() {
+				if !metadata.Destination.IsFqdn() && !metadata.Destination.Addr.IsGlobalUnicast() {
 					metadata.Destination = destination
 				}
 				if len(packetBuffers) > 0 {

Original file line number	Diff line number	Diff line change
`@@ -473,7 +473,7 @@ match:`
`473`	`473`	`}`
`474`	`474`	`if !preMatch && inputPacketConn != nil && !metadata.Destination.IsFqdn() && !metadata.Destination.Addr.IsGlobalUnicast() {`
`475`	`475`	`var timeout time.Duration`
`476`		`- if metadata.InboundType == C.TypeSOCKS {`
	`476`	`+ if metadata.InboundType == C.TypeSOCKS \|\| metadata.InboundType == C.TypeMixed {`
`477`	`477`	`timeout = C.TCPTimeout`
`478`	`478`	`}`
`479`	`479`	`newBuffer, newPacketBuffers, newErr := r.actionSniff(ctx, metadata, &rule.RuleActionSniff{Timeout: timeout}, inputConn, inputPacketConn)`
`@@ -572,7 +572,7 @@ func (r *Router) actionSniff(`
`572`	`572`	`return`
`573`	`573`	`}`
`574`	`574`	`} else {`
`575`		`- if !metadata.Destination.Addr.IsGlobalUnicast() {`
	`575`	`+ if !metadata.Destination.IsFqdn() && !metadata.Destination.Addr.IsGlobalUnicast() {`
`576`	`576`	`metadata.Destination = destination`
`577`	`577`	`}`
`578`	`578`	`if len(packetBuffers) > 0 {`