miracle091/dnscrypt-proxy
miracle091
/
dnscrypt-proxy
mirror of https://github.com/DNSCrypt/dnscrypt-proxy.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:DNSCrypt/dnscrypt-proxy 

* 'master' of github.com:DNSCrypt/dnscrypt-proxy:
  add timeout for udp and tcp dialer
  Use blocking channel instead of looping sleep for less CPU usage
This commit is contained in:
Frank Denis 2023-12-13 08:35:55 +01:00
parent e782207911 0f1f635ec1
commit 898ded9c52
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dnscrypt-proxy/coldstart.go
View File

@ -17,14 +17,13 @@ type CaptivePortalMap map[string]CaptivePortalEntryIPs
type CaptivePortalHandler struct {
cancelChannel chan struct{}
countChannel chan struct{}
waitChannel chan struct{}
channelCount int
}
func (captivePortalHandler *CaptivePortalHandler) Stop() {
close(captivePortalHandler.cancelChannel)
for len(captivePortalHandler.countChannel) < captivePortalHandler.channelCount {
time.Sleep(10 * time.Millisecond)
}
<-captivePortalHandler.waitChannel
close(captivePortalHandler.countChannel)
}
@ -138,6 +137,9 @@ func addColdStartListener(
}
clientPc.Close()
captivePortalHandler.countChannel <- struct{}{}
if len(captivePortalHandler.countChannel) == captivePortalHandler.channelCount {
close(captivePortalHandler.waitChannel)
}
}()
return nil
}
@ -186,6 +188,7 @@ func ColdStart(proxy *Proxy) (*CaptivePortalHandler, error) {
captivePortalHandler := CaptivePortalHandler{
cancelChannel: make(chan struct{}),
countChannel: make(chan struct{}, len(listenAddrStrs)),
waitChannel: make(chan struct{}),
channelCount: 0,
}
for _, listenAddrStr := range listenAddrStrs {

4
dnscrypt-proxy/proxy.go
View File

@ -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())
}