Skip to content

Commit 4862bfe

Browse files
committed
Properly parse netprobe_timeout
flag.Int is never nil, so the flag's default value silently overrode netprobe_timeout from the TOML file
1 parent 3c5dc7e commit 4862bfe

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

dnscrypt-proxy/config_loader.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package main
22

33
import (
44
"errors"
5+
"flag"
56
"fmt"
67
"net"
78
"net/http"
@@ -463,9 +464,11 @@ func configureSourceRestrictions(proxy *Proxy, flags *ConfigFlags, config *Confi
463464
// determineNetprobeAddress - Determines the address to use for network probing
464465
func determineNetprobeAddress(flags *ConfigFlags, config *Config) (string, int) {
465466
netprobeTimeout := config.NetprobeTimeout
466-
if flags.NetprobeTimeoutOverride != nil {
467-
netprobeTimeout = *flags.NetprobeTimeoutOverride
468-
}
467+
flag.Visit(func(commandLineFlag *flag.Flag) {
468+
if commandLineFlag.Name == "netprobe-timeout" && flags.NetprobeTimeoutOverride != nil {
469+
netprobeTimeout = *flags.NetprobeTimeoutOverride
470+
}
471+
})
469472

470473
netprobeAddress := DefaultNetprobeAddress
471474
if len(config.NetprobeAddress) > 0 {

0 commit comments

Comments
 (0)