From: Donald Sharp Date: Fri, 14 Sep 2018 21:54:11 +0000 (-0400) Subject: zebra: Newer kernels send data about mroute changes X-Git-Tag: frr-7.1-dev~361^2 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F3036%2Fhead;p=mirror%2Ffrr.git zebra: Newer kernels send data about mroute changes 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 --- diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c index 20b88bb6d8..46198bbf52 100644 --- a/zebra/rt_netlink.c +++ b/zebra/rt_netlink.c @@ -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",