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

[zebra]fix the assert issue when the nexthop type of ip route entry is blackhole. #5940

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[zebra]fix the assert issue when the nexthop type of ip route entry is blackhole. #5940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1f66de
[frr]fix the assert issue when the nexthop type of route entry is blo…
wangshengjun Nov 16, 2020
b493c5f
[frr]fix the assert issue when the nexthop type of route entry is bla…
wangshengjun Nov 16, 2020
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
26 changes: 26 additions & 0 deletions src/sonic-frr/patch/0007-fix-the-assert-issue-when-the-nexthop-type-is-blackhole.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
From aa5980af6325482d56093fe40a2406b43c013be5 Mon Sep 17 00:00:00 2001
From: wangshengjun <wangshengjun@asterfusion.com>
Date: Mon, 16 Nov 2020 17:41:27 +0800
Subject: [PATCH] zebra:fix the assert issue when the nexthop type is
blackhole.

Signed-off-by: wangshengjun <wangshengjun@asterfusion.com>
---
zebra/zebra_fpm_netlink.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/zebra/zebra_fpm_netlink.c b/zebra/zebra_fpm_netlink.c
index 74aab82..24c62c6 100644
--- a/zebra/zebra_fpm_netlink.c
+++ b/zebra/zebra_fpm_netlink.c
@@ -331,6 +331,7 @@ static int netlink_route_info_fill(netlink_route_info_t *ri, int cmd,
ri->rtm_type = RTN_BLACKHOLE;
break;
}
+ return 1;
}

if ((cmd == RTM_NEWROUTE
--
2.7.4

1 change: 1 addition & 0 deletions src/sonic-frr/patch/series
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@
0004-Allow-BGP-attr-NEXT_HOP-to-be-0.0.0.0-due-to-allevia.patch
0005-nexthops-compare-vrf-only-if-ip-type.patch
0006-changes-for-making-snmp-socket-non-blocking.patch
0007-fix-the-assert-issue-when-the-nexthop-type-is-blackhole.patch