ppn/free-turn-proxy
3
0
Fork 0
mirror of https://github.com/hackdiaz-dev/free-turn-proxy.git synced 2026-10-12 09:41:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(dns): не залипать на первом резолвере doh-форвардера

Browse Source
This commit is contained in:
samosvalishe
2026-09-21 13:39:46 +03:00
parent 3b48a17173
commit ece494aa1b
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/client/dnsdial/doh.go
+16 -11
View File
@@ -207,16 +207,21 @@ var (
dohForwarderOnce sync.Once
dohForwarderInst *dohForwarder
dohForwarderErr error
// Резолвер подменяется на лету: ядро перезапускается в том же процессе (mobile), а Once держит листенеры.
dohForwarderRes atomic.Pointer[DohResolver]
)
func sharedDohForwarder(r *DohResolver) (*dohForwarder, error) {
dohForwarderRes.Store(r)
dohForwarderOnce.Do(func() {
dohForwarderInst, dohForwarderErr = startDohForwarder(r)
dohForwarderInst, dohForwarderErr = startDohForwarder()
})
return dohForwarderInst, dohForwarderErr
}
func startDohForwarder(r *DohResolver) (_ *dohForwarder, err error) {
func currentDohResolver() *DohResolver { return dohForwarderRes.Load() }
func startDohForwarder() (_ *dohForwarder, err error) {
udpConn, err := net.ListenUDP("udp", &net.UDPAddr{IP: net.IPv4(127, 0, 0, 1), Port: 0})
if err != nil {
return nil, fmt.Errorf("doh forwarder: listen UDP: %w", err)
@@ -242,12 +247,12 @@ func startDohForwarder(r *DohResolver) (_ *dohForwarder, err error) {
}
Log().Infof("[DoH] forwarder listening udp=%s tcp=%s", fwd.udpAddr, fwd.tcpAddr)
go fwd.serveUDP(udpConn, r)
go fwd.serveTCP(tcpLn, r)
go fwd.serveUDP(udpConn)
go fwd.serveTCP(tcpLn)
return fwd, nil
}
func (*dohForwarder) serveUDP(conn *net.UDPConn, r *DohResolver) {
func (*dohForwarder) serveUDP(conn *net.UDPConn) {
defer func() { _ = conn.Close() }()
buf := make([]byte, forwarderUDPBufSize)
for {
@@ -260,7 +265,7 @@ func (*dohForwarder) serveUDP(conn *net.UDPConn, r *DohResolver) {
go func(q []byte, c *net.UDPAddr) {
ctx, cancel := context.WithTimeout(context.Background(), dohForwardBudget)
defer cancel()
resp, err := r.forwardRaw(ctx, q)
resp, err := currentDohResolver().forwardRaw(ctx, q)
if err != nil {
Log().Warnf("[DoH] udp forward failed: %v", err)
return
@@ -272,7 +277,7 @@ func (*dohForwarder) serveUDP(conn *net.UDPConn, r *DohResolver) {
}
}
func (*dohForwarder) serveTCP(ln *net.TCPListener, r *DohResolver) {
func (*dohForwarder) serveTCP(ln *net.TCPListener) {
defer func() { _ = ln.Close() }()
for {
conn, err := ln.Accept()
@@ -280,11 +285,11 @@ func (*dohForwarder) serveTCP(ln *net.TCPListener, r *DohResolver) {
Log().Errorf("[DoH] tcp accept: %v", err)
return
}
go handleDohForwarderTCP(conn, r)
go handleDohForwarderTCP(conn)
}
}
func handleDohForwarderTCP(conn net.Conn, r *DohResolver) {
func handleDohForwarderTCP(conn net.Conn) {
defer func() { _ = conn.Close() }()
for {
_ = conn.SetReadDeadline(time.Now().Add(forwarderTCPReadDL)) //nolint:errcheck
@@ -301,8 +306,8 @@ func handleDohForwarderTCP(conn net.Conn, r *DohResolver) {
return
}
ctx, cancel := context.WithTimeout(context.Background(), dohQueryTimeout)
resp, err := r.forwardRaw(ctx, query)
ctx, cancel := context.WithTimeout(context.Background(), dohForwardBudget)
resp, err := currentDohResolver().forwardRaw(ctx, query)
cancel()
if err != nil {
Log().Warnf("[DoH] tcp forward failed: %v", err)