]> git.proxmox.com Git - mirror_frr.git/commitdiff
zebra: Ignore AF_ETHERNET and AF_MPLS in route_change as well
authorStephen Worley <sworley@cumulusnetworks.com>
Wed, 25 Jul 2018 17:49:47 +0000 (13:49 -0400)
committerStephen Worley <sworley@cumulusnetworks.com>
Wed, 25 Jul 2018 18:02:00 +0000 (14:02 -0400)
Remove AF_ETHERNET and AF_MPLS as valid address families for route
changes.

Signed-off-by: Stephen Worley <sworley@cumulusnetworks.com>
zebra/rt_netlink.c

index 80841b6ac1d6d352904718302c6075b9eb60d38c..53bf4bc6e7de8913856b59f2890a9b3a39a56e42 100644 (file)
@@ -745,9 +745,7 @@ 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
-             || rtm->rtm_family == AF_ETHERNET
-             || rtm->rtm_family == AF_MPLS)) {
+       if (!(rtm->rtm_family == AF_INET || rtm->rtm_family == AF_INET6)) {
                zlog_warn(
                        "Invalid address family: %d received from kernel route change: %d",
                        rtm->rtm_family, h->nlmsg_type);
@@ -762,10 +760,6 @@ int netlink_route_change(struct nlmsghdr *h, ns_id_t ns_id, int startup)
                           nl_rttype_to_str(rtm->rtm_type),
                           nl_rtproto_to_str(rtm->rtm_protocol), ns_id);
 
-       /* We don't care about change notifications for the MPLS table. */
-       /* TODO: Revisit this. */
-       if (rtm->rtm_family == AF_MPLS)
-               return 0;
 
        len = h->nlmsg_len - NLMSG_LENGTH(sizeof(struct rtmsg));
        if (len < 0) {