proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-05 11:26:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #15924 from chiragshah6/fdev5

Browse Source 
bgpd: [GR] fix mode change vtysh return code
This commit is contained in:
Donatas Abraitis 2024-05-06 10:12:27 +03:00 committed by GitHub
commit af6eeccd75
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bgpd/bgp_vty.c
View File

@ -3347,7 +3347,7 @@ DEFUN (bgp_neighbor_graceful_restart_set,
{ {
int idx_peer = 1; int idx_peer = 1;
struct peer *peer; struct peer *peer;
int ret = BGP_GR_FAILURE; int result = BGP_GR_FAILURE, ret = BGP_GR_SUCCESS;
VTY_BGP_GR_DEFINE_LOOP_VARIABLE; VTY_BGP_GR_DEFINE_LOOP_VARIABLE;
@ -3359,8 +3359,8 @@ DEFUN (bgp_neighbor_graceful_restart_set,
if (!peer) if (!peer)
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
ret = bgp_neighbor_graceful_restart(peer, PEER_GR_CMD); result = bgp_neighbor_graceful_restart(peer, PEER_GR_CMD);
if (ret == BGP_GR_SUCCESS) { if (result == BGP_GR_SUCCESS) {
VTY_BGP_GR_ROUTER_DETECT(bgp, peer, peer->bgp->peer); VTY_BGP_GR_ROUTER_DETECT(bgp, peer, peer->bgp->peer);
VTY_SEND_BGP_GR_CAPABILITY_TO_ZEBRA(peer->bgp, ret); VTY_SEND_BGP_GR_CAPABILITY_TO_ZEBRA(peer->bgp, ret);
vty_out(vty, vty_out(vty,
@ -3371,7 +3371,11 @@ DEFUN (bgp_neighbor_graceful_restart_set,
zlog_debug( zlog_debug(
"[BGP_GR] bgp_neighbor_graceful_restart_set_cmd : END "); "[BGP_GR] bgp_neighbor_graceful_restart_set_cmd : END ");
return bgp_vty_return(vty, ret); if (ret != BGP_GR_SUCCESS)
vty_out(vty,
"As part of configuring graceful-restart, capability send to zebra failed\n");
return bgp_vty_return(vty, result);
} }
DEFUN (no_bgp_neighbor_graceful_restart, DEFUN (no_bgp_neighbor_graceful_restart,
@ -3384,7 +3388,7 @@ DEFUN (no_bgp_neighbor_graceful_restart,
) )
{ {
int idx_peer = 2; int idx_peer = 2;
int ret = BGP_GR_FAILURE; int result = BGP_GR_FAILURE, ret = BGP_GR_SUCCESS;
struct peer *peer; struct peer *peer;
VTY_BGP_GR_DEFINE_LOOP_VARIABLE; VTY_BGP_GR_DEFINE_LOOP_VARIABLE;
@ -3397,7 +3401,7 @@ DEFUN (no_bgp_neighbor_graceful_restart,
zlog_debug( zlog_debug(
"[BGP_GR] no_bgp_neighbor_graceful_restart_set_cmd : START "); "[BGP_GR] no_bgp_neighbor_graceful_restart_set_cmd : START ");
ret = bgp_neighbor_graceful_restart(peer, NO_PEER_GR_CMD); result = bgp_neighbor_graceful_restart(peer, NO_PEER_GR_CMD);
if (ret == BGP_GR_SUCCESS) { if (ret == BGP_GR_SUCCESS) {
VTY_BGP_GR_ROUTER_DETECT(bgp, peer, peer->bgp->peer); VTY_BGP_GR_ROUTER_DETECT(bgp, peer, peer->bgp->peer);
VTY_SEND_BGP_GR_CAPABILITY_TO_ZEBRA(peer->bgp, ret); VTY_SEND_BGP_GR_CAPABILITY_TO_ZEBRA(peer->bgp, ret);
@ -3409,7 +3413,11 @@ DEFUN (no_bgp_neighbor_graceful_restart,
zlog_debug( zlog_debug(
"[BGP_GR] no_bgp_neighbor_graceful_restart_set_cmd : END "); "[BGP_GR] no_bgp_neighbor_graceful_restart_set_cmd : END ");
return bgp_vty_return(vty, ret); if (ret != BGP_GR_SUCCESS)
vty_out(vty,
"As part of configuring graceful-restart, capability send to zebra failed\n");
return bgp_vty_return(vty, result);
} }
DEFUN (bgp_neighbor_graceful_restart_helper_set, DEFUN (bgp_neighbor_graceful_restart_helper_set,