diff options
| author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2015-09-06 00:01:39 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2015-09-06 00:49:31 +0900 |
| commit | e314f8150ce73adeb7bdccc58d34be6e22aa11b2 (patch) | |
| tree | db5b9f93ecf2447c14d79750dde2169162d175db /server/rpki.go | |
| parent | e3aed6abb18f33c65c78d5551219d162b022a850 (diff) | |
use net.JoinHostPort()
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Diffstat (limited to 'server/rpki.go')
| -rw-r--r-- | server/rpki.go | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/server/rpki.go b/server/rpki.go index ec7c9afe..c5e1a850 100644 --- a/server/rpki.go +++ b/server/rpki.go @@ -26,6 +26,7 @@ import ( "github.com/osrg/gobgp/packet" "github.com/osrg/gobgp/table" "net" + "strconv" "time" ) @@ -191,12 +192,8 @@ func newROAClient(conf config.RpkiServers) (*roaClient, error) { if len(conf.RpkiServerList) > 1 { log.Warn("currently only one RPKI server is supposed") } - if conf.RpkiServerList[0].RpkiServerConfig.Address.To16() == nil { - url = fmt.Sprintf("%s", conf.RpkiServerList[0].RpkiServerConfig.Address) - } else { - url = fmt.Sprintf("[%s]", conf.RpkiServerList[0].RpkiServerConfig.Address) - } - url += fmt.Sprintf(":%d", conf.RpkiServerList[0].RpkiServerConfig.Port) + c := conf.RpkiServerList[0].RpkiServerConfig + url = net.JoinHostPort(c.Address.String(), strconv.Itoa(int(c.Port))) } conn, err := net.Dial("tcp", url) |