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

bgpd: fix "clear bgp" commands

Browse Source 
The use of VTY_DECLVAR_CONTEXT(bgp, bgp) here is wrong as we are not
inside the "router bgp" configuration node. This was making the clear
commands always fail with a "Current configuration object was deleted
by another process" error, which doesn't make any sense.

Also, the bgp_clear() function will already check for us if the given
peer-group or neighbor exists or not, there's no need to duplicate this
logic here.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
This commit is contained in:
Renato Westphal 2017-04-28 10:22:28 -03:00
parent 59341c1b5e
commit f0dac89fde
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bgpd/bgp_vty.c
View File

@ -5895,7 +5895,6 @@ DEFUN (clear_ip_bgp_all,
"Push out prefix-list ORF and do inbound soft reconfig\n" "Push out prefix-list ORF and do inbound soft reconfig\n"
BGP_SOFT_OUT_STR) BGP_SOFT_OUT_STR)
{ {
VTY_DECLVAR_CONTEXT(bgp, bgp);
char *vrf = NULL; char *vrf = NULL;
afi_t afi = AFI_IP6; afi_t afi = AFI_IP6;
@ -5935,25 +5934,11 @@ DEFUN (clear_ip_bgp_all,
clr_sort = clear_group; clr_sort = clear_group;
idx++; idx++;
clr_arg = argv[idx]->arg; clr_arg = argv[idx]->arg;
if (! peer_group_lookup (bgp, clr_arg))
{
vty_out (vty, "%% No such peer-group%s", VTY_NEWLINE);
return CMD_WARNING;
}
} }
else if (argv_find (argv, argc, "WORD", &idx)) else if (argv_find (argv, argc, "WORD", &idx))
{ {
if (peer_lookup_by_conf_if (bgp, argv[idx]->arg)) clr_sort = clear_peer;
{ clr_arg = argv[idx]->arg;
clr_sort = clear_peer;
clr_arg = argv[idx]->arg;
}
else
{
vty_out (vty, "%% No such neighbor%s", VTY_NEWLINE);
return CMD_WARNING;
}
} }
else if (argv_find (argv, argc, "(1-4294967295)", &idx)) else if (argv_find (argv, argc, "(1-4294967295)", &idx))
{ {