1 files changed, 66 insertions, 41 deletions

diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index 3868412b20..2a297409fe 100644
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -1438,7 +1438,6 @@ static int netlink_neigh_update(int cmd, int ifindex, uint32_t addr, char *lla,
 static int netlink_route_multipath(int cmd, struct zebra_dplane_ctx *ctx)
 {
 	int bytelen;
-	struct sockaddr_nl snl;
 	struct nexthop *nexthop = NULL;
 	unsigned int nexthop_num;
 	int family;
@@ -1466,10 +1465,9 @@ static int netlink_route_multipath(int cmd, struct zebra_dplane_ctx *ctx)
 	req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct rtmsg));
 	req.n.nlmsg_flags = NLM_F_CREATE | NLM_F_REQUEST;
 
-	if (dplane_ctx_get_op(ctx) == DPLANE_OP_ROUTE_UPDATE) {
-		if ((p->family == AF_INET) || v6_rr_semantics)
-			req.n.nlmsg_flags |= NLM_F_REPLACE;
-	}
+	if ((cmd == RTM_NEWROUTE) &&
+	    ((p->family == AF_INET) || v6_rr_semantics))
+		req.n.nlmsg_flags |= NLM_F_REPLACE;
 
 	req.n.nlmsg_type = cmd;
 
@@ -1748,11 +1746,6 @@ static int netlink_route_multipath(int cmd, struct zebra_dplane_ctx *ctx)
 	}
 
 skip:
-
-	/* Destination netlink address. */
-	memset(&snl, 0, sizeof(snl));
-	snl.nl_family = AF_NETLINK;
-
 	/* Talk to netlink socket. */
 	return netlink_talk_info(netlink_talk_filter, &req.n,
 				 dplane_ctx_get_ns(ctx), 0);
@@ -1972,23 +1965,38 @@ static int netlink_macfdb_change(struct nlmsghdr *h, int len, ns_id_t ns_id)
 	/* The interface should exist. */
 	ifp = if_lookup_by_index_per_ns(zebra_ns_lookup(ns_id),
 					ndm->ndm_ifindex);
-	if (!ifp || !ifp->info)
+	if (!ifp || !ifp->info) {
+		if (IS_ZEBRA_DEBUG_KERNEL)
+			zlog_debug("\t%s without associated interface: %u",
+				   __PRETTY_FUNCTION__, ndm->ndm_ifindex);
 		return 0;
+	}
 
 	/* The interface should be something we're interested in. */
-	if (!IS_ZEBRA_IF_BRIDGE_SLAVE(ifp))
+	if (!IS_ZEBRA_IF_BRIDGE_SLAVE(ifp)) {
+		if (IS_ZEBRA_DEBUG_KERNEL)
+			zlog_debug("\t%s Not interested in %s, not a slave",
+				   __PRETTY_FUNCTION__, ifp->name);
 		return 0;
+	}
 
 	/* Drop "permanent" entries. */
-	if (ndm->ndm_state & NUD_PERMANENT)
+	if (ndm->ndm_state & NUD_PERMANENT) {
+		if (IS_ZEBRA_DEBUG_KERNEL)
+			zlog_debug("\t%s Entry is PERMANENT, dropping",
+				   __PRETTY_FUNCTION__);
 		return 0;
+	}
 
 	zif = (struct zebra_if *)ifp->info;
 	if ((br_if = zif->brslave_info.br_if) == NULL) {
-		zlog_debug("%s family %s IF %s(%u) brIF %u - no bridge master",
-			   nl_msg_type_to_str(h->nlmsg_type),
-			   nl_family_to_str(ndm->ndm_family), ifp->name,
-			   ndm->ndm_ifindex, zif->brslave_info.bridge_ifindex);
+		if (IS_ZEBRA_DEBUG_KERNEL)
+			zlog_debug(
+				"%s family %s IF %s(%u) brIF %u - no bridge master",
+				nl_msg_type_to_str(h->nlmsg_type),
+				nl_family_to_str(ndm->ndm_family), ifp->name,
+				ndm->ndm_ifindex,
+				zif->brslave_info.bridge_ifindex);
 		return 0;
 	}
 
@@ -1997,20 +2005,24 @@ static int netlink_macfdb_change(struct nlmsghdr *h, int len, ns_id_t ns_id)
 	netlink_parse_rtattr(tb, NDA_MAX, NDA_RTA(ndm), len);
 
 	if (!tb[NDA_LLADDR]) {
-		zlog_debug("%s family %s IF %s(%u) brIF %u - no LLADDR",
-			   nl_msg_type_to_str(h->nlmsg_type),
-			   nl_family_to_str(ndm->ndm_family), ifp->name,
-			   ndm->ndm_ifindex, zif->brslave_info.bridge_ifindex);
+		if (IS_ZEBRA_DEBUG_KERNEL)
+			zlog_debug("%s family %s IF %s(%u) brIF %u - no LLADDR",
+				   nl_msg_type_to_str(h->nlmsg_type),
+				   nl_family_to_str(ndm->ndm_family), ifp->name,
+				   ndm->ndm_ifindex,
+				   zif->brslave_info.bridge_ifindex);
 		return 0;
 	}
 
 	if (RTA_PAYLOAD(tb[NDA_LLADDR]) != ETH_ALEN) {
-		zlog_debug(
-			"%s family %s IF %s(%u) brIF %u - LLADDR is not MAC, len %lu",
-			nl_msg_type_to_str(h->nlmsg_type),
-			nl_family_to_str(ndm->ndm_family), ifp->name,
-			ndm->ndm_ifindex, zif->brslave_info.bridge_ifindex,
-			(unsigned long)RTA_PAYLOAD(tb[NDA_LLADDR]));
+		if (IS_ZEBRA_DEBUG_KERNEL)
+			zlog_debug(
+				"%s family %s IF %s(%u) brIF %u - LLADDR is not MAC, len %lu",
+				nl_msg_type_to_str(h->nlmsg_type),
+				nl_family_to_str(ndm->ndm_family), ifp->name,
+				ndm->ndm_ifindex,
+				zif->brslave_info.bridge_ifindex,
+				(unsigned long)RTA_PAYLOAD(tb[NDA_LLADDR]));
 		return 0;
 	}
 
