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 <[email protected]>
This commit is contained in:
FUJITA Tomonori
2015-12-24 15:38:00 -08:00
parent ebe493913a
commit 586ec66e97
2 changed files with 5 additions and 4 deletions
+2 -2
View File
@@ -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
}
+3 -2
View File
@@ -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,