[sonic-frr]: Port patches from frr-10.3 to frr-10.4.1

Signed-off-by: Yuqing Zhao <[email protected]>

Author: GaladrielZhao

…rity-of-Vty-connected-from-message.patch …rity-of-Vty-connected-from-message.patchsrc/sonic-frr/patch/0001-Reduce-severity-of-Vty-connected-from-message.patch renamed to src/sonic-frr/patch/0001-SONiC-ONLY-Reduce-severity-of-Vty-connected-from-message.patch src/sonic-frr/patch/0001-Reduce-severity-of-Vty-connected-from-message.patch renamed to src/sonic-frr/patch/0001-SONiC-ONLY-Reduce-severity-of-Vty-connected-from-message.patch

@@ -1,16 +1,18 @@
-From 69370e52e94c66e06052a7859dd059dfa34fd61e Mon Sep 17 00:00:00 2001
+[PATCH] From 15274a197e4d3b7ac0f11ca63a5274f1168739f5 Mon Sep 17
+
 From: Pavel Shirshov <[email protected]>
 Date: Mon, 16 Nov 2020 18:11:47 -0800
-Subject: [PATCH] From 15274a197e4d3b7ac0f11ca63a5274f1168739f5 Mon Sep 17
  00:00:00 2001 Subject: [PATCH 2/8] Reduce severity of 'Vty connected from'
  message
-
+---
+ lib/vty.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/vty.c b/lib/vty.c
-index 1d04e75bf..ecbbd73db 100644
+index 43ff964d8..fad2ff991 100644
 --- a/lib/vty.c
 +++ b/lib/vty.c
-@@ -1968,7 +1968,7 @@ static void vty_accept(struct event *thread)
+@@ -1959,7 +1959,7 @@ static void vty_accept(struct event *thread)
  		zlog_info("can't set sockopt to vty_sock : %s",
  			  safe_strerror(errno));
 
@@ -19,6 +21,3 @@ index 1d04e75bf..ecbbd73db 100644
 
  	vty_create(vty_sock, &su);
  }
--- 
-2.17.1
-

…T_HOP-to-be-0.0.0.0-due-to-allevia.patch …T_HOP-to-be-0.0.0.0-due-to-allevia.patchsrc/sonic-frr/patch/0002-Allow-BGP-attr-NEXT_HOP-to-be-0.0.0.0-due-to-allevia.patch renamed to src/sonic-frr/patch/0002-SONiC-ONLY-Allow-BGP-attr-NEXT_HOP-to-be-0.0.0.0-due-to-allevia.patch src/sonic-frr/patch/0002-Allow-BGP-attr-NEXT_HOP-to-be-0.0.0.0-due-to-allevia.patch renamed to src/sonic-frr/patch/0002-SONiC-ONLY-Allow-BGP-attr-NEXT_HOP-to-be-0.0.0.0-due-to-allevia.patch

@@ -1,16 +1,18 @@
-From 44ed2b0d2a2ca6029238118603264e02e2e965f4 Mon Sep 17 00:00:00 2001
+[PATCH] From afff474c79e0c177e090d1b45d68c9f816a52e3e Mon Sep 17
+
 From: Pavel Shirshov <[email protected]>
 Date: Mon, 16 Nov 2020 18:33:46 -0800
-Subject: [PATCH] From afff474c79e0c177e090d1b45d68c9f816a52e3e Mon Sep 17
  00:00:00 2001 Subject: [PATCH 4/8] Allow BGP attr NEXT_HOP to be 0.0.0.0 due
  to  alleviate
-
+---
+ bgpd/bgp_route.c |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
 
 diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
-index 39172cc08..9d96a3e43 100644
+index aa6c701ca..a8427bc3b 100644
 --- a/bgpd/bgp_route.c
 +++ b/bgpd/bgp_route.c
