Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[frr]FRR 8.5.1 integration changes #15965

Merged
merged 1 commit into from
Aug 7, 2023
Merged

[frr]FRR 8.5.1 integration changes #15965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
[submodule "src/sonic-frr/frr"]
path = src/sonic-frr/frr
url = https://github.com/sonic-net/sonic-frr.git
branch = frr/8.2
branch = frr/8.5
[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
Expand Down
6 changes: 3 additions & 3 deletions rules/frr.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# FRRouting (frr) package

FRR_VERSION = 8.2.2
FRR_VERSION = 8.5.1
FRR_SUBVERSION = 0
FRR_BRANCH = frr/8.2
FRR_TAG = frr-8.2.2
FRR_BRANCH = frr/8.5
FRR_TAG = frr-8.5.1
export FRR_VERSION FRR_SUBVERSION FRR_BRANCH FRR_TAG


Expand Down
2 changes: 1 addition & 1 deletion src/sonic-frr/frr
Open in desktop
Submodule frr updated 2022 files
141 changes: 0 additions & 141 deletions src/sonic-frr/patch/0001-Add-support-of-bgp-tcp-DSCP-value.patch
View file
Open in desktop

This file was deleted.

17 changes: 8 additions & 9 deletions ...erity-of-Vty-connected-from-message.patch → ...erity-of-Vty-connected-from-message.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
From 15274a197e4d3b7ac0f11ca63a5274f1168739f5 Mon Sep 17 00:00:00 2001
From 69370e52e94c66e06052a7859dd059dfa34fd61e Mon Sep 17 00:00:00 2001
From: Pavel Shirshov <[email protected]>
Date: Mon, 16 Nov 2020 18:11:47 -0800
Subject: [PATCH 2/8] Reduce severity of 'Vty connected from' message
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 8eaf13619..7edeb5538 100644
index ab98ac14e..c32fc13ba 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -1814,7 +1814,7 @@ static int vty_accept(struct thread *thread)
@@ -1843,7 +1843,7 @@ static void vty_accept(struct thread *thread)
zlog_info("can't set sockopt to vty_sock : %s",
safe_strerror(errno));

- zlog_info("Vty connection from %pSU", &su);
+ zlog_debug("Vty connection from %pSU", &su);

vty_create(vty_sock, &su);

}
--
2.12.2
2.17.1

25 changes: 25 additions & 0 deletions src/sonic-frr/patch/0002-Allow-BGP-attr-NEXT_HOP-to-be-0.0.0.0-due-to-allevia.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From 44ed2b0d2a2ca6029238118603264e02e2e965f4 Mon Sep 17 00:00:00 2001
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


diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index f4dff0d80..f00c54c40 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -3835,8 +3835,7 @@ bool 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)) {
- if (attr->nexthop.s_addr == INADDR_ANY ||
- !ipv4_unicast_valid(&attr->nexthop) ||
+ if (!ipv4_unicast_valid(&attr->nexthop) ||
bgp_nexthop_self(bgp, afi, type, stype, attr, dest))
return true;
}
--
2.17.1

19 changes: 8 additions & 11 deletions ...exthops-compare-vrf-only-if-ip-type.patch → ...exthops-compare-vrf-only-if-ip-type.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
From 786087468520db44c55e3566f77438b41f52763f Mon Sep 17 00:00:00 2001
From 2b778b1984c5f88500625a0e96a5ba1d1fe0316c Mon Sep 17 00:00:00 2001
From: Pavel Shirshov <[email protected]>
Date: Mon, 16 Nov 2020 18:35:01 -0800
Subject: [PATCH 5/8] nexthops compare vrf only if ip type
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 e17eeb830..a1ce22e3b 100644
index 248acd270..7ebc4fefb 100644
--- a/lib/nexthop.c
+++ b/lib/nexthop.c
@@ -140,12 +140,6 @@ static int _nexthop_cmp_no_labels(const struct nexthop *next1,
Expand Down Expand Up @@ -39,10 +36,10 @@ index e17eeb830..a1ce22e3b 100644
if (ret != 0)
return ret;
diff --git a/lib/zclient.c b/lib/zclient.c
index 445837017..c104623b7 100644
index 07c7e5aea..0082b2148 100644
--- a/lib/zclient.c
+++ b/lib/zclient.c
@@ -864,12 +864,6 @@ static int zapi_nexthop_cmp_no_labels(const struct zapi_nexthop *next1,
@@ -869,12 +869,6 @@ static int zapi_nexthop_cmp_no_labels(const struct zapi_nexthop *next1,
{
int ret = 0;

Expand All @@ -55,7 +52,7 @@ index 445837017..c104623b7 100644
if (next1->type < next2->type)
return -1;

@@ -885,6 +879,12 @@ static int zapi_nexthop_cmp_no_labels(const struct zapi_nexthop *next1,
@@ -890,6 +884,12 @@ static int zapi_nexthop_cmp_no_labels(const struct zapi_nexthop *next1,
switch (next1->type) {
case NEXTHOP_TYPE_IPV4:
case NEXTHOP_TYPE_IPV6:
Expand All @@ -69,5 +66,5 @@ index 445837017..c104623b7 100644
&next2->gate);
if (ret != 0)
--
2.12.2
2.17.1

27 changes: 0 additions & 27 deletions src/sonic-frr/patch/0004-Allow-BGP-attr-NEXT_HOP-to-be-0.0.0.0-due-to-allevia.patch
View file
Open in desktop

This file was deleted.

27 changes: 14 additions & 13 deletions ...r-log-outchannel-to-var-log-frr.log.patch → ...r-log-outchannel-to-var-log-frr.log.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,25 @@
From 0417036a3aece862c95111d4646ca7508a028165 Mon Sep 17 00:00:00 2001
From ece5d83bebfe2345edf8e18f5af713bd99cc3739 Mon Sep 17 00:00:00 2001
From: Ying Xie <[email protected]>
Date: Wed, 25 Nov 2020 22:28:43 +0000
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.
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 | 19 -------------------
1 file changed, 19 deletions(-)

diff --git a/tools/etc/rsyslog.d/45-frr.conf b/tools/etc/rsyslog.d/45-frr.conf
index feeeb13f1..fcd23d23a 100644
index 75b20d76b..9cdd55762 100644
--- a/tools/etc/rsyslog.d/45-frr.conf
+++ b/tools/etc/rsyslog.d/45-frr.conf
@@ -2,25 +2,6 @@
@@ -2,29 +2,6 @@
# to /var/log/frr/frr.log, then drops the message so it does
# not also go to /var/log/syslog, so the messages are not duplicated

-$outchannel frr_log,/var/log/frr/frr.log
-if $programname == 'babeld' or
- $programname == 'bgpd' or
- $programname == 'bfdd' or
- $programname == 'eigrpd' or
- $programname == 'frr' or
- $programname == 'isisd' or
Expand All @@ -31,6 +29,9 @@ index feeeb13f1..fcd23d23a 100644
- $programname == 'ospf6d' or
- $programname == 'ospfd' or
- $programname == 'pimd' or
- $programname == 'pim6d' or
- $programname == 'pathd' or
- $programname == 'pbrd' or
- $programname == 'ripd' or
- $programname == 'ripngd' or
- $programname == 'vrrpd' or
Expand All @@ -40,7 +41,7 @@ index feeeb13f1..fcd23d23a 100644
-
if $programname == 'babeld' or
$programname == 'bgpd' or
$programname == 'eigrpd' or
$programname == 'bfdd' or
--
2.12.2
2.17.1

Loading