From 956a14ee2185135826a4068910e66283669edf14 Mon Sep 17 00:00:00 2001 From: keatonLiu Date: Sun, 10 Dec 2023 23:56:13 +0800 Subject: [PATCH] add timeout for udp and tcp dialer --- dnscrypt-proxy/proxy.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dnscrypt-proxy/proxy.go b/dnscrypt-proxy/proxy.go index c1b1e248..b2ef5e9a 100644 --- a/dnscrypt-proxy/proxy.go +++ b/dnscrypt-proxy/proxy.go @@ -517,7 +517,7 @@ func (proxy *Proxy) exchangeWithUDPServer( var pc net.Conn proxyDialer := proxy.xTransport.proxyDialer if proxyDialer == nil { - pc, err = net.DialUDP("udp", nil, upstreamAddr) + pc, err = net.DialTimeout("udp", upstreamAddr.String(), serverInfo.Timeout) } else { pc, err = (*proxyDialer).Dial("udp", upstreamAddr.String()) } @@ -560,7 +560,7 @@ func (proxy *Proxy) exchangeWithTCPServer( var pc net.Conn proxyDialer := proxy.xTransport.proxyDialer if proxyDialer == nil { - pc, err = net.DialTCP("tcp", nil, upstreamAddr) + pc, err = net.DialTimeout("tcp", upstreamAddr.String(), serverInfo.Timeout) } else { pc, err = (*proxyDialer).Dial("tcp", upstreamAddr.String()) }