proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 10:49:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9581 from idryzhov/rpki-source-move

Browse Source 
bgpd: move rpki source after the server config
This commit is contained in:
Donatas Abraitis 2021-09-09 09:37:02 +03:00 committed by GitHub
commit f334c88ed9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
bgpd/bgp_rpki.c
View File

@ -923,25 +923,25 @@ static int config_write(struct vty *vty)
#endif #endif
case TCP: case TCP:
tcp_config = cache->tr_config.tcp_config; tcp_config = cache->tr_config.tcp_config;
vty_out(vty, " rpki cache %s%s%s %s ", tcp_config->host, vty_out(vty, " rpki cache %s %s ", tcp_config->host,
tcp_config->bindaddr ? " source " : "",
tcp_config->bindaddr ? tcp_config->bindaddr
: "",
tcp_config->port); tcp_config->port);
if (tcp_config->bindaddr)
vty_out(vty, "source %s ",
tcp_config->bindaddr);
break; break;
#if defined(FOUND_SSH) #if defined(FOUND_SSH)
case SSH: case SSH:
ssh_config = cache->tr_config.ssh_config; ssh_config = cache->tr_config.ssh_config;
vty_out(vty, " rpki cache %s%s%s %u %s %s %s ", vty_out(vty, " rpki cache %s %u %s %s %s ",
ssh_config->host, ssh_config->host, ssh_config->port,
ssh_config->bindaddr ? "source " : "", ssh_config->username,
ssh_config->bindaddr ? ssh_config->bindaddr
: "",
ssh_config->port, ssh_config->username,
ssh_config->client_privkey_path, ssh_config->client_privkey_path,
ssh_config->server_hostkey_path != NULL ssh_config->server_hostkey_path != NULL
? ssh_config->server_hostkey_path ? ssh_config->server_hostkey_path
: " "); : " ");
if (ssh_config->bindaddr)
vty_out(vty, "source %s ",
ssh_config->bindaddr);
break; break;
#endif #endif
default: default:
@ -1067,19 +1067,18 @@ DEFUN (no_rpki_retry_interval,
} }
DEFPY(rpki_cache, rpki_cache_cmd, DEFPY(rpki_cache, rpki_cache_cmd,
"rpki cache <A.B.C.D|WORD> [source <A.B.C.D>$bindaddr] " "rpki cache <A.B.C.D|WORD> <TCPPORT|(1-65535)$sshport SSH_UNAME SSH_PRIVKEY SSH_PUBKEY [SERVER_PUBKEY]> [source <A.B.C.D>$bindaddr] preference (1-255)",
"<TCPPORT|(1-65535)$sshport SSH_UNAME SSH_PRIVKEY SSH_PUBKEY [SERVER_PUBKEY]> preference (1-255)",
RPKI_OUTPUT_STRING RPKI_OUTPUT_STRING
"Install a cache server to current group\n" "Install a cache server to current group\n"
"IP address of cache server\n Hostname of cache server\n" "IP address of cache server\n Hostname of cache server\n"
"Configure source IP address of RPKI connection\n"
"Define a Source IP Address\n"
"TCP port number\n" "TCP port number\n"
"SSH port number\n" "SSH port number\n"
"SSH user name\n" "SSH user name\n"
"Path to own SSH private key\n" "Path to own SSH private key\n"
"Path to own SSH public key\n" "Path to own SSH public key\n"
"Path to Public key of cache server\n" "Path to Public key of cache server\n"
"Configure source IP address of RPKI connection\n"
"Define a Source IP Address\n"
"Preference of the cache server\n" "Preference of the cache server\n"
"Preference value\n") "Preference value\n")
{ {

8
doc/user/rpki.rst
View File

@ -109,7 +109,7 @@ The following commands are independent of a specific cache server.
The following commands configure one or multiple cache servers. The following commands configure one or multiple cache servers.
.. clicmd:: rpki cache (A.B.C.D|WORD) [source A.B.C.D] PORT [SSH_USERNAME] [SSH_PRIVKEY_PATH] [SSH_PUBKEY_PATH] [KNOWN_HOSTS_PATH] PREFERENCE .. clicmd:: rpki cache (A.B.C.D|WORD) PORT [SSH_USERNAME] [SSH_PRIVKEY_PATH] [SSH_PUBKEY_PATH] [KNOWN_HOSTS_PATH] [source A.B.C.D] PREFERENCE
Add a cache server to the socket. By default, the connection between router Add a cache server to the socket. By default, the connection between router
@ -120,9 +120,6 @@ The following commands are independent of a specific cache server.
A.B.C.D|WORD A.B.C.D|WORD
Address of the cache server. Address of the cache server.
source A.B.C.D
Source address of the RPKI connection to access cache server.
PORT PORT
Port number to connect to the cache server Port number to connect to the cache server
@ -143,6 +140,9 @@ The following commands are independent of a specific cache server.
on the configuration of the operating system environment, usually on the configuration of the operating system environment, usually
:file:`~/.ssh/known_hosts`. :file:`~/.ssh/known_hosts`.
source A.B.C.D
Source address of the RPKI connection to access cache server.
.. _validating-bgp-updates: .. _validating-bgp-updates: