[frr]: Update frr version to 7.1 (#3575)

* Build 7.1 without patches

* Port patches

Author: pavel-shirshov

.gitmodules

@@ -47,7 +47,7 @@
 [submodule "src/sonic-frr/frr"]
 	path = src/sonic-frr/frr
 	url = https://github.com/Azure/sonic-frr.git
-	branch = frr/7.0
+	branch = frr/7.1
 [submodule "platform/p4/p4-hlir/p4-hlir-v1.1"]
 	path = platform/p4/p4-hlir/p4-hlir-v1.1
 	url = https://github.com/p4lang/p4-hlir.git

rules/frr.mk

@@ -1,6 +1,6 @@
 # FRRouting (frr) package
 
-FRR_VERSION = 7.0.1
+FRR_VERSION = 7.1
 FRR_SUBVERSION = 0
 export FRR_VERSION FRR_SUBVERSION
 

src/sonic-frr/Makefile

@@ -9,14 +9,14 @@ BRANCH = $(shell date +%Y%m%d\.%H%M%S)
 $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	# Build the package
 	pushd ./frr	
-	git checkout -b $(BRANCH) origin/frr/7.0
+	git checkout -b $(BRANCH) origin/frr/7.1
 	stg init
 	stg import -s ../patch/series
 	tools/tarsource.sh -V -e '-sonic'
 	dpkg-buildpackage -rfakeroot -b -us -uc -Ppkg.frr.nortrlib -j$(SONIC_CONFIG_MAKE_JOBS)
 	stg undo
 	git clean -xfdf
-	git checkout frr/7.0
+	git checkout frr/7.1
 	git branch -D $(BRANCH)
 	popd
 	mv $(DERIVED_TARGET) $* $(DEST)/

src/sonic-frr/frr

@@ -1,7 +1,7 @@
-From ef017a613691a40f32cdaa5396bbd4889b1cb647 Mon Sep 17 00:00:00 2001
+From ab8ae984def8ee5cea22f802b2a60a05214c11d2 Mon Sep 17 00:00:00 2001
 From: Pavel Shirshov <[email protected]>
-Date: Fri, 14 Jun 2019 17:45:31 -0700
-Subject: [PATCH] Add support of bgp tcp DSCP value
+Date: Mon, 7 Oct 2019 17:00:15 -0700
+Subject: [PATCH 1/1] Add support of bgp tcp DSCP value
 
 ---
  bgpd/bgp_network.c | 11 ++++-------
@@ -11,10 +11,10 @@ Subject: [PATCH] Add support of bgp tcp DSCP value
  4 files changed, 51 insertions(+), 8 deletions(-)
 
 diff --git a/bgpd/bgp_network.c b/bgpd/bgp_network.c
-index 4153da5a6..fed133eb7 100644
+index 6a5c2c4b3..9ec162aa4 100644
 --- a/bgpd/bgp_network.c
 +++ b/bgpd/bgp_network.c
-@@ -569,11 +569,9 @@ int bgp_connect(struct peer *peer)
+@@ -627,11 +627,9 @@ int bgp_connect(struct peer *peer)
  #ifdef IPTOS_PREC_INTERNETCONTROL
  	frr_elevate_privs(&bgpd_privs) {
  		if (sockunion_family(&peer->su) == AF_INET)
@@ -28,7 +28,7 @@ index 4153da5a6..fed133eb7 100644
  	}
  #endif
 
-@@ -643,10 +641,9 @@ static int bgp_listener(int sock, struct sockaddr *sa, socklen_t salen,
+@@ -707,10 +705,9 @@ static int bgp_listener(int sock, struct sockaddr *sa, socklen_t salen,
 
  #ifdef IPTOS_PREC_INTERNETCONTROL
  		if (sa->sa_family == AF_INET)
@@ -42,10 +42,10 @@ index 4153da5a6..fed133eb7 100644
 
  		sockopt_v6only(sa->sa_family, sock);
 diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
-index 7445df883..f91b908a4 100644
+index d05432327..a15a0f526 100644
 --- a/bgpd/bgp_vty.c
 +++ b/bgpd/bgp_vty.c
-@@ -1113,6 +1113,42 @@ DEFUN (no_router_bgp,
+@@ -1139,6 +1139,42 @@ DEFUN (no_router_bgp,
  	return CMD_SUCCESS;
  }
 
@@ -88,7 +88,7 @@ index 7445df883..f91b908a4 100644
 
  /* BGP router-id.  */
 
-@@ -12798,6 +12834,10 @@ void bgp_vty_init(void)
+@@ -12929,6 +12965,10 @@ void bgp_vty_init(void)
  	/* "no router bgp" commands. */
  	install_element(CONFIG_NODE, &no_router_bgp_cmd);
 
@@ -100,10 +100,10 @@ index 7445df883..f91b908a4 100644
  	install_element(BGP_NODE, &bgp_router_id_cmd);
  	install_element(BGP_NODE, &no_bgp_router_id_cmd);
 diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
-index 6fb3a70c7..503e6b4ed 100644
+index 8c0b5336e..55aeb2dd8 100644
 --- a/bgpd/bgpd.c
 +++ b/bgpd/bgpd.c
-@@ -2995,7 +2995,7 @@ static struct bgp *bgp_create(as_t *as, const char *name,
+@@ -3040,7 +3040,7 @@ static struct bgp *bgp_create(as_t *as, const char *name,
 
  	bgp->evpn_info = XCALLOC(MTYPE_BGP_EVPN_INFO,
  				 sizeof(struct bgp_evpn_info));
@@ -112,7 +112,7 @@ index 6fb3a70c7..503e6b4ed 100644
  	bgp_evpn_init(bgp);
  	bgp_pbr_init(bgp);
  	return bgp;
-@@ -7516,6 +7516,9 @@ int bgp_config_write(struct vty *vty)
+@@ -7629,6 +7629,9 @@ int bgp_config_write(struct vty *vty)
  		if (CHECK_FLAG(bgp->flags, BGP_FLAG_NO_FAST_EXT_FAILOVER))
  			vty_out(vty, " no bgp fast-external-failover\n");
 
@@ -123,10 +123,10 @@ index 6fb3a70c7..503e6b4ed 100644
  		if (bgp->router_id_static.s_addr != 0)
  			vty_out(vty, " bgp router-id %s\n",
 diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h
-index df3fde840..a6546457c 100644
+index b0f656753..32983a0a9 100644
 --- a/bgpd/bgpd.h
 +++ b/bgpd/bgpd.h
-@@ -553,6 +553,9 @@ struct bgp {
+@@ -569,6 +569,9 @@ struct bgp {
  	/* Count of peers in established state */
  	uint32_t established_peers;
 

src/sonic-frr/patch/0001-Add-support-of-bgp-tcp-DSCP-value.patch

@@ -1,17 +1,17 @@
-From 87760a6a04d6ffbcc7a1093549bfb76656002b61 Mon Sep 17 00:00:00 2001
+From 5a30a4e91a91f8e19c69ef219cd6d8b19e9b6fae Mon Sep 17 00:00:00 2001
 From: Pavel Shirshov <[email protected]>
-Date: Fri, 14 Jun 2019 17:48:50 -0700
-Subject: [PATCH] Reduce severity of 'Vty connected from' message
+Date: Mon, 7 Oct 2019 17:06:27 -0700
+Subject: [PATCH 1/1] 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 8450922c2..f159d1b4b 100644
+index b1ed3d63c..5aa4b56cb 100644
 --- a/lib/vty.c
 +++ b/lib/vty.c
-@@ -1875,7 +1875,7 @@ static int vty_accept(struct thread *thread)
+@@ -1870,7 +1870,7 @@ static int vty_accept(struct thread *thread)
  		zlog_info("can't set sockopt to vty_sock : %s",
  			  safe_strerror(errno));
 

src/sonic-frr/patch/0002-Reduce-severity-of-Vty-connected-from-message.patch

@@ -1,18 +1,18 @@
-From 4cd83e56e4f67fdc06325d92a82534fb4cb69952 Mon Sep 17 00:00:00 2001
+From 9fa0ffcc8f9ec987af527e911cd748014aeacffe Mon Sep 17 00:00:00 2001
 From: Pavel Shirshov <[email protected]>
-Date: Thu, 20 Jun 2019 15:35:50 -0700
-Subject: [PATCH] Allow BGP attr NEXT_HOP to be 0.0.0.0 due to alleviate the
- vendor bug
+Date: Mon, 7 Oct 2019 17:15:15 -0700
+Subject: [PATCH 1/1] Allow BGP attr NEXT_HOP to be 0.0.0.0 due to alleviate
+ the vendor bug
 
 ---
  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 38f3cad5a..55240eab8 100644
+index f8eae135e..732115756 100644
 --- a/bgpd/bgp_route.c
 +++ b/bgpd/bgp_route.c
-@@ -2873,8 +2873,7 @@ static int bgp_update_martian_nexthop(struct bgp *bgp, afi_t afi, safi_t safi,
+@@ -2904,8 +2904,7 @@ static int bgp_update_martian_nexthop(struct bgp *bgp, afi_t afi, safi_t safi,
 
  	/* If NEXT_HOP is present, validate it. */
  	if (attr->flag & ATTR_FLAG_BIT(BGP_ATTR_NEXT_HOP)) {

src/sonic-frr/patch/0003-ignore-nexthop-attribute-when-NLRI-is-present.patch

@@ -1,14 +1,14 @@
-From 81990d9aafdfd459c0caa6cf07501fa628ada454 Mon Sep 17 00:00:00 2001
-From: Tyler Li <tyler.li@nephosinc.com>
-Date: Mon, 3 Jun 2019 01:48:11 -0700
-Subject: [PATCH] Support VRF
+From b7ae4e11c2dc14f9208b62ea060bb5ecbf4cddb2 Mon Sep 17 00:00:00 2001
+From: Pavel Shirshov <pavelsh@microsoft.com>
+Date: Mon, 7 Oct 2019 17:17:54 -0700
+Subject: [PATCH 1/1] Support VRF
 
 ---
  zebra/zebra_fpm_netlink.c | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
 diff --git a/zebra/zebra_fpm_netlink.c b/zebra/zebra_fpm_netlink.c
-index 207cbc099..b98c6886b 100644
+index 88f0c3250..29f07f801 100644
 --- a/zebra/zebra_fpm_netlink.c
 +++ b/zebra/zebra_fpm_netlink.c
 @@ -327,7 +327,12 @@ static int netlink_route_info_encode(netlink_route_info_t *ri, char *in_buf,
@@ -26,5 +26,5 @@ index 207cbc099..b98c6886b 100644
  	req->r.rtm_protocol = ri->rtm_protocol;
  	req->r.rtm_scope = RT_SCOPE_UNIVERSE;
 -- 
-2.11.0
+2.17.1.windows.2
 

src/sonic-frr/patch/0004-Allow-BGP-attr-NEXT_HOP-to-be-0.0.0.0-due-to-allevia.patch

@@ -1,5 +1,4 @@
 0001-Add-support-of-bgp-tcp-DSCP-value.patch
 0002-Reduce-severity-of-Vty-connected-from-message.patch
-0003-ignore-nexthop-attribute-when-NLRI-is-present.patch
 0004-Allow-BGP-attr-NEXT_HOP-to-be-0.0.0.0-due-to-allevia.patch
 0005-Support-VRF.patch