From 9a9439d5e1d3b1372dadb25207d67d83a2e1e98c Mon Sep 17 00:00:00 2001 From: Luiz Amaral Date: Thu, 19 May 2022 19:43:59 +0200 Subject: RPKI: Implement VRF support --- proto/rpki/transport.c | 1 + 1 file changed, 1 insertion(+) (limited to 'proto/rpki') diff --git a/proto/rpki/transport.c b/proto/rpki/transport.c index a1ac7587..81bd6dd8 100644 --- a/proto/rpki/transport.c +++ b/proto/rpki/transport.c @@ -85,6 +85,7 @@ rpki_tr_open(struct rpki_tr_sock *tr) sk->rbsize = RPKI_RX_BUFFER_SIZE; sk->tbsize = RPKI_TX_BUFFER_SIZE; sk->tos = IP_PREC_INTERNET_CONTROL; + sk->vrf = cache->p->p.vrf; if (ipa_zero(sk->daddr) && sk->host) { -- cgit v1.2.3 From 7bb06b34a110bbf40e7308eb19f32202a66d58ba Mon Sep 17 00:00:00 2001 From: Ondrej Zajicek Date: Sat, 21 May 2022 16:03:08 +0200 Subject: RPKI: Display cache server port on show protocol Thanks to Luiz Amaral for the idea. --- proto/rpki/rpki.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'proto/rpki') diff --git a/proto/rpki/rpki.c b/proto/rpki/rpki.c index ab0837f3..4ccb38e3 100644 --- a/proto/rpki/rpki.c +++ b/proto/rpki/rpki.c @@ -828,16 +828,27 @@ rpki_show_proto_info(struct proto *P) if (cache) { const char *transport_name = "---"; + uint default_port = 0; switch (cf->tr_config.type) { #if HAVE_LIBSSH - case RPKI_TR_SSH: transport_name = "SSHv2"; break; + case RPKI_TR_SSH: + transport_name = "SSHv2"; + default_port = RPKI_SSH_PORT; + break; #endif - case RPKI_TR_TCP: transport_name = "Unprotected over TCP"; break; + case RPKI_TR_TCP: + transport_name = "Unprotected over TCP"; + default_port = RPKI_TCP_PORT; + break; }; cli_msg(-1006, " Cache server: %s", cf->hostname); + + if (cf->port != default_port) + cli_msg(-1006, " Cache port: %u", cf->port); + cli_msg(-1006, " Status: %s", rpki_cache_state_to_str(cache->state)); cli_msg(-1006, " Transport: %s", transport_name); cli_msg(-1006, " Protocol version: %u", cache->version); -- cgit v1.2.3