diff options
| author | Maria Matejka <mq@ucw.cz> | 2022-05-30 15:20:21 +0200 |
|---|---|---|
| committer | Maria Matejka <mq@ucw.cz> | 2022-05-30 15:20:21 +0200 |
| commit | 652be92a21f5575e5f74f6abe98eb4200b86776c (patch) | |
| tree | acf3dcdf931dad33bdef322565b74eb11079a529 /proto/rpki | |
| parent | f196b12c62633e382541ba156e6df1534860c568 (diff) | |
| parent | 9e60b500c76945ccdea94d3a67e7acfde5e3f969 (diff) | |
Merge remote-tracking branch 'origin/master' into haugesund-to-2.0
Diffstat (limited to 'proto/rpki')
| -rw-r--r-- | proto/rpki/rpki.c | 15 | ||||
| -rw-r--r-- | proto/rpki/transport.c | 1 |
2 files changed, 14 insertions, 2 deletions
diff --git a/proto/rpki/rpki.c b/proto/rpki/rpki.c index 6e111a81..4fca9e54 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); 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) { |