summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbisdhdh <biswajit.sadhu@gmail.com>2019-10-24 09:04:05 +0530
committerbisdhdh <biswajit.sadhu@gmail.com>2020-01-23 09:34:25 +0530
commit2bb5d39b14cf25ea118c144cfae9b5945dbace1a (patch)
tree65359d3daa4bf92fb453beae2f2fcd1ad7a98cca
parent5f9c1aa29eab6052403fdf2df2c1d7c543da687c (diff)
bgpd: show BGP GR Neighbor mode as “NotApplicable”,when local mode is “Disable”.
BGP GR Neighbor mode is showing the default string as “NotRecieved”, as the bgp gr neighbour capability was not processed, since the local mode is “Disable”. However now it would be changed to “NotApplicable”. Signed-off-by: Biswajit Sadhu <sadhub@vmware.com>
-rw-r--r--bgpd/bgp_vty.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 896d1f0e89..bca28150e4 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -9368,13 +9368,12 @@ static void bgp_show_neighbor_graceful_restart_remote_mode(
bool use_json,
json_object *json)
{
- const char *mode = "NotReceived";
+ const char *mode = "NotApplicable";
if (!use_json)
vty_out(vty, "\n Remote GR Mode : ");
if (CHECK_FLAG(peer->cap, PEER_CAP_RESTART_ADV) &&
- (CHECK_FLAG(peer->cap, PEER_CAP_RESTART_RCV)) &&
(peer->status == Established)) {
if ((peer->nsf_af_count == 0) &&
@@ -9383,12 +9382,14 @@ static void bgp_show_neighbor_graceful_restart_remote_mode(
/*Gr disabled case*/
mode = "Disable";
- } else if (peer->nsf_af_count == 0) {
+ } else if (peer->nsf_af_count == 0 &&
+ CHECK_FLAG(peer->cap, PEER_CAP_RESTART_RCV)) {
/* Helper */
mode = "Helper";
- } else if (peer->nsf_af_count != 0) {
+ } else if (peer->nsf_af_count != 0 &&
+ CHECK_FLAG(peer->cap, PEER_CAP_RESTART_RCV)) {
/* Restart */
mode = "Restart";