From 62d8f9a842d8690497ccea3c1a9646f449fc9c4b Mon Sep 17 00:00:00 2001 From: Daniel Walton Date: Mon, 12 Jun 2017 20:09:09 +0000 Subject: [PATCH] bgpd: "no neighbor x.x.x.x send-community" not displayed correctly Signed-off-by: Daniel Walton We would only diplay one "no neighbor 2.2.2.2 send-community XYZ" but there might be multiple that need to be displayed. --- bgpd/bgpd.c | 43 ++++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c index 92a0cd6acc..cf6c00ae52 100644 --- a/bgpd/bgpd.c +++ b/bgpd/bgpd.c @@ -7096,26 +7096,31 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp, " no neighbor %s send-community all%s", addr, VTY_NEWLINE); } - else if (!peer_af_flag_check (peer, afi, safi, PEER_FLAG_SEND_LARGE_COMMUNITY) && - (!g_peer || peer_af_flag_check (g_peer, afi, safi, PEER_FLAG_SEND_LARGE_COMMUNITY))) + else { - afi_header_vty_out (vty, afi, safi, write, - " no neighbor %s send-community large%s", - addr, VTY_NEWLINE); - } - else if (!peer_af_flag_check (peer, afi, safi, PEER_FLAG_SEND_EXT_COMMUNITY) && - (!g_peer || peer_af_flag_check (g_peer, afi, safi, PEER_FLAG_SEND_EXT_COMMUNITY))) - { - afi_header_vty_out (vty, afi, safi, write, - " no neighbor %s send-community extended%s", - addr, VTY_NEWLINE); - } - else if (!peer_af_flag_check (peer, afi, safi, PEER_FLAG_SEND_COMMUNITY) && - (!g_peer || peer_af_flag_check (g_peer, afi, safi, PEER_FLAG_SEND_COMMUNITY))) - { - afi_header_vty_out (vty, afi, safi, write, - " no neighbor %s send-community%s", - addr, VTY_NEWLINE); + if (!peer_af_flag_check (peer, afi, safi, PEER_FLAG_SEND_LARGE_COMMUNITY) && + (!g_peer || peer_af_flag_check (g_peer, afi, safi, PEER_FLAG_SEND_LARGE_COMMUNITY))) + { + afi_header_vty_out (vty, afi, safi, write, + " no neighbor %s send-community large%s", + addr, VTY_NEWLINE); + } + + if (!peer_af_flag_check (peer, afi, safi, PEER_FLAG_SEND_EXT_COMMUNITY) && + (!g_peer || peer_af_flag_check (g_peer, afi, safi, PEER_FLAG_SEND_EXT_COMMUNITY))) + { + afi_header_vty_out (vty, afi, safi, write, + " no neighbor %s send-community extended%s", + addr, VTY_NEWLINE); + } + + if (!peer_af_flag_check (peer, afi, safi, PEER_FLAG_SEND_COMMUNITY) && + (!g_peer || peer_af_flag_check (g_peer, afi, safi, PEER_FLAG_SEND_COMMUNITY))) + { + afi_header_vty_out (vty, afi, safi, write, + " no neighbor %s send-community%s", + addr, VTY_NEWLINE); + } } }