From 2f490626a99c61bae2ed03a0b1eb72a38e0eea60 Mon Sep 17 00:00:00 2001 From: Sudharsan Dhamal Gopalarathnam Date: Wed, 19 Oct 2022 23:50:53 -0700 Subject: [PATCH] [FRR]Adding patch to fix enhanced capability turned on for interface (#12453) Fixing issue FRRouting/frr#11108 For interface based peers with peer-groups, "no neighbor capability extended-nexthop" gets added by default. This will result in IPv4 routes not having ipv6 next hops. - How I did it Porting the commit FRRouting/frr@8e89adc to FRR 8.2.2 which fixes the issue - How to verify it Load FRR and verify if the "no neighbor capability extended-nexthop" not gets added for interfaces associated with peer-groups --- ...pability-is-always-turned-on-for-int.patch | 36 +++++++++++++++++++ src/sonic-frr/patch/series | 1 + 2 files changed, 37 insertions(+) create mode 100644 src/sonic-frr/patch/0011-bgpd-enhanced-capability-is-always-turned-on-for-int.patch diff --git a/src/sonic-frr/patch/0011-bgpd-enhanced-capability-is-always-turned-on-for-int.patch b/src/sonic-frr/patch/0011-bgpd-enhanced-capability-is-always-turned-on-for-int.patch new file mode 100644 index 0000000000..cefa7c3144 --- /dev/null +++ b/src/sonic-frr/patch/0011-bgpd-enhanced-capability-is-always-turned-on-for-int.patch @@ -0,0 +1,36 @@ +From 4db4fc1bf0599f79067bfd62aa435be8e161d81e Mon Sep 17 00:00:00 2001 +From: Donald Sharp +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 +--- + 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 + diff --git a/src/sonic-frr/patch/series b/src/sonic-frr/patch/series index 34ec5d510a..c62bd218c7 100644 --- a/src/sonic-frr/patch/series +++ b/src/sonic-frr/patch/series @@ -10,3 +10,4 @@ Disable-ipv6-src-address-test-in-pceplib.patch cross-compile-changes.patch 0009-ignore-route-from-default-table.patch 0010-zebra-Note-when-the-netlink-DUMP-command-is-interrup.patch +0011-bgpd-enhanced-capability-is-always-turned-on-for-int.patch