[test]

dns/util.go

@@ -1,12 +1,17 @@
 package dns
 
 import (
+	"context"
 	"crypto/tls"
+	"fmt"
 	"net"
 	"time"
 
 	"github.com/Dreamacro/clash/common/cache"
+	"github.com/Dreamacro/clash/component/dialer"
+	C "github.com/Dreamacro/clash/constant"
 	"github.com/Dreamacro/clash/log"
+	"github.com/Dreamacro/clash/tunnel"
 
 	D "github.com/miekg/dns"
 )
@@ -51,7 +56,7 @@ func transform(servers []NameServer, resolver *Resolver) []dnsClient {
 	for _, s := range servers {
 		switch s.Net {
 		case "https":
-			ret = append(ret, newDoHClient(s.Addr, resolver))
+			ret = append(ret, newDoHClient(s.Addr, resolver, s.ProxyAdapter))
 			continue
 		case "dhcp":
 			ret = append(ret, newDHCPClient(s.Addr))
@@ -70,10 +75,11 @@ func transform(servers []NameServer, resolver *Resolver) []dnsClient {
 				UDPSize: 4096,
 				Timeout: 5 * time.Second,
 			},
-			port:  port,
-			host:  host,
-			iface: s.Interface,
-			r:     resolver,
+			port:         port,
+			host:         host,
+			iface:        s.Interface,
+			r:            resolver,
+			proxyAdapter: s.ProxyAdapter,
 		})
 	}
 	return ret
@@ -104,3 +110,63 @@ func msgToIP(msg *D.Msg) []net.IP {
 
 	return ips
 }
+
+type wrapPacketConn struct {
+	net.PacketConn
+	rAddr net.Addr
+}
+
+func (wpc *wrapPacketConn) Read(b []byte) (n int, err error) {
+	n, _, err = wpc.PacketConn.ReadFrom(b)
+	return n, err
+}
+
+func (wpc *wrapPacketConn) Write(b []byte) (n int, err error) {
+	return wpc.PacketConn.WriteTo(b, wpc.rAddr)
+}
+
+func (wpc *wrapPacketConn) RemoteAddr() net.Addr {
+	return wpc.rAddr
+}
+
+func dialContextWithProxyAdapter(ctx context.Context, adapterName string, network string, dstIP net.IP, port string, opts ...dialer.Option) (net.Conn, error) {
+	adapter, ok := tunnel.Proxies()[adapterName]
+	if !ok {
+		return nil, fmt.Errorf("proxy adapter [%s] not found", adapterName)
+	}
+
+	networkType := C.TCP
+	if network == "udp" {
+		if !adapter.SupportUDP() {
+			return nil, fmt.Errorf("proxy adapter [%s] UDP is not supported", adapterName)
+		}
+		networkType = C.UDP
+	}
+
+	addrType := C.AtypIPv4
+	if dstIP.To4() == nil {
+		addrType = C.AtypIPv6
+	}
+
+	metadata := &C.Metadata{
+		NetWork:  networkType,
+		AddrType: addrType,
+		Host:     "",
+		DstIP:    dstIP,
+		DstPort:  port,
+	}
+
+	if networkType == C.UDP {
+		packetConn, err := adapter.ListenPacketContext(ctx, metadata, opts...)
+		if err != nil {
+			return nil, err
+		}
+
+		return &wrapPacketConn{
+			PacketConn: packetConn,
+			rAddr:      metadata.UDPAddr(),
+		}, nil
+	}
+
+	return adapter.DialContext(ctx, metadata, opts...)
+}