mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-07 17:18:56 +00:00
bgpd: Apply NOOP when doing negative commands for GR operations
E.g.:
```
% The Graceful Restart command used is not valid at this moment.
zsh: exit 1 vtysh -c configure -c 'router bgp' -c 'no neighbor 127.0.0.1 graceful-restart
1
```
This does not make sense frr-reload to fail.
Instead, just ignore such requests if they are just NOOP.
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
(cherry picked from commit 9ebdb8e80d
)
This commit is contained in:
parent
9ca4407147
commit
25986a7f5b
@ -1446,11 +1446,11 @@ int bgp_peer_gr_init(struct peer *peer)
|
|||||||
{
|
{
|
||||||
/* PEER_GLOBAL_INHERIT Mode */
|
/* PEER_GLOBAL_INHERIT Mode */
|
||||||
/* Event-> */ /* PEER_GR_CMD */ /* NO_PEER_GR_CMD */
|
/* Event-> */ /* PEER_GR_CMD */ /* NO_PEER_GR_CMD */
|
||||||
{ PEER_GR, bgp_peer_gr_action }, { PEER_INVALID, NULL },
|
{ PEER_GR, bgp_peer_gr_action }, { PEER_GLOBAL_INHERIT, NULL },
|
||||||
/* Event-> */ /* PEER_DISABLE_CMD */ /* NO_PEER_DISABLE_CMD */
|
/* Event-> */ /* PEER_DISABLE_CMD */ /* NO_PEER_DISABLE_CMD */
|
||||||
{ PEER_DISABLE, bgp_peer_gr_action}, { PEER_INVALID, NULL },
|
{ PEER_DISABLE, bgp_peer_gr_action }, { PEER_GLOBAL_INHERIT, NULL },
|
||||||
/* Event-> */ /* PEER_HELPER_cmd */ /* NO_PEER_HELPER_CMD */
|
/* Event-> */ /* PEER_HELPER_cmd */ /* NO_PEER_HELPER_CMD */
|
||||||
{ PEER_HELPER, bgp_peer_gr_action }, { PEER_INVALID, NULL }
|
{ PEER_HELPER, bgp_peer_gr_action }, { PEER_GLOBAL_INHERIT, NULL }
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
memcpy(&peer->PEER_GR_FSM, local_Peer_GR_FSM,
|
memcpy(&peer->PEER_GR_FSM, local_Peer_GR_FSM,
|
||||||
|
Loading…
Reference in New Issue
Block a user