@@ -2043,8 +2055,12 @@ static int netlink_macfdb_change(struct nlmsghdr *h, int len, ns_id_t ns_id)
 			   prefix_mac2str(&mac, buf, sizeof(buf)),
 			   dst_present ? dst_buf : "");
 
-	if (filter_vlan && vid != filter_vlan)
+	if (filter_vlan && vid != filter_vlan) {
+		if (IS_ZEBRA_DEBUG_KERNEL)
+			zlog_debug("\tFiltered due to filter vlan: %d",
+				   filter_vlan);
 		return 0;
+	}
 
 	/* If add or update, do accordingly if learnt on a "local" interface; if
 	 * the notification is over VxLAN, this has to be related to
@@ -2052,10 +2068,6 @@ static int netlink_macfdb_change(struct nlmsghdr *h, int len, ns_id_t ns_id)
 	 * so perform an implicit delete of any local entry (if it exists).
 	 */
 	if (h->nlmsg_type == RTM_NEWNEIGH) {
-		/* Drop "permanent" entries. */
-		if (ndm->ndm_state & NUD_PERMANENT)
-			return 0;
-
 		if (IS_ZEBRA_IF_VXLAN(ifp))
 			return zebra_vxlan_check_del_local_mac(ifp, br_if, &mac,
 							       vid);
@@ -2072,8 +2084,11 @@ static int netlink_macfdb_change(struct nlmsghdr *h, int len, ns_id_t ns_id)
 	 * Ignore the notification from VxLan driver as it is also generated
 	 * when mac moves from remote to local.
 	 */
-	if (dst_present)
+	if (dst_present) {
+		if (IS_ZEBRA_DEBUG_KERNEL)
+			zlog_debug("\tNo Destination Present");
 		return 0;
+	}
 
 	if (IS_ZEBRA_IF_VXLAN(ifp))
 		return zebra_vxlan_check_readd_remote_mac(ifp, br_if, &mac,
@@ -2386,6 +2401,9 @@ static int netlink_ipneigh_change(struct nlmsghdr *h, int len, ns_id_t ns_id)
 	/* if kernel deletes our rfc5549 neighbor entry, re-install it */
 	if (h->nlmsg_type == RTM_DELNEIGH && (ndm->ndm_state & NUD_PERMANENT)) {
 		netlink_handle_5549(ndm, zif, ifp, &ip);
+		if (IS_ZEBRA_DEBUG_KERNEL)
+			zlog_debug(
+				"\tNeighbor Entry Received is a 5549 entry, finished");
 		return 0;
 	}
 
@@ -2411,20 +2429,27 @@ static int netlink_ipneigh_change(struct nlmsghdr *h, int len, ns_id_t ns_id)
 			return 0;
 	} else if (IS_ZEBRA_IF_BRIDGE(ifp))
 		link_if = ifp;
-	else
+	else {
+		if (IS_ZEBRA_DEBUG_KERNEL)
+			zlog_debug(
+				"\tNeighbor Entry received is not on a VLAN or a BRIDGE, ignoring");
 		return 0;
+	}
 
 	memset(&mac, 0, sizeof(struct ethaddr));
 	if (h->nlmsg_type == RTM_NEWNEIGH) {
 		if (tb[NDA_LLADDR]) {
 			if (RTA_PAYLOAD(tb[NDA_LLADDR]) != ETH_ALEN) {
-				zlog_debug(
-					"%s family %s IF %s(%u) - LLADDR is not MAC, len %lu",
-					nl_msg_type_to_str(h->nlmsg_type),
-					nl_family_to_str(ndm->ndm_family),
-					ifp->name, ndm->ndm_ifindex,
-					(unsigned long)RTA_PAYLOAD(
-						tb[NDA_LLADDR]));
+				if (IS_ZEBRA_DEBUG_KERNEL)
+					zlog_debug(
+						"%s family %s IF %s(%u) - LLADDR is not MAC, len %lu",
+						nl_msg_type_to_str(
+							h->nlmsg_type),
+						nl_family_to_str(
+							ndm->ndm_family),
+						ifp->name, ndm->ndm_ifindex,
+						(unsigned long)RTA_PAYLOAD(
+							tb[NDA_LLADDR]));
 				return 0;
 			}