1 files changed, 28 insertions, 160 deletions

diff --git a/zebra/kernel_socket.c b/zebra/kernel_socket.c
index 8a7cb0e528..4f89d53e39 100644
--- a/zebra/kernel_socket.c
+++ b/zebra/kernel_socket.c
@@ -918,6 +918,9 @@ void rtm_read(struct rt_msghdr *rtm)
 	char ifname[INTERFACE_NAMSIZ + 1];
 	short ifnlen = 0;
 	struct nexthop nh;
+	struct prefix p;
+	ifindex_t ifindex = 0;
+	afi_t afi;
 
 	zebra_flags = 0;
 
@@ -951,10 +954,6 @@ void rtm_read(struct rt_msghdr *rtm)
 	if (flags & RTF_PROTO1)
 		SET_FLAG(zebra_flags, ZEBRA_FLAG_SELFROUTE);
 
-	/* This is persistent route. */
-	if (flags & RTF_STATIC)
-		SET_FLAG(zebra_flags, ZEBRA_FLAG_STATIC);
-
 	memset(&nh, 0, sizeof(nh));
 
 	nh.vrf_id = VRF_DEFAULT;
@@ -967,9 +966,14 @@ void rtm_read(struct rt_msghdr *rtm)
 		nh.bh_type = BLACKHOLE_NULL;
 	}
 
-	if (dest.sa.sa_family == AF_INET) {
-		struct prefix p;
+	/*
+	 * Ignore our own messages.
+	 */
+	if (rtm->rtm_type != RTM_GET && rtm->rtm_pid == pid)
+		return;
 
+	if (dest.sa.sa_family == AF_INET) {
+		afi = AFI_IP;
 		p.family = AF_INET;
 		p.u.prefix4 = dest.sin.sin_addr;
 		if (flags & RTF_HOST)
@@ -977,146 +981,12 @@ void rtm_read(struct rt_msghdr *rtm)
 		else
 			p.prefixlen = ip_masklen(mask.sin.sin_addr);
 
-		/* Catch self originated messages and match them against our
-		 * current RIB.
-		 * At the same time, ignore unconfirmed messages, they should be
-		 * tracked
-		 * by rtm_write() and kernel_rtm_ipv4().
-		 */
-		if (rtm->rtm_type != RTM_GET && rtm->rtm_pid == pid) {
-			char buf[PREFIX_STRLEN], gate_buf[INET_ADDRSTRLEN];
-			int ret;
-			if (!IS_ZEBRA_DEBUG_RIB)
-				return;
-			ret = rib_lookup_ipv4_route((struct prefix_ipv4 *)&p,
-						    &gate, VRF_DEFAULT);
-			prefix2str(&p, buf, sizeof(buf));
-			switch (rtm->rtm_type) {
-			case RTM_ADD:
-			case RTM_GET:
-			case RTM_CHANGE:
-				/* The kernel notifies us about a new route in
-				   FIB created by us.
-				   Do we have a correspondent entry in our RIB?
-				   */
-				switch (ret) {
-				case ZEBRA_RIB_NOTFOUND:
-					zlog_debug(
-						"%s: %s %s: desync: RR isn't yet in RIB, while already in FIB",
-						__func__,
-						lookup_msg(rtm_type_str,
-							   rtm->rtm_type, NULL),
-						buf);
-					break;
-				case ZEBRA_RIB_FOUND_CONNECTED:
-				case ZEBRA_RIB_FOUND_NOGATE:
-					inet_ntop(AF_INET, &gate.sin.sin_addr,
-						  gate_buf, INET_ADDRSTRLEN);
-					zlog_debug(
-						"%s: %s %s: desync: RR is in RIB, but gate differs (ours is %s)",
-						__func__,
-						lookup_msg(rtm_type_str,
-							   rtm->rtm_type, NULL),
-						buf, gate_buf);
-					break;
-				case ZEBRA_RIB_FOUND_EXACT: /* RIB RR == FIB RR
-							       */
-					zlog_debug(
-						"%s: %s %s: done Ok", __func__,
-						lookup_msg(rtm_type_str,
-							   rtm->rtm_type, NULL),
-						buf);
-					rib_lookup_and_dump(
-						(struct prefix_ipv4 *)&p,
-						VRF_DEFAULT);
-					return;
-					break;
-				}
-				break;
-			case RTM_DELETE:
-				/* The kernel notifies us about a route deleted
-				   by us. Do we still
-				   have it in the RIB? Do we have anything
-				   instead? */
-				switch (ret) {
-				case ZEBRA_RIB_FOUND_EXACT:
-					zlog_debug(
-						"%s: %s %s: desync: RR is still in RIB, while already not in FIB",
-						__func__,
-						lookup_msg(rtm_type_str,
-							   rtm->rtm_type, NULL),
-						buf);
-					rib_lookup_and_dump(
-						(struct prefix_ipv4 *)&p,
-						VRF_DEFAULT);
-					break;
-				case ZEBRA_RIB_FOUND_CONNECTED:
-				case ZEBRA_RIB_FOUND_NOGATE:
-					zlog_debug(
-						"%s: %s %s: desync: RR is still in RIB, plus gate differs",
-						__func__,
-						lookup_msg(rtm_type_str,
-							   rtm->rtm_type, NULL),
-						buf);
-					rib_lookup_and_dump(
-						(struct prefix_ipv4 *)&p,
-						VRF_DEFAULT);
-					break;
-				case ZEBRA_RIB_NOTFOUND: /* RIB RR == FIB RR */
-					zlog_debug(
-						"%s: %s %s: done Ok", __func__,
-						lookup_msg(rtm_type_str,
-							   rtm->rtm_type, NULL),
-						buf);
-					rib_lookup_and_dump(
-						(struct prefix_ipv4 *)&p,
-						VRF_DEFAULT);
-					return;
-					break;
-				}
-				break;
-			default:
-				zlog_debug(
-					"%s: %s: warning: loopback RTM of type %s received",
-					__func__, buf,
-					lookup_msg(rtm_type_str, rtm->rtm_type,
-						   NULL));
-			}
-			return;
-		}
-
-		/* Change, delete the old prefix, we have no further information
-		 * to specify the route really
-		 */
-		if (rtm->rtm_type == RTM_CHANGE)
-			rib_delete(AFI_IP, SAFI_UNICAST, VRF_DEFAULT,
-				   ZEBRA_ROUTE_KERNEL, 0, zebra_flags, &p, NULL,
-				   NULL, 0, 0, 0, true);
-
 		if (!nh.type) {
 			nh.type = NEXTHOP_TYPE_IPV4;
 			nh.gate.ipv4 = gate.sin.sin_addr;
 		}
-
-		if (rtm->rtm_type == RTM_GET || rtm->rtm_type == RTM_ADD
-		    || rtm->rtm_type == RTM_CHANGE)
-			rib_add(AFI_IP, SAFI_UNICAST, VRF_DEFAULT,
-				ZEBRA_ROUTE_KERNEL, 0, zebra_flags, &p, NULL,
-				&nh, 0, 0, 0, 0, 0);
-		else
-			rib_delete(AFI_IP, SAFI_UNICAST, VRF_DEFAULT,
-				   ZEBRA_ROUTE_KERNEL, 0, zebra_flags, &p, NULL,
-				   &nh, 0, 0, 0, true);
-	}
-	if (dest.sa.sa_family == AF_INET6) {
-		/* One day we might have a debug section here like one in the
-		 * IPv4 case above. Just ignore own messages at the moment.
-		 */
-		if (rtm->rtm_type != RTM_GET && rtm->rtm_pid == pid)
-			return;
-		struct prefix p;
-		ifindex_t ifindex = 0;
-
+	} else if (dest.sa.sa_family == AF_INET6) {
+		afi = AFI_IP6;
 		p.family = AF_INET6;
 		p.u.prefix6 = dest.sin6.sin6_addr;
 		if (flags & RTF_HOST)
@@ -1131,31 +1001,29 @@ void rtm_read(struct rt_msghdr *rtm)
 		}
 #endif /* KAME */
 
-		/* CHANGE: delete the old prefix, we have no further information
-		 * to specify the route really
-		 */
-		if (rtm->rtm_type == RTM_CHANGE)
-			rib_delete(AFI_IP6, SAFI_UNICAST, VRF_DEFAULT,
-				   ZEBRA_ROUTE_KERNEL, 0, zebra_flags, &p, NULL,
-				   NULL, 0, 0, 0, true);
-
 		if (!nh.type) {
 			nh.type = ifindex ? NEXTHOP_TYPE_IPV6_IFINDEX
 					  : NEXTHOP_TYPE_IPV6;
 			nh.gate.ipv6 = gate.sin6.sin6_addr;
 			nh.ifindex = ifindex;
 		}
+	} else
+		return;
 
