From 539e89e1fe74da261b361486766fb35e2ab77a40 Mon Sep 17 00:00:00 2001 From: ffmiyo Date: Mon, 21 Dec 2020 12:46:01 +0800 Subject: [PATCH] fix: use net.JoinHostPort instead of fmt.Sprintf The net.JoinHostPort function handles both ipv4 and ipv6 cases --- cmd/doggo/nameservers.go | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/cmd/doggo/nameservers.go b/cmd/doggo/nameservers.go index dccb6ba..4e8d9d4 100644 --- a/cmd/doggo/nameservers.go +++ b/cmd/doggo/nameservers.go @@ -68,16 +68,7 @@ func getDefaultServers() ([]Nameserver, int, error) { } servers := make([]Nameserver, 0, len(cfg.Servers)) for _, s := range cfg.Servers { - var ( - ip = net.ParseIP(s) - addr string - ) - // handle IPv6 - if ip != nil && ip.To4() != nil { - addr = fmt.Sprintf("%s:%s", s, cfg.Port) - } else { - addr = fmt.Sprintf("[%s]:%s", s, cfg.Port) - } + addr := net.JoinHostPort(s, cfg.Port) ns := Nameserver{ Type: UDPResolver, Address: addr,