mirrors/dnscrypt-proxy
1
0
Fork 0
mirror of https://github.com/DNSCrypt/dnscrypt-proxy.git synced 2025-04-04 13:47:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

Do not always override the netprobe_timeout option from config file

Browse source 
Fixes #641
This commit is contained in:
Frank Denis 2018-11-16 18:13:39 +01:00
parent 56f69d2234
commit 7174fdc8c8
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dnscrypt-proxy/config.go
View file

@ -406,9 +406,11 @@ func ConfigLoad(proxy *Proxy, svcFlag *string) error {
}
netprobeTimeout := config.NetprobeTimeout
if netprobeTimeoutOverride != nil {
netprobeTimeout = *netprobeTimeoutOverride
}
flag.Visit(func(flag *flag.Flag) {
if flag.Name == "netprobe-timeout" && netprobeTimeoutOverride != nil {
netprobeTimeout = *netprobeTimeoutOverride
}
})
netProbe(config.NetprobeAddress, netprobeTimeout)
if !config.OfflineMode {
if err := config.loadSources(proxy); err != nil {