Merge pull request #705 from dwalton76/bgpd-show-neighbor-community

bgpd: "no neighbor x.x.x.x send-community" not displayed correctly
This commit is contained in:
Lou Berger 2017-06-15 09:21:44 -04:00 committed by GitHub
commit ffef22509f

View File

@ -7096,21 +7096,25 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp,
" no neighbor %s send-community all%s", " no neighbor %s send-community all%s",
addr, VTY_NEWLINE); addr, VTY_NEWLINE);
} }
else if (!peer_af_flag_check (peer, afi, safi, PEER_FLAG_SEND_LARGE_COMMUNITY) && 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))) (!g_peer || peer_af_flag_check (g_peer, afi, safi, PEER_FLAG_SEND_LARGE_COMMUNITY)))
{ {
afi_header_vty_out (vty, afi, safi, write, afi_header_vty_out (vty, afi, safi, write,
" no neighbor %s send-community large%s", " no neighbor %s send-community large%s",
addr, VTY_NEWLINE); addr, VTY_NEWLINE);
} }
else if (!peer_af_flag_check (peer, afi, safi, PEER_FLAG_SEND_EXT_COMMUNITY) &&
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))) (!g_peer || peer_af_flag_check (g_peer, afi, safi, PEER_FLAG_SEND_EXT_COMMUNITY)))
{ {
afi_header_vty_out (vty, afi, safi, write, afi_header_vty_out (vty, afi, safi, write,
" no neighbor %s send-community extended%s", " no neighbor %s send-community extended%s",
addr, VTY_NEWLINE); addr, VTY_NEWLINE);
} }
else if (!peer_af_flag_check (peer, afi, safi, PEER_FLAG_SEND_COMMUNITY) &&
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))) (!g_peer || peer_af_flag_check (g_peer, afi, safi, PEER_FLAG_SEND_COMMUNITY)))
{ {
afi_header_vty_out (vty, afi, safi, write, afi_header_vty_out (vty, afi, safi, write,
@ -7118,6 +7122,7 @@ bgp_config_write_peer_af (struct vty *vty, struct bgp *bgp,
addr, VTY_NEWLINE); addr, VTY_NEWLINE);
} }
} }
}
/* Default information */ /* Default information */
if (peergroup_af_flag_check (peer, afi, safi, PEER_FLAG_DEFAULT_ORIGINATE) || if (peergroup_af_flag_check (peer, afi, safi, PEER_FLAG_DEFAULT_ORIGINATE) ||