diff options
| author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2015-12-23 16:04:30 -0800 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2015-12-24 15:38:00 -0800 |
| commit | 586ec66e970cd4d330b35d65a599ae0e116a324a (patch) | |
| tree | 515f81a0508867dec484f5ecfc3787ceacd50c03 | |
| parent | ebe493913af9a57c8488119009c6006430001cce (diff) | |
rpki: 'rpki server' command shows port
Session State Uptime #IPv4/IPv6 records
210.173.170.254:323 Up 00:01:39 17112/2517
141.22.28.222:8282 Up 00:01:39 17411/2604
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
| -rw-r--r-- | gobgp/cmd/rpki.go | 4 | ||||
| -rw-r--r-- | server/rpki.go | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/gobgp/cmd/rpki.go b/gobgp/cmd/rpki.go index 200b7b1d..b306f8a2 100644 --- a/gobgp/cmd/rpki.go +++ b/gobgp/cmd/rpki.go @@ -36,7 +36,7 @@ func showRPKIServer(args []string) error { fmt.Println(err) return err } - format := "%-18s %-6s %-10s %s\n" + format := "%-23s %-6s %-10s %s\n" fmt.Printf(format, "Session", "State", "Uptime", "#IPv4/IPv6 records") for { r, err := stream.Recv() @@ -52,7 +52,7 @@ func showRPKIServer(args []string) error { uptime = fmt.Sprint(formatTimedelta(int64(time.Now().Sub(time.Unix(r.State.Uptime, 0)).Seconds()))) } - fmt.Printf(format, fmt.Sprintf(r.Conf.Address), s, uptime, fmt.Sprintf("%d/%d", r.State.ReceivedIpv4, r.State.ReceivedIpv6)) + fmt.Printf(format, net.JoinHostPort(r.Conf.Address, strconv.Itoa(int(r.Conf.RemotePort))), s, uptime, fmt.Sprintf("%d/%d", r.State.ReceivedIpv4, r.State.ReceivedIpv6)) } return nil } diff --git a/server/rpki.go b/server/rpki.go index 7fa9aea4..cbe6ad6b 100644 --- a/server/rpki.go +++ b/server/rpki.go @@ -267,10 +267,11 @@ func (c *roaManager) handleGRPC(grpcReq *GrpcRequest) { for _, client := range c.clientMap { state := client.state received := &state.RpkiMessages.RpkiReceived - addr, _ := splitHostPort(client.host) + addr, port := splitHostPort(client.host) rpki := &api.RPKI{ Conf: &api.RPKIConf{ - Address: addr, + Address: addr, + RemotePort: uint32(port), }, State: &api.RPKIState{ Uptime: state.Uptime, |