From: Donald Sharp <sharpd@nvidia.com>
Date: Tue, 16 Feb 2021 20:54:08 +0000 (-0500)
Subject: zebra: use AF_INET for protocol family
X-Git-Tag: base_8.0~377^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=d6816f68bd1fafb991cdd3e6c6081ee38db226d1;p=matthieu%2Ffrr.git

zebra: use AF_INET for protocol family

When looking up the conversion from kernel protocol to
internal protocol family make sure we use the correct
AF_INET( what the kernel uses ) instead of AFI_IP (which
is what FRR uses ).

Routes from OSPF will show up from the kernel as OSPF6 instead of
OSPF.  Which will cause mayhem

Ticket: CM-33306
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
---

diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index 1cae0b1f9b..602805be3c 100644
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -288,8 +288,8 @@ static inline int proto2zebra(int proto, int family, bool is_nexthop)
 		proto = ZEBRA_ROUTE_BGP;
 		break;
 	case RTPROT_OSPF:
-		proto = (family == AFI_IP) ? ZEBRA_ROUTE_OSPF
-					   : ZEBRA_ROUTE_OSPF6;
+		proto = (family == AF_INET) ? ZEBRA_ROUTE_OSPF
+					    : ZEBRA_ROUTE_OSPF6;
 		break;
 	case RTPROT_ISIS:
 		proto = ZEBRA_ROUTE_ISIS;