-@@ -4719,8 +4719,7 @@ bool bgp_update_martian_nexthop(struct bgp *bgp, afi_t afi, safi_t safi,
+@@ -4786,8 +4786,7 @@ bool bgp_update_martian_nexthop(struct bgp *bgp, afi_t afi, safi_t safi,
  	 * E.g.: IPv6 prefix can be with nexthop: 0.0.0.0, and mp_nexthop: fc00::1.
  	 */
  	if (CHECK_FLAG(attr->flag, ATTR_FLAG_BIT(BGP_ATTR_NEXT_HOP)))
@@ -20,6 +22,3 @@ index 39172cc08..9d96a3e43 100644
  			      bgp_nexthop_self(bgp, afi, type, stype, attr, dest));
 
  	/* If MP_NEXTHOP is present, validate it. */
--- 
-2.17.1
-

…xthops-compare-vrf-only-if-ip-type.patch …xthops-compare-vrf-only-if-ip-type.patchsrc/sonic-frr/patch/0003-nexthops-compare-vrf-only-if-ip-type.patch renamed to src/sonic-frr/patch/0003-SONiC-ONLY-nexthops-compare-vrf-only-if-ip-type.patch src/sonic-frr/patch/0003-nexthops-compare-vrf-only-if-ip-type.patch renamed to src/sonic-frr/patch/0003-SONiC-ONLY-nexthops-compare-vrf-only-if-ip-type.patch

@@ -1,15 +1,18 @@
-From 2b778b1984c5f88500625a0e96a5ba1d1fe0316c Mon Sep 17 00:00:00 2001
+[PATCH] From 786087468520db44c55e3566f77438b41f52763f Mon Sep 17
+
 From: Pavel Shirshov <[email protected]>
 Date: Mon, 16 Nov 2020 18:35:01 -0800
-Subject: [PATCH] From 786087468520db44c55e3566f77438b41f52763f Mon Sep 17
  00:00:00 2001 Subject: [PATCH 5/8] nexthops compare vrf only if ip type
-
+---
+ lib/nexthop.c |   12 ++++++------
+ lib/zclient.c |   12 ++++++------
+ 2 files changed, 12 insertions(+), 12 deletions(-)
 
 diff --git a/lib/nexthop.c b/lib/nexthop.c
-index c377b9cb0..6fe45b2c5 100644
+index e8f5ecf17..9381b3a89 100644
 --- a/lib/nexthop.c
 +++ b/lib/nexthop.c
-@@ -143,12 +143,6 @@ static int _nexthop_cmp_no_labels(const struct nexthop *next1,
+@@ -149,12 +149,6 @@ static int _nexthop_cmp_no_labels(const struct nexthop *next1,
  {
  	int ret = 0;
 
@@ -22,7 +25,7 @@ index c377b9cb0..6fe45b2c5 100644
  	if (next1->type < next2->type)
  		return -1;
 
-@@ -166,6 +160,12 @@ static int _nexthop_cmp_no_labels(const struct nexthop *next1,
+@@ -172,6 +166,12 @@ static int _nexthop_cmp_no_labels(const struct nexthop *next1,
  	switch (next1->type) {
  	case NEXTHOP_TYPE_IPV4:
  	case NEXTHOP_TYPE_IPV6:
@@ -36,10 +39,10 @@ index c377b9cb0..6fe45b2c5 100644
  		if (ret != 0)
  			return ret;
 diff --git a/lib/zclient.c b/lib/zclient.c
-index 5deea8f0c..28e9da721 100644
+index 558626fa3..3ab7bc040 100644
 --- a/lib/zclient.c
 +++ b/lib/zclient.c
-@@ -976,12 +976,6 @@ static int zapi_nexthop_cmp_no_labels(const struct zapi_nexthop *next1,
+@@ -982,12 +982,6 @@ static int zapi_nexthop_cmp_no_labels(const struct zapi_nexthop *next1,
  {
  	int ret = 0;
 
@@ -52,7 +55,7 @@ index 5deea8f0c..28e9da721 100644
  	if (next1->type < next2->type)
  		return -1;
 
-@@ -997,6 +991,12 @@ static int zapi_nexthop_cmp_no_labels(const struct zapi_nexthop *next1,
+@@ -1003,6 +997,12 @@ static int zapi_nexthop_cmp_no_labels(const struct zapi_nexthop *next1,
  	switch (next1->type) {
  	case NEXTHOP_TYPE_IPV4:
  	case NEXTHOP_TYPE_IPV6:
@@ -65,6 +68,3 @@ index 5deea8f0c..28e9da721 100644
  		ret = nexthop_g_addr_cmp(next1->type, &next1->gate,
  					 &next2->gate);
  		if (ret != 0)
--- 
-2.17.1
-

…-log-outchannel-to-var-log-frr.log.patch …-log-outchannel-to-var-log-frr.log.patchsrc/sonic-frr/patch/0004-frr-remove-frr-log-outchannel-to-var-log-frr.log.patch renamed to src/sonic-frr/patch/0004-SONiC-ONLY-frr-remove-frr-log-outchannel-to-var-log-frr.log.patch src/sonic-frr/patch/0004-frr-remove-frr-log-outchannel-to-var-log-frr.log.patch renamed to src/sonic-frr/patch/0004-SONiC-ONLY-frr-remove-frr-log-outchannel-to-var-log-frr.log.patch

@@ -1,12 +1,14 @@
-From ece5d83bebfe2345edf8e18f5af713bd99cc3739 Mon Sep 17 00:00:00 2001
+[PATCH] From 0417036a3aece862c95111d4646ca7508a028165 Mon Sep 17
+
 From: Ying Xie <[email protected]>
 Date: Wed, 25 Nov 2020 22:28:43 +0000
-Subject: [PATCH] From 0417036a3aece862c95111d4646ca7508a028165 Mon Sep 17
  00:00:00 2001 Subject: [PATCH] [PATCH 6/8] [frr] remove frr log outchannel to
  /var/log/frr.log SONiC runs frr inside a docker and the logs are sent to base
  image via rsyslog and recorded already. There is no need to keep the frr.log
  inside the docker. It will grow and take all harddrive space eventually.
-
+---
+ tools/etc/rsyslog.d/45-frr.conf |   24 ------------------------
+ 1 file changed, 24 deletions(-)
 
 diff --git a/tools/etc/rsyslog.d/45-frr.conf b/tools/etc/rsyslog.d/45-frr.conf
 index ef37d66d8..2e8e1e12d 100644
@@ -43,6 +45,3 @@ index ef37d66d8..2e8e1e12d 100644
  if  $programname == 'babeld' or
      $programname == 'bgpd' or
      $programname == 'bfdd' or
--- 
-2.17.1
-

src/sonic-frr/patch/0005-Add-support-of-bgp-l3vni-evpn.patch

@@ -1,20 +1,27 @@
-From a0846dcf6f496bcfb51dd11c03d1a6c666d4020a Mon Sep 17 00:00:00 2001
+[PATCH] From f5f0018266c98ad96cdbe69ae60d501de21e5600 Mon Sep 17
+
 From: Stepan Blyschak <[email protected]>
 Date: Thu, 20 Oct 2022 13:19:31 +0000
-Subject: [PATCH] From f5f0018266c98ad96cdbe69ae60d501de21e5600 Mon Sep 17
  00:00:00 2001 Subject: [PATCH] From 369bbb4d62aa47d5a6d5157ca6ea819c4cb80f15
  Mon Sep 17  00:00:00 2001 Subject: [PATCH 07/13] Added support of L3VNI EVPN
 
 This is temp patch till Prefix to ARP indirection is add in neighorch
 
 Signed-off-by: Kishore Kunal <[email protected]>
 Signed-off-by: Stepan Blyschak <[email protected]>
+---
+ lib/nexthop.c        |    1 +
+ lib/nexthop.h        |    7 ++++++-
+ zebra/rt_netlink.c   |   15 ++++++++++++++-
+ zebra/zapi_msg.c     |    4 ++++
+ zebra/zebra_dplane.c |    2 +-
+ 5 files changed, 26 insertions(+), 3 deletions(-)
 
 diff --git a/lib/nexthop.c b/lib/nexthop.c
-index 6fe45b2c5..527248a74 100644
+index 9381b3a89..39da310de 100644
 --- a/lib/nexthop.c
 +++ b/lib/nexthop.c
-@@ -851,6 +851,7 @@ void nexthop_copy_no_recurse(struct nexthop *copy,
+@@ -887,6 +887,7 @@ void nexthop_copy_no_recurse(struct nexthop *copy,
  	memcpy(&copy->rmap_src, &nexthop->rmap_src, sizeof(nexthop->rmap_src));
  	memcpy(&copy->rmac, &nexthop->rmac, sizeof(nexthop->rmac));
  	copy->rparent = rparent;
@@ -23,7 +30,7 @@ index 6fe45b2c5..527248a74 100644
  		nexthop_add_labels(copy, nexthop->nh_label_type,
  				   nexthop->nh_label->num_labels,
 diff --git a/lib/nexthop.h b/lib/nexthop.h
-index cea7c77e3..65056cd55 100644
+index 4b34ad85a..8fde85019 100644
 --- a/lib/nexthop.h
 +++ b/lib/nexthop.h
 @@ -52,6 +52,11 @@ enum nh_encap_type {
@@ -48,18 +55,18 @@ index cea7c77e3..65056cd55 100644
 
  	/* EVPN router's MAC.
 diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
-index d696b1985..f12b324e0 100644
+index e9f5bcb7a..12a790025 100644
 --- a/zebra/rt_netlink.c
 +++ b/zebra/rt_netlink.c
-@@ -2131,6 +2131,7 @@ static int netlink_route_nexthop_encap(bool fpm, struct nlmsghdr *n,
+@@ -2213,6 +2213,7 @@ static int netlink_route_nexthop_encap(bool fpm, struct nlmsghdr *n,
  				       size_t nlen, const struct nexthop *nh)
  {
  	struct rtattr *nest;
 +	struct vxlan_nh_encap* encap_data;
 
  	if (!fpm)
  		return true;
-@@ -2144,8 +2145,20 @@ static int netlink_route_nexthop_encap(bool fpm, struct nlmsghdr *n,
+@@ -2226,8 +2227,20 @@ static int netlink_route_nexthop_encap(bool fpm, struct nlmsghdr *n,
  		if (!nest)
  			return false;
 
@@ -82,10 +89,10 @@ index d696b1985..f12b324e0 100644
  		break;
  	}
 diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c
-index e9d554ba3..239b9472b 100644
+index 3a27802b5..0e12909ec 100644
 --- a/zebra/zapi_msg.c
 +++ b/zebra/zapi_msg.c
-@@ -1662,6 +1662,8 @@ static struct nexthop *nexthop_from_zapi(const struct zapi_nexthop *api_nh,
+@@ -1650,6 +1650,8 @@ static struct nexthop *nexthop_from_zapi(const struct zapi_nexthop *api_nh,
  		 * the nexthop and associated MAC need to be installed.
  		 */
  		if (CHECK_FLAG(api_nh->flags, ZAPI_NEXTHOP_FLAG_EVPN)) {
@@ -94,7 +101,7 @@ index e9d554ba3..239b9472b 100644
  			SET_FLAG(nexthop->flags, NEXTHOP_FLAG_EVPN);
  			nexthop->rmac = api_nh->rmac;
  		}
-@@ -1691,6 +1693,8 @@ static struct nexthop *nexthop_from_zapi(const struct zapi_nexthop *api_nh,
+@@ -1679,6 +1681,8 @@ static struct nexthop *nexthop_from_zapi(const struct zapi_nexthop *api_nh,
  		 * the nexthop and associated MAC need to be installed.
  		 */
  		if (CHECK_FLAG(api_nh->flags, ZAPI_NEXTHOP_FLAG_EVPN)) {
@@ -104,7 +111,7 @@ index e9d554ba3..239b9472b 100644
  			nexthop->rmac = api_nh->rmac;
  		}
 diff --git a/zebra/zebra_dplane.c b/zebra/zebra_dplane.c
-index 9c252cc63..92b571c68 100644
+index 2763dc3b4..ebedc7b2c 100644
 --- a/zebra/zebra_dplane.c
 +++ b/zebra/zebra_dplane.c
 @@ -3568,7 +3568,7 @@ int dplane_ctx_route_init(struct zebra_dplane_ctx *ctx, enum dplane_op_e op,
@@ -116,6 +123,3 @@ index 9c252cc63..92b571c68 100644
  		}
  	}
 
--- 
-2.17.1
-

…-for-bgp-ipv6-link-local-neighbors.patch …-for-bgp-ipv6-link-local-neighbors.patchsrc/sonic-frr/patch/0006-Link-local-scope-was-not-set-while-binding-socket-for-bgp-ipv6-link-local-neighbors.patch renamed to src/sonic-frr/patch/0006-SONiC-ONLY-Link-local-scope-was-not-set-while-binding-socket-for-bgp-ipv6-link-local-neighbors.patch src/sonic-frr/patch/0006-Link-local-scope-was-not-set-while-binding-socket-for-bgp-ipv6-link-local-neighbors.patch renamed to src/sonic-frr/patch/0006-SONiC-ONLY-Link-local-scope-was-not-set-while-binding-socket-for-bgp-ipv6-link-local-neighbors.patch

@@ -1,17 +1,19 @@
-From 4fdb386b2b41278ca10431fe2b386853985aff0f Mon Sep 17 00:00:00 2001
+[PATCH] From 92ab2d74fca06f86c00d886ac249f7f2d89e93fe Mon Sep 17
+
 From: Akhilesh Samineni <[email protected]>
 Date: Mon, 5 Apr 2021 13:21:40 -0700
-Subject: [PATCH] From 92ab2d74fca06f86c00d886ac249f7f2d89e93fe Mon Sep 17
  00:00:00 2001 Subject: [PATCH 8/8] Link local scope was not set while binding
  socket  with local address causing socket errors for bgp ipv6 link local
  neighbors.
-
+---
+ bgpd/bgp_network.c |    5 +++++
+ 1 file changed, 5 insertions(+)
 
 diff --git a/bgpd/bgp_network.c b/bgpd/bgp_network.c
-index 3df4aa286..8b0901fa6 100644
+index d535c3d87..c9b019424 100644
 --- a/bgpd/bgp_network.c
 +++ b/bgpd/bgp_network.c
-@@ -742,6 +742,11 @@ int bgp_update_address(struct interface *ifp, const union sockunion *dst,
+@@ -753,6 +753,11 @@ int bgp_update_address(struct interface *ifp, const union sockunion *dst,
  		return 1;
 
  	prefix2sockunion(sel, addr);
@@ -23,6 +25,3 @@ index 3df4aa286..8b0901fa6 100644
  	return 0;
  }
 
--- 
-2.17.1
-

…07-ignore-route-from-default-table.patch …LY-ignore-route-from-default-table.patchsrc/sonic-frr/patch/0007-ignore-route-from-default-table.patch renamed to src/sonic-frr/patch/0007-SONiC-ONLY-ignore-route-from-default-table.patch src/sonic-frr/patch/0007-ignore-route-from-default-table.patch renamed to src/sonic-frr/patch/0007-SONiC-ONLY-ignore-route-from-default-table.patch

@@ -1,16 +1,19 @@
-From 1a639f2dcd400997345dab424a2adbc091752661 Mon Sep 17 00:00:00 2001
+[PATCH] From ca66350aecf7db3354019480d11754fabae3a97c Mon Sep 17
+
 From: Stepan Blyschak <[email protected]>
 Date: Thu, 20 Oct 2022 13:07:18 +0000
-Subject: [PATCH] From ca66350aecf7db3354019480d11754fabae3a97c Mon Sep 17
  00:00:00 2001 Subject: [PATCH 09/13] ignore route from default table
 
 Signed-off-by: Stepan Blyschak <[email protected]>
+---
+ zebra/dplane_fpm_nl.c |    9 +++++++++
+ 1 file changed, 9 insertions(+)
 
 diff --git a/zebra/dplane_fpm_nl.c b/zebra/dplane_fpm_nl.c
-index b8dbabb60..3332638cc 100644
+index 41f603a9e..74225e6cb 100644
 --- a/zebra/dplane_fpm_nl.c
 +++ b/zebra/dplane_fpm_nl.c
-@@ -944,6 +944,15 @@ static int fpm_nl_enqueue(struct fpm_nl_ctx *fnc, struct zebra_dplane_ctx *ctx)
+@@ -965,6 +965,15 @@ static int fpm_nl_enqueue(struct fpm_nl_ctx *fnc, struct zebra_dplane_ctx *ctx)
  		|| op == DPLANE_OP_NH_UPDATE))
  		return 0;
 
@@ -25,7 +28,4 @@ index b8dbabb60..3332638cc 100644
 +
  	nl_buf_len = 0;
 
- 	frr_mutex_lock_autounlock(&fnc->obuf_mutex);
--- 
-2.17.1
-
+ 	/*

…8-Use-vrf_id-for-vrf-not-tabled_id.patch …Y-Use-vrf_id-for-vrf-not-tabled_id.patchsrc/sonic-frr/patch/0008-Use-vrf_id-for-vrf-not-tabled_id.patch renamed to src/sonic-frr/patch/0008-SONiC-ONLY-Use-vrf_id-for-vrf-not-tabled_id.patch src/sonic-frr/patch/0008-Use-vrf_id-for-vrf-not-tabled_id.patch renamed to src/sonic-frr/patch/0008-SONiC-ONLY-Use-vrf_id-for-vrf-not-tabled_id.patch

@@ -1,19 +1,19 @@
-From 44f3736ee601e06e43e978fa075402c3da4823bd Mon Sep 17 00:00:00 2001
+[PATCH] From 349e3f758860be0077b69919c39764d3486ec44a Mon Sep 17
+
 From: Stepan Blyschak <[email protected]>
 Date: Mon, 16 Jan 2023 11:45:19 +0000
-Subject: [PATCH] From 349e3f758860be0077b69919c39764d3486ec44a Mon Sep 17
  00:00:00 2001 Subject: [PATCH] use vrf id instead of table id
 
 Signed-off-by: Stepan Blyschak <[email protected]>
 ---
- zebra/rt_netlink.c |   72 +++++++++++++++++++++++++++++++++++++++++++---------
- 1 file changed, 59 insertions(+), 13 deletions(-)
+ zebra/rt_netlink.c |   49 +++++++++++++++++++++++++++++++++++++++++++------
+ 1 file changed, 43 insertions(+), 6 deletions(-)
 
 diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
-index f12b324e0..9b0599899 100644
+index 12a790025..30e8a5245 100644
 --- a/zebra/rt_netlink.c
 +++ b/zebra/rt_netlink.c
-@@ -385,6 +385,31 @@ static inline int proto2zebra(int proto, int family, bool is_nexthop)
+@@ -391,6 +391,31 @@ static inline int proto2zebra(int proto, int family, bool is_nexthop)
  	return proto;
  }
 
@@ -45,7 +45,7 @@ index f12b324e0..9b0599899 100644
  /**
   * @parse_encap_mpls() - Parses encapsulated mpls attributes
   * @tb:         Pointer to rtattr to look for nested items in.
-@@ -2530,12 +2564,24 @@ ssize_t netlink_route_multipath_msg_encode(int cmd, struct zebra_dplane_ctx *ctx
+@@ -2612,12 +2637,24 @@ ssize_t netlink_route_multipath_msg_encode(int cmd, struct zebra_dplane_ctx *ctx
 
  	/* Table corresponding to this route. */
  	table_id = dplane_ctx_get_table(ctx);
@@ -74,6 +74,5 @@ index f12b324e0..9b0599899 100644
 +				return 0;
 +		}
  	}
-
+ 
  	if (IS_ZEBRA_DEBUG_KERNEL)
- 		zlog_debug(