]> git.puffer.fish Git - matthieu/frr.git/commitdiff
zebra: use AF_INET for protocol family
authorDonald Sharp <sharpd@nvidia.com>
Tue, 16 Feb 2021 20:54:08 +0000 (15:54 -0500)
committerIgor Ryzhov <iryzhov@nfware.com>
Fri, 26 Feb 2021 11:30:59 +0000 (14:30 +0300)
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>
zebra/rt_netlink.c

index dee2d2eddbabd45f304a4b2a06cf571bdeb82218..67519e2f408750f6982cbc12a3735d4b13348e5d 100644 (file)
@@ -268,8 +268,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;