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

Rename CheckResolver to IsIPAndPort for clarity

This commit is contained in:
Frank Denis 2019-11-01 23:05:17 +01:00
parent 3cef651b07
commit 8d191cdcf1
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dnscrypt-proxy/config.go
View File

@ -266,7 +266,7 @@ func ConfigLoad(proxy *Proxy, flags *ConfigFlags) error {
proxy.xTransport.tlsCipherSuite = config.TLSCipherSuite
proxy.xTransport.mainProto = proxy.mainProto
if len(config.FallbackResolver) > 0 {
if err := CheckResolver(config.FallbackResolver); err != nil {
if err := IsIPAndPort(config.FallbackResolver); err != nil {
dlog.Fatalf("fallback_resolver [%v]", err)
}
proxy.xTransport.ignoreSystemDNS = config.IgnoreSystemDNS
@ -689,14 +689,14 @@ func cdLocal() {
os.Chdir(filepath.Dir(exeFileName))
}
func CheckResolver(resolver string) error {
host, port := ExtractHostAndPort(resolver, -1)
func IsIPAndPort(addrStr string) error {
host, port := ExtractHostAndPort(addrStr, -1)
if ip := ParseIP(host); ip == nil {
return fmt.Errorf("Host does not parse as IP '%s'", resolver)
return fmt.Errorf("Host does not parse as IP '%s'", addrStr)
} else if port == -1 {
return fmt.Errorf("Port missing '%s'", resolver)
return fmt.Errorf("Port missing '%s'", addrStr)
} else if _, err := strconv.ParseUint(strconv.Itoa(port), 10, 16); err != nil {
return fmt.Errorf("Port does not parse '%s' [%v]", resolver, err)
return fmt.Errorf("Port does not parse '%s' [%v]", addrStr, err)
}
return nil
}

2
dnscrypt-proxy/xtransport.go
View File

@ -59,7 +59,7 @@ type XTransport struct {
}
func NewXTransport() *XTransport {
if err := CheckResolver(DefaultFallbackResolver); err != nil {
if err := IsIPAndPort(DefaultFallbackResolver); err != nil {
panic("DefaultFallbackResolver does not parse")
}
xTransport := XTransport{