proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-24 21:19:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12626 from opensourcerouting/fix/bgpd_neighbor_password_unnumbered

Browse Source 
bgpd: Warn user about mixed order of commands executed
This commit is contained in:
Donald Sharp 2023-01-13 08:35:36 -05:00 committed by GitHub
commit 930e01aae1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bgpd/bgp_bfd.c
View File

@ -521,10 +521,8 @@ DEFUN (neighbor_bfd_check_controlplane_failure,
else else
idx_peer = 1; idx_peer = 1;
peer = peer_and_group_lookup_vty(vty, argv[idx_peer]->arg); peer = peer_and_group_lookup_vty(vty, argv[idx_peer]->arg);
if (!peer) { if (!peer)
vty_out(vty, "%% Specify remote-as or peer-group commands first\n");
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
}
if (CHECK_FLAG(peer->sflags, PEER_STATUS_GROUP)) if (CHECK_FLAG(peer->sflags, PEER_STATUS_GROUP))
bgp_group_configure_bfd(peer); bgp_group_configure_bfd(peer);

5
bgpd/bgp_vty.c
View File

@ -819,6 +819,9 @@ struct peer *peer_and_group_lookup_vty(struct vty *vty, const char *peer_str)
if (peer) { if (peer) {
if (peer_dynamic_neighbor(peer)) { if (peer_dynamic_neighbor(peer)) {
zlog_warn(
"%pBP: Operation not allowed on a dynamic neighbor",
peer);
vty_out(vty, vty_out(vty,
"%% Operation not allowed on a dynamic neighbor\n"); "%% Operation not allowed on a dynamic neighbor\n");
return NULL; return NULL;
@ -830,6 +833,8 @@ struct peer *peer_and_group_lookup_vty(struct vty *vty, const char *peer_str)
if (group) if (group)
return group->conf; return group->conf;
zlog_warn("Specify remote-as or peer-group commands first before: %s",
vty->buf);
vty_out(vty, "%% Specify remote-as or peer-group commands first\n"); vty_out(vty, "%% Specify remote-as or peer-group commands first\n");
return NULL; return NULL;