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

Unbreak running without a captive portal configuration file

This commit is contained in:
Frank Denis 2020-08-04 00:50:59 +02:00
parent 5843e49188
commit 60d4c98f31
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dnscrypt-proxy/coldstart.go
View File

@ -22,7 +22,7 @@ type CaptivePortalHandler struct {
cancelChannels []chan struct{} cancelChannels []chan struct{}
} }
func (captivePortalHandler *CaptivePortalHandler) Stop() { func (captivePortalHandler *CaptivePortalHandler) Stop() {
for _, cancelChannel := range captivePortalHandler.cancelChannels { for _, cancelChannel := range captivePortalHandler.cancelChannels {
cancelChannel <- struct{}{} cancelChannel <- struct{}{}
_ = <-cancelChannel _ = <-cancelChannel

4
dnscrypt-proxy/netprobe_others.go
View File

@ -14,7 +14,9 @@ func NetProbe(proxy *Proxy, address string, timeout int) error {
return nil return nil
} }
if captivePortalHandler, err := ColdStart(proxy); err == nil { if captivePortalHandler, err := ColdStart(proxy); err == nil {
defer captivePortalHandler.Stop() if captivePortalHandler != nil {
defer captivePortalHandler.Stop()
}
} else { } else {
dlog.Critical(err) dlog.Critical(err)
} }

4
dnscrypt-proxy/netprobe_windows.go
View File

@ -12,7 +12,9 @@ func NetProbe(proxy *Proxy, address string, timeout int) error {
return nil return nil
} }
if captivePortalHandler, err := ColdStart(proxy); err == nil { if captivePortalHandler, err := ColdStart(proxy); err == nil {
defer captivePortalHandler.Stop() if captivePortalHandler != nil {
defer captivePortalHandler.Stop()
}
} else { } else {
dlog.Critical(err) dlog.Critical(err)
} }