From 55f626424f944aedb2d7690dd10002d94c2b851f Mon Sep 17 00:00:00 2001
From: wwqgtxx <wwqgtxx@gmail.com>
Date: Wed, 25 Oct 2023 20:16:44 +0800
Subject: [PATCH] chore: better dns batchExchange

---
 dns/util.go | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/dns/util.go b/dns/util.go
index e8bdfd0bc..668a3a2e1 100644
--- a/dns/util.go
+++ b/dns/util.go
@@ -290,11 +290,14 @@ func listenPacket(ctx context.Context, proxyAdapter C.ProxyAdapter, proxyName st
 	return proxyAdapter.ListenPacketContext(ctx, metadata, opts...)
 }
 
+var errIPNotFound = errors.New("couldn't find ip")
+
 func batchExchange(ctx context.Context, clients []dnsClient, m *D.Msg) (msg *D.Msg, cache bool, err error) {
 	cache = true
 	fast, ctx := picker.WithTimeout[*D.Msg](ctx, resolver.DefaultDNSTimeout)
 	defer fast.Close()
 	domain := msgToDomain(m)
+	var noIpMsg *D.Msg
 	for _, client := range clients {
 		if _, isRCodeClient := client.(rcodeClient); isRCodeClient {
 			msg, err = client.ExchangeContext(ctx, m)
@@ -311,13 +314,31 @@ func batchExchange(ctx context.Context, clients []dnsClient, m *D.Msg) (msg *D.M
 				// so we would ignore RCode errors from RCode clients.
 				return nil, errors.New("server failure: " + D.RcodeToString[m.Rcode])
 			}
-			log.Debugln("[DNS] %s --> %s, from %s", domain, msgToIP(m), client.Address())
+			if ips := msgToIP(m); len(m.Question) > 0 {
+				qType := m.Question[0].Qtype
+				log.Debugln("[DNS] %s --> %s %s from %s", domain, ips, D.Type(qType), client.Address())
+				switch qType {
+				case D.TypeAAAA:
+					if len(ips) == 0 {
+						noIpMsg = m
+						return nil, errIPNotFound
+					}
+				case D.TypeA:
+					if len(ips) == 0 {
+						noIpMsg = m
+						return nil, errIPNotFound
+					}
+				}
+			}
 			return m, nil
 		})
 	}
 
 	msg = fast.Wait()
 	if msg == nil {
+		if noIpMsg != nil {
+			return noIpMsg, false, nil
+		}
 		err = errors.New("all DNS requests failed")
 		if fErr := fast.Error(); fErr != nil {
 			err = fmt.Errorf("%w, first error: %w", err, fErr)