dnsx/alg: fix bugs introduced by agent runs

ignoramous · ignoramous · commit 3dc01456422e · 2025-06-10T22:18:26.000+05:30
diff --git a/intra/dnsx/alg.go b/intra/dnsx/alg.go
@@ -652,7 +652,7 @@ func (t *dnsgateway) fromInternalCache(tid, uid string, q *dns.Msg, typ iptype)
 		return nil, errSkipInternalCache
 	}
 	a, aaaa := xdns.HasAQuestion(q), xdns.HasAAAAQuestion(q)
-	if !a || !aaaa {
+	if !a && !aaaa {
 		return nil, errNilCacheResponse
 	}
 
@@ -1850,8 +1850,8 @@ func ChooseHealthyProxy(who string, ipps []netip.AddrPort, pids []string, px ipn
 		if !ipp.IsValid() {
 			continue
 		}
-		if px, err := px.ProxyTo(ipp, protect.UidSelf, pids); err == nil {
-			pid = proxyID(px)
+		if p, err := px.ProxyTo(ipp, protect.UidSelf, pids); err == nil {
+			pid = proxyID(p)
 			foundProxy = pid != NetNoProxy
 			cipp = ipp
 			break

Original file line number	Diff line number	Diff line change
`@@ -652,7 +652,7 @@ func (t dnsgateway) fromInternalCache(tid, uid string, q dns.Msg, typ iptype)`
`652`	`652`	`return nil, errSkipInternalCache`
`653`	`653`	`}`
`654`	`654`	`a, aaaa := xdns.HasAQuestion(q), xdns.HasAAAAQuestion(q)`
`655`		`- if !a \|\| !aaaa {`
	`655`	`+ if !a && !aaaa {`
`656`	`656`	`return nil, errNilCacheResponse`
`657`	`657`	`}`
`658`	`658`
`@@ -1850,8 +1850,8 @@ func ChooseHealthyProxy(who string, ipps []netip.AddrPort, pids []string, px ipn`
`1850`	`1850`	`if !ipp.IsValid() {`
`1851`	`1851`	`continue`
`1852`	`1852`	`}`
`1853`		`- if px, err := px.ProxyTo(ipp, protect.UidSelf, pids); err == nil {`
`1854`		`- pid = proxyID(px)`
	`1853`	`+ if p, err := px.ProxyTo(ipp, protect.UidSelf, pids); err == nil {`
	`1854`	`+ pid = proxyID(p)`
`1855`	`1855`	`foundProxy = pid != NetNoProxy`
`1856`	`1856`	`cipp = ipp`
`1857`	`1857`	`break`