37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
|
From 4db4fc1bf0599f79067bfd62aa435be8e161d81e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Donald Sharp <sharpd@nvidia.com>
|
||
|
|
Date: Tue, 3 May 2022 12:51:21 -0400
|
||
|
|
Subject: [PATCH] bgpd: enhanced capability is always turned on for interface
|
||
|
|
based peers
|
||
|
|
|
||
|
|
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>
|
||
|
|
---
|
||
|
|
bgpd/bgp_vty.c | 3 ++-
|
||
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
|
||
|
|
index 4df2abef8..6fcce239b 100644
|
||
|
|
--- a/bgpd/bgp_vty.c
|
||
|
|
+++ b/bgpd/bgp_vty.c
|
||
|
|
@@ -16586,7 +16586,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);
|
||
|
|
--
|
||
|
|
2.17.1
|
||
|
|
|