diff options
| author | Shulhan <ms@kilabit.info> | 2018-08-25 01:22:16 +0700 |
|---|---|---|
| committer | Shulhan <ms@kilabit.info> | 2018-08-25 01:22:16 +0700 |
| commit | b79cceb7a3b8232de25fbdd1b3d855974895ed7d (patch) | |
| tree | 5b1c7c4e9bfbb03befa0a116da53dd5ba76694b4 /cmd | |
| parent | 440c04a7ab14e461d6bd242f0a66211a3170b731 (diff) | |
| download | rescached-b79cceb7a3b8232de25fbdd1b3d855974895ed7d.tar.xz | |
Use package lib/net to parse address to UDPAddr
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/rescached/config.go | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/cmd/rescached/config.go b/cmd/rescached/config.go index 37fd511..2990b5c 100644 --- a/cmd/rescached/config.go +++ b/cmd/rescached/config.go @@ -12,6 +12,7 @@ import ( "time" "github.com/shuLhan/share/lib/ini" + libnet "github.com/shuLhan/share/lib/net" ) // List of config sections. @@ -98,7 +99,7 @@ func (cfg *config) parseNSParent(in *ini.Ini) error { } for _, ns := range nsParents { - addr, err := parseIPPort(strings.TrimSpace(ns)) + addr, err := libnet.ParseUDPAddr(strings.TrimSpace(ns)) if err != nil { return err } @@ -108,28 +109,6 @@ func (cfg *config) parseNSParent(in *ini.Ini) error { return nil } -func parseIPPort(address string) (*net.UDPAddr, error) { - udpAddr := new(net.UDPAddr) - - host, port, err := net.SplitHostPort(address) - if err != nil { - host = address - port = defPortString - } - - udpAddr.IP = net.ParseIP(host) - if udpAddr.IP == nil { - err = fmt.Errorf("Invalid address format %s", host) - return nil, err - } - udpAddr.Port, err = strconv.Atoi(port) - if err != nil { - udpAddr.Port = defPort - } - - return udpAddr, nil -} - func (cfg *config) parseTimeout(in *ini.Ini) { v := in.GetString(cfgSecRescached, "", cfgKeyTimeout, defTimeoutString) timeout, err := strconv.Atoi(v) |
