Merge pull request #2726 from sworleys/Netlink-Filter-AFI

zebra: Ignore AF_ETHERNET and AF_MPLS in route change as well

diff --git a/zebra/if_netlink.c b/zebra/if_netlink.c
index 66e98e2e51c1a1ec39feb35c21fd9f51bf8f13f3..56e27e6dc874dabea8ab9e643c69be73f58b5d97 100644 (file)
--- a/zebra/if_netlink.c
+++ b/zebra/if_netlink.c
@@ -893,7 +893,7 @@ int netlink_interface_addr(struct nlmsghdr *h, ns_id_t ns_id, int startup)
 
        if (ifa->ifa_family != AF_INET && ifa->ifa_family != AF_INET6) {
                zlog_warn(
-                       "Invalid address family: %d received from kernel interface addr change: %d",
+                       "Invalid address family: %u received from kernel interface addr change: %u",
                        ifa->ifa_family, h->nlmsg_type);
                return 0;
        }
@@ -1133,7 +1133,7 @@ int netlink_link_change(struct nlmsghdr *h, ns_id_t ns_id, int startup)
        if (!(ifi->ifi_family == AF_UNSPEC || ifi->ifi_family == AF_BRIDGE
              || ifi->ifi_family == AF_INET6)) {
                zlog_warn(
-                       "Invalid address family: %d received from kernel link change: %d",
+                       "Invalid address family: %u received from kernel link change: %u",
                        ifi->ifi_family, h->nlmsg_type);
                return 0;
        }

diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index 5facfa5faa49f7ab757365705c006a91ff288f43..4a13fbc8e1e280d39d88ed4428cf17f09a69405e 100644 (file)
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -763,11 +763,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
-             || 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",
+                       "Invalid address family: %u received from kernel route change: %u",
                        rtm->rtm_family, h->nlmsg_type);
                return 0;
        }
@@ -780,10 +778,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) {
@@ -2422,7 +2416,7 @@ int netlink_neigh_change(struct nlmsghdr *h, ns_id_t ns_id)
                return netlink_ipneigh_change(h, len, ns_id);
        else {
                zlog_warn(
-                       "Invalid address family: %d received from kernel neighbor change: %d",
+                       "Invalid address family: %u received from kernel neighbor change: %u",
                        ndm->ndm_family, h->nlmsg_type);
                return 0;
        }

diff --git a/zebra/rule_netlink.c b/zebra/rule_netlink.c
index d683e92bcc7dc3d69c0d4796a777da59d671e982..87d3769a5a3286a56033c0a5241926493c0b90e8 100644 (file)
--- a/zebra/rule_netlink.c
+++ b/zebra/rule_netlink.c
@@ -206,7 +206,7 @@ int netlink_rule_change(struct nlmsghdr *h, ns_id_t ns_id, int startup)
        frh = NLMSG_DATA(h);
        if (frh->family != AF_INET && frh->family != AF_INET6) {
                zlog_warn(
-                       "Invalid address family: %d received from kernel rule change: %d",
+                       "Invalid address family: %u received from kernel rule change: %u",
                        frh->family, h->nlmsg_type);
                return 0;
        }