-		if (rtm->rtm_type == RTM_GET || rtm->rtm_type == RTM_ADD
-		    || rtm->rtm_type == RTM_CHANGE)
-			rib_add(AFI_IP6, SAFI_UNICAST, VRF_DEFAULT,
-				ZEBRA_ROUTE_KERNEL, 0, zebra_flags, &p, NULL,
-				&nh, 0, 0, 0, 0, 0);
-		else
-			rib_delete(AFI_IP6, SAFI_UNICAST, VRF_DEFAULT,
-				   ZEBRA_ROUTE_KERNEL, 0, zebra_flags, &p, NULL,
-				   &nh, 0, 0, 0, true);
-	}
+	/*
+	 * CHANGE: delete the old prefix, we have no further information
+	 * to specify the route really
+	 */
+	if (rtm->rtm_type == RTM_CHANGE)
+		rib_delete(afi, SAFI_UNICAST, VRF_DEFAULT, ZEBRA_ROUTE_KERNEL,
+			   0, zebra_flags, &p, NULL, NULL, 0, 0, 0, true);
+	if (rtm->rtm_type == RTM_GET || rtm->rtm_type == RTM_ADD
+	    || rtm->rtm_type == RTM_CHANGE)
+		rib_add(afi, SAFI_UNICAST, VRF_DEFAULT, ZEBRA_ROUTE_KERNEL, 0,
+			zebra_flags, &p, NULL, &nh, 0, 0, 0, 0, 0);
+	else
+		rib_delete(afi, SAFI_UNICAST, VRF_DEFAULT, ZEBRA_ROUTE_KERNEL,
+			   0, zebra_flags, &p, NULL, &nh, 0, 0, 0, true);
 }
 
 /* Interface function for the kernel routing table updates.  Support