]> git.proxmox.com Git - mirror_frr.git/commitdiff
zebra: Newer kernels send data about mroute changes
authorDonald Sharp <sharpd@cumulusnetworks.com>
Fri, 14 Sep 2018 21:54:11 +0000 (17:54 -0400)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Fri, 14 Sep 2018 21:54:11 +0000 (17:54 -0400)
Newer linux kernels apparently send data down the netlink
bus for the creation of mroutes.  Add a bit of code
to notice this and to handle it appropriately( ie do
nothing at this point in time ) as that the correct
place to do this is in the pim socket in pimd.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
zebra/rt_netlink.c

index 20b88bb6d802620637b3a11318af52b0da7dec78..46198bbf528e6f76bc4019b2e61996714dbcb995 100644 (file)
@@ -833,7 +833,9 @@ int netlink_route_change(struct nlmsghdr *h, ns_id_t ns_id, int startup)
                return 0;
        }
 
-       if (!(rtm->rtm_family == AF_INET || rtm->rtm_family == AF_INET6)) {
+       if (!(rtm->rtm_family == AF_INET ||
+             rtm->rtm_family == AF_INET6 ||
+             rtm->rtm_family == RTNL_FAMILY_IPMR )) {
                flog_warn(
                        EC_ZEBRA_UNKNOWN_FAMILY,
                        "Invalid address family: %u received from kernel route change: %s",