From d1f66de3c166e078df1eaf4e9c3d6633a55d81e4 Mon Sep 17 00:00:00 2001 From: wangshengjun Date: Mon, 16 Nov 2020 17:02:09 +0800 Subject: [PATCH 1/2] [frr]fix the assert issue when the nexthop type of route entry is blockhole. Signed-off-by: wangshengjun --- ...e-when-the-nexthop-type-is-blockhole.patch | 25 +++++++++++++++++++ src/sonic-frr/patch/series | 1 + 2 files changed, 26 insertions(+) create mode 100644 src/sonic-frr/patch/0007-fix-the-assert-issue-when-the-nexthop-type-is-blockhole.patch diff --git a/src/sonic-frr/patch/0007-fix-the-assert-issue-when-the-nexthop-type-is-blockhole.patch b/src/sonic-frr/patch/0007-fix-the-assert-issue-when-the-nexthop-type-is-blockhole.patch new file mode 100644 index 000000000000..dd18a13d8c3f --- /dev/null +++ b/src/sonic-frr/patch/0007-fix-the-assert-issue-when-the-nexthop-type-is-blockhole.patch @@ -0,0 +1,25 @@ +From e49b72c301082bc60eac5b8093490e9296d566d7 Mon Sep 17 00:00:00 2001 +From: wangshengjun +Date: Mon, 16 Nov 2020 16:40:42 +0800 +Subject: [PATCH] zebra:fix the assert issue when the nexthop type is blockhole + +Signed-off-by: wangshengjun +--- + 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 + diff --git a/src/sonic-frr/patch/series b/src/sonic-frr/patch/series index 13619c87ff65..ea9ae51778d5 100644 --- a/src/sonic-frr/patch/series +++ b/src/sonic-frr/patch/series @@ -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-blockhole.patch From b493c5f5798020001a91a10167014c7d88a3915b Mon Sep 17 00:00:00 2001 From: wangshengjun Date: Mon, 16 Nov 2020 17:43:57 +0800 Subject: [PATCH 2/2] [frr]fix the assert issue when the nexthop type of route entry is blackhole. Signed-off-by: wangshengjun --- ...-assert-issue-when-the-nexthop-type-is-blackhole.patch} | 7 ++++--- src/sonic-frr/patch/series | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) rename src/sonic-frr/patch/{0007-fix-the-assert-issue-when-the-nexthop-type-is-blockhole.patch => 0007-fix-the-assert-issue-when-the-nexthop-type-is-blackhole.patch} (83%) diff --git a/src/sonic-frr/patch/0007-fix-the-assert-issue-when-the-nexthop-type-is-blockhole.patch b/src/sonic-frr/patch/0007-fix-the-assert-issue-when-the-nexthop-type-is-blackhole.patch similarity index 83% rename from src/sonic-frr/patch/0007-fix-the-assert-issue-when-the-nexthop-type-is-blockhole.patch rename to src/sonic-frr/patch/0007-fix-the-assert-issue-when-the-nexthop-type-is-blackhole.patch index dd18a13d8c3f..4ed2cba5cd67 100644 --- a/src/sonic-frr/patch/0007-fix-the-assert-issue-when-the-nexthop-type-is-blockhole.patch +++ b/src/sonic-frr/patch/0007-fix-the-assert-issue-when-the-nexthop-type-is-blackhole.patch @@ -1,7 +1,8 @@ -From e49b72c301082bc60eac5b8093490e9296d566d7 Mon Sep 17 00:00:00 2001 +From aa5980af6325482d56093fe40a2406b43c013be5 Mon Sep 17 00:00:00 2001 From: wangshengjun -Date: Mon, 16 Nov 2020 16:40:42 +0800 -Subject: [PATCH] zebra:fix the assert issue when the nexthop type is blockhole +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 --- diff --git a/src/sonic-frr/patch/series b/src/sonic-frr/patch/series index ea9ae51778d5..74e7f4af615e 100644 --- a/src/sonic-frr/patch/series +++ b/src/sonic-frr/patch/series @@ -4,4 +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-blockhole.patch +0007-fix-the-assert-issue-when-the-nexthop-type-is-blackhole.patch