bgpd: enhanced capability is always turned on for interface based peers

donaldsharp · donaldsharp · commit 8e89adc1edfb · 2022-05-04T07:51:14.000-04:00
FRR is displaying that the peer enhanced capability command is not turned on when the interface is part of a peer group. Saving the config and then reloading actually turns it off. Fix the code so that FRR does not display the enhanced capability for interface based peers. Fixes: #11108 Signed-off-by: Donald Sharp <sharpd@nvidia.com>
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
@@ -16614,7 +16614,8 @@ static void bgp_config_write_peer_global(struct vty *vty, struct bgp *bgp,
 
 	/* capability extended-nexthop */
 	if (peergroup_flag_check(peer, PEER_FLAG_CAPABILITY_ENHE)) {
-		if (CHECK_FLAG(peer->flags_invert, PEER_FLAG_CAPABILITY_ENHE))
+		if (CHECK_FLAG(peer->flags_invert, PEER_FLAG_CAPABILITY_ENHE) &&
+		    !peer->conf_if)
 			vty_out(vty,
 				" no neighbor %s capability extended-nexthop\n",
 				addr);
