xmengnet/mihomo
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: cleanup doh/doq's code

Browse source
This commit is contained in:
wwqgtxx 2022-12-13 11:23:34 +08:00
parent 88acf8e098
commit b3b5f17e03
2 changed files with 12 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dns/doh.go
View file

@ -15,7 +15,6 @@ import (
"sync" "sync"
"time" "time"
"github.com/Dreamacro/clash/component/dialer"
tlsC "github.com/Dreamacro/clash/component/tls" tlsC "github.com/Dreamacro/clash/component/tls"
C "github.com/Dreamacro/clash/constant" C "github.com/Dreamacro/clash/constant"
"github.com/Dreamacro/clash/log" "github.com/Dreamacro/clash/log"
@ -530,12 +529,6 @@ func (doh *dnsOverHTTPS) dialQuic(ctx context.Context, addr string, tlsCfg *tls.
Port: portInt, Port: portInt,
} }
var conn net.PacketConn var conn net.PacketConn
if doh.proxyAdapter == "" {
conn, err = dialer.ListenPacket(ctx, "udp", "")
if err != nil {
return nil, err
}
} else {
if wrapConn, err := dialContextExtra(ctx, doh.proxyAdapter, "udp", addr, doh.r); err == nil { if wrapConn, err := dialContextExtra(ctx, doh.proxyAdapter, "udp", addr, doh.r); err == nil {
if pc, ok := wrapConn.(*wrapPacketConn); ok { if pc, ok := wrapConn.(*wrapPacketConn); ok {
conn = pc conn = pc
@ -545,7 +538,6 @@ func (doh *dnsOverHTTPS) dialQuic(ctx context.Context, addr string, tlsCfg *tls.
} else { } else {
return nil, err return nil, err
} }
}
return quic.DialEarlyContext(ctx, conn, &udpAddr, doh.url.Host, tlsCfg, cfg) return quic.DialEarlyContext(ctx, conn, &udpAddr, doh.url.Host, tlsCfg, cfg)
} }

20
dns/doq.go
View file

@ -12,7 +12,6 @@ import (
"sync" "sync"
"time" "time"
"github.com/Dreamacro/clash/component/dialer"
tlsC "github.com/Dreamacro/clash/component/tls" tlsC "github.com/Dreamacro/clash/component/tls"
"github.com/metacubex/quic-go" "github.com/metacubex/quic-go"
@ -336,23 +335,14 @@ func (doq *dnsOverQUIC) openConnection(ctx context.Context) (conn quic.Connectio
p, err := strconv.Atoi(port) p, err := strconv.Atoi(port)
udpAddr := net.UDPAddr{IP: net.ParseIP(ip), Port: p} udpAddr := net.UDPAddr{IP: net.ParseIP(ip), Port: p}
var udp net.PacketConn var udp net.PacketConn
if doq.proxyAdapter == "" { if wrapConn, err := dialContextExtra(ctx, doq.proxyAdapter, "udp", addr, doq.r); err == nil {
udp, err = dialer.ListenPacket(ctx, "udp", "") if pc, ok := wrapConn.(*wrapPacketConn); ok {
if err != nil { udp = pc
return nil, err
}
} else { } else {
conn, err := dialContextExtra(ctx, doq.proxyAdapter, "udp", addr, doq.r)
if err != nil {
return nil, err
}
wrapConn, ok := conn.(*wrapPacketConn)
if !ok {
return nil, fmt.Errorf("quic create packet failed") return nil, fmt.Errorf("quic create packet failed")
} }
} else {
udp = wrapConn return nil, err
} }
host, _, err := net.SplitHostPort(doq.addr) host, _, err := net.SplitHostPort(doq.addr)