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

bgpd: Rename SERVER_PUBKEY to KNOWN_HOSTS_PATH

Browse Source 
SERVER_PUBKEY is not the best name to describe what it really is.

Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
This commit is contained in:
Donatas Abraitis 2024-05-21 09:00:24 +03:00
parent 043cff5286
commit d536fb675b
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bgpd/bgp_rpki.c
View File

@ -1922,7 +1922,7 @@ DEFUN (no_rpki_retry_interval,
CPP_NOTICE("Remove rpki_cache_cmd") CPP_NOTICE("Remove rpki_cache_cmd")
#endif #endif
DEFPY(rpki_cache, rpki_cache_cmd, DEFPY(rpki_cache, rpki_cache_cmd,
"rpki cache <A.B.C.D|WORD> <TCPPORT|(1-65535)$sshport SSH_UNAME SSH_PRIVKEY [SERVER_PUBKEY]> [source <A.B.C.D>$bindaddr] preference (1-255)", "rpki cache <A.B.C.D|WORD> <TCPPORT|(1-65535)$sshport SSH_UNAME SSH_PRIVKEY [KNOWN_HOSTS_PATH]> [source <A.B.C.D>$bindaddr] 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" "IP address of cache server\n"
@ -1931,7 +1931,7 @@ DEFPY(rpki_cache, rpki_cache_cmd,
"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 Public key of cache server\n" "Path to the known hosts file\n"
"Configure source IP address of RPKI connection\n" "Configure source IP address of RPKI connection\n"
"Define a Source IP Address\n" "Define a Source IP Address\n"
"Preference of the cache server\n" "Preference of the cache server\n"
@ -1970,7 +1970,7 @@ DEFPY(rpki_cache, rpki_cache_cmd,
if (ssh_uname) { if (ssh_uname) {
#if defined(FOUND_SSH) #if defined(FOUND_SSH)
return_value = add_ssh_cache(rpki_vrf, cache, sshport, ssh_uname, return_value = add_ssh_cache(rpki_vrf, cache, sshport, ssh_uname,
ssh_privkey, server_pubkey, ssh_privkey, known_hosts_path,
preference, bindaddr_str); preference, bindaddr_str);
#else #else
return_value = SUCCESS; return_value = SUCCESS;
@ -2050,7 +2050,7 @@ DEFPY(rpki_cache_tcp, rpki_cache_tcp_cmd,
} }
DEFPY(rpki_cache_ssh, rpki_cache_ssh_cmd, DEFPY(rpki_cache_ssh, rpki_cache_ssh_cmd,
"rpki cache ssh <A.B.C.D|WORD>$cache (1-65535)$sshport SSH_UNAME SSH_PRIVKEY [SERVER_PUBKEY] [source <A.B.C.D>$bindaddr] preference (1-255)", "rpki cache ssh <A.B.C.D|WORD>$cache (1-65535)$sshport SSH_UNAME SSH_PRIVKEY [KNOWN_HOSTS_PATH] [source <A.B.C.D>$bindaddr] 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"
"Use SSH\n" "Use SSH\n"
@ -2059,7 +2059,7 @@ DEFPY(rpki_cache_ssh, rpki_cache_ssh_cmd,
"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 Public key of cache server\n" "Path to the known hosts file\n"
"Configure source IP address of RPKI connection\n" "Configure source IP address of RPKI connection\n"
"Define a Source IP Address\n" "Define a Source IP Address\n"
"Preference of the cache server\n" "Preference of the cache server\n"
@ -2096,7 +2096,7 @@ DEFPY(rpki_cache_ssh, rpki_cache_ssh_cmd,
#if defined(FOUND_SSH) #if defined(FOUND_SSH)
return_value = add_ssh_cache(rpki_vrf, cache, sshport, ssh_uname, return_value = add_ssh_cache(rpki_vrf, cache, sshport, ssh_uname,
ssh_privkey, server_pubkey, preference, ssh_privkey, known_hosts_path, preference,
bindaddr_str); bindaddr_str);
#else #else
return_value = SUCCESS; return_value = SUCCESS;
@ -2117,7 +2117,7 @@ DEFPY(rpki_cache_ssh, rpki_cache_ssh_cmd,
DEFPY (no_rpki_cache, DEFPY (no_rpki_cache,
no_rpki_cache_cmd, no_rpki_cache_cmd,
"no rpki cache <tcp|ssh> <A.B.C.D|WORD> <TCPPORT|(1-65535)$sshport SSH_UNAME SSH_PRIVKEY [SERVER_PUBKEY]> [source <A.B.C.D>$bindaddr] preference (1-255)", "no rpki cache <tcp|ssh> <A.B.C.D|WORD> <TCPPORT|(1-65535)$sshport SSH_UNAME SSH_PRIVKEY [KNOWN_HOSTS_PATH]> [source <A.B.C.D>$bindaddr] preference (1-255)",
NO_STR NO_STR
RPKI_OUTPUT_STRING RPKI_OUTPUT_STRING
"Install a cache server to current group\n" "Install a cache server to current group\n"
@ -2129,7 +2129,7 @@ DEFPY (no_rpki_cache,
"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 Public key of cache server\n" "Path to the known hosts file\n"
"Configure source IP address of RPKI connection\n" "Configure source IP address of RPKI connection\n"
"Define a Source IP Address\n" "Define a Source IP Address\n"
"Preference of the cache server\n" "Preference of the cache server\n"

4
doc/user/rpki.rst
View File

@ -135,7 +135,7 @@ The following commands are available for independent of a specific cache server.
Add a TCP cache server to the socket. Add a TCP cache server to the socket.
.. clicmd:: rpki cache ssh HOST PORT SSH_USERNAME SSH_PRIVKEY_PATH [SERVER_PUBKEY] [source A.B.C.D] preference (1-255) .. clicmd:: rpki cache ssh HOST PORT SSH_USERNAME SSH_PRIVKEY_PATH [KNOWN_HOSTS_PATH] [source A.B.C.D] preference (1-255)
Add a SSH cache server to the socket. Add a SSH cache server to the socket.
@ -145,7 +145,7 @@ The following commands are available for independent of a specific cache server.
SSH_PRIVKEY_PATH SSH_PRIVKEY_PATH
Local path that includes the private key file of the router. Local path that includes the private key file of the router.
SERVER_PUBKEY KNOWN_HOSTS_PATH
Local path that includes the known hosts file. The default value depends Local path that includes the known hosts file. The default value depends
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`.