1 files changed, 186 insertions, 288 deletions

diff --git a/zebra/rt_socket.c b/zebra/rt_socket.c
index 99a7ca5d55..f25259f300 100644
--- a/zebra/rt_socket.c
+++ b/zebra/rt_socket.c
@@ -44,30 +44,6 @@
 
 extern struct zebra_privs_t zserv_privs;
 
-#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
-/* Adjust netmask socket length. Return value is a adjusted sin_len
-   value. */
-static int sin_masklen(struct in_addr mask)
-{
-	char *p, *lim;
-	int len;
-	struct sockaddr_in sin;
-
-	if (mask.s_addr == 0)
-		return sizeof(long);
-
-	sin.sin_addr = mask;
-	len = sizeof(struct sockaddr_in);
-
-	lim = (char *)&sin.sin_addr;
-	p = lim + sizeof(sin.sin_addr);
-
-	while (*--p == 0 && p >= lim)
-		len--;
-	return len;
-}
-#endif /* HAVE_STRUCT_SOCKADDR_IN_SIN_LEN */
-
 #ifdef __OpenBSD__
 static int kernel_rtm_add_labels(struct mpls_label_stack *nh_label,
 				 struct sockaddr_mpls *smpls)
@@ -90,12 +66,11 @@ static int kernel_rtm_add_labels(struct mpls_label_stack *nh_label,
 #endif
 
 /* Interface between zebra message and rtm message. */
-static int kernel_rtm_ipv4(int cmd, const struct prefix *p,
-			   const struct nexthop_group *ng, uint32_t metric)
+static int kernel_rtm(int cmd, const struct prefix *p,
+		      const struct nexthop_group *ng, uint32_t metric)
 
 {
-	struct sockaddr_in *mask = NULL;
-	struct sockaddr_in sin_dest, sin_mask, sin_gate;
+	union sockunion sin_dest, sin_mask, sin_gate;
 #ifdef __OpenBSD__
 	struct sockaddr_mpls smpls;
 #endif
@@ -103,235 +78,84 @@ static int kernel_rtm_ipv4(int cmd, const struct prefix *p,
 	struct nexthop *nexthop;
 	int nexthop_num = 0;
 	ifindex_t ifindex = 0;
-	int gate = 0;
+	bool gate = false;
 	int error;
+	char gate_buf[INET6_BUFSIZ];
 	char prefix_buf[PREFIX_STRLEN];
 	enum blackhole_type bh_type = BLACKHOLE_UNSPEC;
 
-	if (IS_ZEBRA_DEBUG_RIB)
-		prefix2str(p, prefix_buf, sizeof(prefix_buf));
-	memset(&sin_dest, 0, sizeof(struct sockaddr_in));
-	sin_dest.sin_family = AF_INET;
-#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
-	sin_dest.sin_len = sizeof(struct sockaddr_in);
-#endif /* HAVE_STRUCT_SOCKADDR_IN_SIN_LEN */
-	sin_dest.sin_addr = p->u.prefix4;
-
-	memset(&sin_mask, 0, sizeof(struct sockaddr_in));
-
-	memset(&sin_gate, 0, sizeof(struct sockaddr_in));
-	sin_gate.sin_family = AF_INET;
-#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
-	sin_gate.sin_len = sizeof(struct sockaddr_in);
-#endif /* HAVE_STRUCT_SOCKADDR_IN_SIN_LEN */
-
-	/* Make gateway. */
-	for (ALL_NEXTHOPS_PTR(ng, nexthop)) {
-		if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_RECURSIVE))
-			continue;
+	prefix2str(p, prefix_buf, sizeof(prefix_buf));
 
-		gate = 0;
-		char gate_buf[INET_ADDRSTRLEN] = "NULL";
-
-		/*
-		 * XXX We need to refrain from kernel operations in some cases,
-		 * but this if statement seems overly cautious - what about
-		 * other than ADD and DELETE?
-		 */
-		if ((cmd == RTM_ADD && NEXTHOP_IS_ACTIVE(nexthop->flags))
-		    || (cmd == RTM_DELETE)) {
-			if (nexthop->type == NEXTHOP_TYPE_IPV4
-			    || nexthop->type == NEXTHOP_TYPE_IPV4_IFINDEX) {
-				sin_gate.sin_addr = nexthop->gate.ipv4;
-				gate = 1;
-			}
-			if (nexthop->type == NEXTHOP_TYPE_IFINDEX
-			    || nexthop->type == NEXTHOP_TYPE_IPV4_IFINDEX)
-				ifindex = nexthop->ifindex;
-			if (nexthop->type == NEXTHOP_TYPE_BLACKHOLE) {
-				struct in_addr loopback;
-				loopback.s_addr = htonl(INADDR_LOOPBACK);
-				sin_gate.sin_addr = loopback;
-				bh_type = nexthop->bh_type;
-				gate = 1;
-			}
-
-			if (gate && p->prefixlen == 32)
-				mask = NULL;
-			else {
-				masklen2ip(p->prefixlen, &sin_mask.sin_addr);
-				sin_mask.sin_family = AF_INET;
-#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
-				sin_mask.sin_len =
-					sin_masklen(sin_mask.sin_addr);
-#endif /* HAVE_STRUCT_SOCKADDR_IN_SIN_LEN */
-				mask = &sin_mask;
-			}
-
-#ifdef __OpenBSD__
-			if (nexthop->nh_label
-			    && !kernel_rtm_add_labels(nexthop->nh_label,
-						      &smpls))
-				continue;
-			smplsp = (union sockunion *)&smpls;
-#endif
-
-			error = rtm_write(cmd, (union sockunion *)&sin_dest,
-					  (union sockunion *)mask,
-					  gate ? (union sockunion *)&sin_gate
-					       : NULL,
-					  smplsp, ifindex, bh_type, metric);
-
-			if (IS_ZEBRA_DEBUG_KERNEL) {
-				if (!gate) {
-					zlog_debug(
-						"%s: %s: attention! gate not found for re",
-						__func__, prefix_buf);
-				} else
-					inet_ntop(AF_INET, &sin_gate.sin_addr,
-						  gate_buf, INET_ADDRSTRLEN);
-			}
-
-			switch (error) {
-			/* We only flag nexthops as being in FIB if rtm_write()
-			 * did its work. */
-			case ZEBRA_ERR_NOERROR:
-				nexthop_num++;
-				if (IS_ZEBRA_DEBUG_KERNEL)
-					zlog_debug(
-						"%s: %s: successfully did NH %s",
-						__func__, prefix_buf, gate_buf);
-
-				if (cmd == RTM_ADD)
-					SET_FLAG(nexthop->flags,
-						 NEXTHOP_FLAG_FIB);
-
-				break;
-
-			/* The only valid case for this error is kernel's
-			 * failure to install
-			 * a multipath route, which is common for FreeBSD. This
-			 * should be
-			 * ignored silently, but logged as an error otherwise.
-			 */
-			case ZEBRA_ERR_RTEXIST:
-				if (cmd != RTM_ADD)
-					flog_err(
-						EC_LIB_SYSTEM_CALL,
-						"%s: rtm_write() returned %d for command %d",
-						__func__, error, cmd);
-				continue;
-
-			/* Note any unexpected status returns */
-			default:
-				flog_err(
-					EC_LIB_SYSTEM_CALL,
-					"%s: %s: rtm_write() unexpectedly returned %d for command %s",
-					__func__,
-					prefix2str(p, prefix_buf,
-						   sizeof(prefix_buf)),
-					error,
-					lookup_msg(rtm_type_str, cmd, NULL));
-				break;
-			}
-		} /* if (cmd and flags make sense) */
-		else if (IS_ZEBRA_DEBUG_KERNEL)
-			zlog_debug("%s: odd command %s for flags %d", __func__,
-				   lookup_msg(rtm_type_str, cmd, NULL),
-				   nexthop->flags);
-	} /* for (ALL_NEXTHOPS(...))*/
-
-	/* If there was no useful nexthop, then complain. */
-	if (nexthop_num == 0) {
+	/*
+	 * We only have the ability to ADD or DELETE at this point
+	 * in time.
+	 */
+	if (cmd != RTM_ADD && cmd != RTM_DELETE) {
 		if (IS_ZEBRA_DEBUG_KERNEL)
-			zlog_debug("%s: No useful nexthops were found in RIB prefix %s",
-				   __func__, prefix2str(p, prefix_buf,
-							sizeof(prefix_buf)));
-		return 1;
+			zlog_debug("%s: %s odd command %s",
+				   __func__, prefix_buf,
+				   lookup_msg(rtm_type_str, cmd, NULL));
+		return 0;
 	}
 
-	return 0; /*XXX*/
-}
-
-#ifdef SIN6_LEN
-/* Calculate sin6_len value for netmask socket value. */
-static int sin6_masklen(struct in6_addr mask)
-{
-	struct sockaddr_in6 sin6;
-	char *p, *lim;
-	int len;
-
-	if (IN6_IS_ADDR_UNSPECIFIED(&mask))
-		return sizeof(long);
-
-	sin6.sin6_addr = mask;
-	len = sizeof(struct sockaddr_in6);
-
-	lim = (char *)&sin6.sin6_addr;
-	p = lim + sizeof(sin6.sin6_addr);
-
-	while (*--p == 0 && p >= lim)
-		len--;
-
-	return len;
-}
-#endif /* SIN6_LEN */
-
-/* Interface between zebra message and rtm message. */
-static int kernel_rtm_ipv6(int cmd, const struct prefix *p,
-			   const struct nexthop_group *ng, uint32_t metric)
-{
-	struct sockaddr_in6 *mask;
-	struct sockaddr_in6 sin_dest, sin_mask, sin_gate;
-#ifdef __OpenBSD__
-	struct sockaddr_mpls smpls;
-#endif
-	union sockunion *smplsp = NULL;
-	struct nexthop *nexthop;
-	int nexthop_num = 0;
-	ifindex_t ifindex = 0;
-	int gate = 0;
-	int error;
-	enum blackhole_type bh_type = BLACKHOLE_UNSPEC;
+	memset(&sin_dest, 0, sizeof(sin_dest));
+	memset(&sin_gate, 0, sizeof(sin_gate));
+	memset(&sin_mask, 0, sizeof(sin_mask));
 
-	memset(&sin_dest, 0, sizeof(struct sockaddr_in6));
-	sin_dest.sin6_family = AF_INET6;
-#ifdef SIN6_LEN
-	sin_dest.sin6_len = sizeof(struct sockaddr_in6);
-#endif /* SIN6_LEN */
-	sin_dest.sin6_addr = p->u.prefix6;
-
-	memset(&sin_mask, 0, sizeof(struct sockaddr_in6));
-
-	memset(&sin_gate, 0, sizeof(struct sockaddr_in6));
-	sin_gate.sin6_family = AF_INET6;
-#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
-	sin_gate.sin6_len = sizeof(struct sockaddr_in6);
-#endif /* HAVE_STRUCT_SOCKADDR_IN_SIN_LEN */
+	switch (p->family) {
+	case AF_INET:
+		sin_dest.sin.sin_family = AF_INET;
+		sin_dest.sin.sin_addr = p->u.prefix4;
+		sin_gate.sin.sin_family = AF_INET;
+#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
+		sin_dest.sin.sin_len = sizeof(struct sockaddr_in);
+		sin_gate.sin.sin_len = sizeof(struct sockaddr_in);
+#endif /* HAVE_STRUCT_SOCKADDR_SA_LEN */
+		break;
+	case AF_INET6:
+		sin_dest.sin6.sin6_family = AF_INET6;
+		sin_dest.sin6.sin6_addr = p->u.prefix6;
+		sin_gate.sin6.sin6_family = AF_INET6;
+#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
+		sin_dest.sin6.sin6_len = sizeof(struct sockaddr_in6);
+		sin_gate.sin6.sin6_len = sizeof(struct sockaddr_in6);
+#endif /* HAVE_STRUCT_SOCKADDR_SA_LEN */
+		break;
+	}
 
 	/* Make gateway. */
 	for (ALL_NEXTHOPS_PTR(ng, nexthop)) {
-		if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_RECURSIVE))
+		/*
+		 * We only want to use the actual good nexthops
+		 */
+		if (CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_RECURSIVE) ||
+		    !CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_ACTIVE))
 			continue;
 
-		gate = 0;
-
-		if ((cmd == RTM_ADD && NEXTHOP_IS_ACTIVE(nexthop->flags))
-		    || (cmd == RTM_DELETE)) {
-			if (nexthop->type == NEXTHOP_TYPE_IPV6
-			    || nexthop->type == NEXTHOP_TYPE_IPV6_IFINDEX) {
-				sin_gate.sin6_addr = nexthop->gate.ipv6;
-				gate = 1;
-			}
-			if (nexthop->type == NEXTHOP_TYPE_IFINDEX
-			    || nexthop->type == NEXTHOP_TYPE_IPV6_IFINDEX)
-				ifindex = nexthop->ifindex;
-
-			if (nexthop->type == NEXTHOP_TYPE_BLACKHOLE)
-				bh_type = nexthop->bh_type;
-		}
-
-/* Under kame set interface index to link local address. */
+		smplsp = NULL;
+		gate = false;
+		snprintf(gate_buf, sizeof(gate_buf), "NULL");
+
+		switch (nexthop->type) {
+		case NEXTHOP_TYPE_IPV4:
+		case NEXTHOP_TYPE_IPV4_IFINDEX:
+			sin_gate.sin.sin_addr = nexthop->gate.ipv4;
+			sin_gate.sin.sin_family = AF_INET;
+#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
+			sin_gate.sin.sin_len = sizeof(struct sockaddr_in);
+#endif /* HAVE_STRUCT_SOCKADDR_SA_LEN */
+			ifindex = nexthop->ifindex;
+			gate = true;
+			break;
+		case NEXTHOP_TYPE_IPV6:
+		case NEXTHOP_TYPE_IPV6_IFINDEX:
+			sin_gate.sin6.sin6_addr = nexthop->gate.ipv6;
+			sin_gate.sin6.sin6_family = AF_INET6;
+#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
+			sin_gate.sin6.sin6_len = sizeof(struct sockaddr_in6);
+#endif /* HAVE_STRUCT_SOCKADDR_SA_LEN */
+			ifindex = nexthop->ifindex;
+/* Under kame set interface index to link local address */
 #ifdef KAME
 
 #define SET_IN6_LINKLOCAL_IFINDEX(a, i)                                        \
@@ -340,62 +164,139 @@ static int kernel_rtm_ipv6(int cmd, const struct prefix *p,
 		(a).s6_addr[3] = (i)&0xff;                                     \
 	} while (0)
 
-		if (gate && IN6_IS_ADDR_LINKLOCAL(&sin_gate.sin6_addr))
-			SET_IN6_LINKLOCAL_IFINDEX(sin_gate.sin6_addr, ifindex);
+			if (IN6_IS_ADDR_LINKLOCAL(&sin_gate.sin6.sin6_addr))
+				SET_IN6_LINKLOCAL_IFINDEX(
+					sin_gate.sin6.sin6_addr,
+					ifindex);
 #endif /* KAME */
 
-		if (gate && p->prefixlen == 128)
-			mask = NULL;
-		else {
-			masklen2ip6(p->prefixlen, &sin_mask.sin6_addr);
-			sin_mask.sin6_family = AF_INET6;
-#ifdef SIN6_LEN
-			sin_mask.sin6_len = sin6_masklen(sin_mask.sin6_addr);
-#endif /* SIN6_LEN */
-			mask = &sin_mask;
+			gate = true;
+			break;
+		case NEXTHOP_TYPE_IFINDEX:
+			ifindex = nexthop->ifindex;
+			break;
+		case NEXTHOP_TYPE_BLACKHOLE:
+			bh_type = nexthop->bh_type;
+			switch (p->family) {
+			case AFI_IP: {
+				struct in_addr loopback;
+				loopback.s_addr = htonl(INADDR_LOOPBACK);
+				sin_gate.sin.sin_addr = loopback;
+#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
+				sin_gate.sin.sin_len =
+					sizeof(struct sockaddr_in);
+#endif /* HAVE_STRUCT_SOCKADDR_SA_LEN */
+				gate = true;
+			}
+				break;
+			case AFI_IP6:
+				break;
+			}
+		}
+
+		switch (p->family) {
+		case AF_INET:
+			masklen2ip(p->prefixlen, &sin_mask.sin.sin_addr);
+			sin_mask.sin.sin_family = AF_INET;
+#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
+			sin_mask.sin.sin_len = sizeof(struct sockaddr_in);
+#endif /* HAVE_STRUCT_SOCKADDR_SA_LEN */
+			break;
+		case AF_INET6:
+			masklen2ip6(p->prefixlen, &sin_mask.sin6.sin6_addr);
+			sin_mask.sin6.sin6_family = AF_INET6;
+#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
+			sin_mask.sin6.sin6_len = sizeof(struct sockaddr_in6);
+#endif /* HAVE_STRUCT_SOCKADDR_SA_LEN */
+			break;
 		}
 
 #ifdef __OpenBSD__
-		if (nexthop->nh_label
-		    && !kernel_rtm_add_labels(nexthop->nh_label, &smpls))
-			continue;
-		smplsp = (union sockunion *)&smpls;
+		if (nexthop->nh_label) {
+			if (kernel_rtm_add_labels(nexthop->nh_label,
+						  &smpls) != 0)
+				continue;
+			smplsp = (union sockunion *)&smpls;
+		}
 #endif
+		error = rtm_write(cmd, &sin_dest, &sin_mask,
+				  gate ? &sin_gate : NULL, smplsp,
+				  ifindex, bh_type, metric);
+
+		if (IS_ZEBRA_DEBUG_KERNEL) {
+			if (!gate) {
+				zlog_debug(
+					"%s: %s: attention! gate not found for re",
+					__func__, prefix_buf);
+			} else {
+				switch (p->family) {
+				case AFI_IP:
+					inet_ntop(AF_INET,
+						  &sin_gate.sin.sin_addr,
+						  gate_buf, sizeof(gate_buf));
+					break;
+
+				case AFI_IP6:
+					inet_ntop(AF_INET6,
+						  &sin_gate.sin6.sin6_addr,
+						  gate_buf, sizeof(gate_buf));
+					break;
+
+				default:
+					snprintf(gate_buf, sizeof(gate_buf),
+						 "(invalid-af)");
+					break;
+				}
+			}
+		}
+		switch (error) {
+			/* We only flag nexthops as being in FIB if
+			 * rtm_write() did its work. */
+		case ZEBRA_ERR_NOERROR:
+			nexthop_num++;
+			if (IS_ZEBRA_DEBUG_KERNEL)
+				zlog_debug("%s: %s: successfully did NH %s",
+					   __func__, prefix_buf, gate_buf);
+			if (cmd == RTM_ADD)
+				SET_FLAG(nexthop->flags, NEXTHOP_FLAG_FIB);
+			break;
+
+			/* The only valid case for this error is
+			 * kernel's failure to install a multipath
+			 * route, which is common for FreeBSD. This
+			 * should be ignored silently, but logged as an error
+			 * otherwise.
+			 */
+		case ZEBRA_ERR_RTEXIST:
+			if (cmd != RTM_ADD)
+				flog_err(EC_LIB_SYSTEM_CALL,
+					 "%s: rtm_write() returned %d for command %d",
+					 __func__, error, cmd);
+			continue;
 
-		error = rtm_write(cmd, (union sockunion *)&sin_dest,
-				  (union sockunion *)mask,
-				  gate ? (union sockunion *)&sin_gate : NULL,
-				  smplsp, ifindex, bh_type, metric);
-
-		/* Update installed nexthop info on success */
-		if ((cmd == RTM_ADD) && (error == ZEBRA_ERR_NOERROR))
-			SET_FLAG(nexthop->flags, NEXTHOP_FLAG_FIB);
-
-		nexthop_num++;
-	}
+			/* Note any unexpected status returns */
+		default:
+			flog_err(
+				EC_LIB_SYSTEM_CALL,
+				"%s: %s: rtm_write() unexpectedly returned %d for command %s",
+				__func__, prefix_buf, error,
+				lookup_msg(rtm_type_str, cmd, NULL));
+			break;
+		}
+	} /* for (ALL_NEXTHOPS(...))*/
 
-	/* If there is no useful nexthop then return. */
+	/* If there was no useful nexthop, then complain. */
 	if (nexthop_num == 0) {
 		if (IS_ZEBRA_DEBUG_KERNEL)
-			zlog_debug("kernel_rtm_ipv6(): No useful nexthop.");
+			zlog_debug(
+				"%s: No useful nexthops were found in RIB prefix %s",
+				__func__, prefix_buf);
 		return 1;
 	}
 
 	return 0; /*XXX*/
 }
 
-static int kernel_rtm(int cmd, const struct prefix *p,
-		      const struct nexthop_group *ng, uint32_t metric)
-{
-	switch (PREFIX_FAMILY(p)) {
-	case AF_INET:
-		return kernel_rtm_ipv4(cmd, p, ng, metric);
-	case AF_INET6:
-		return kernel_rtm_ipv6(cmd, p, ng, metric);
-	}
-	return 0;
-}
-
 /*
  * Update or delete a prefix from the kernel,
  * using info from a dataplane context struct.
@@ -406,11 +307,10 @@ enum zebra_dplane_result kernel_route_update(struct zebra_dplane_ctx *ctx)
 
 	if (dplane_ctx_get_src(ctx) != NULL) {
 		zlog_err("route add: IPv6 sourcedest routes unsupported!");
-		res = ZEBRA_DPLANE_REQUEST_FAILURE;
-		goto done;
+		return ZEBRA_DPLANE_REQUEST_FAILURE;
 	}
 
-	frr_elevate_privs(ZPRIVS_RAISE) {
+	frr_elevate_privs(&zserv_privs) {
 
 		if (dplane_ctx_get_op(ctx) == DPLANE_OP_ROUTE_DELETE)
 			kernel_rtm(RTM_DELETE, dplane_ctx_get_dest(ctx),
@@ -439,8 +339,6 @@ enum zebra_dplane_result kernel_route_update(struct zebra_dplane_ctx *ctx)
 		}
 	} /* Elevated privs */
 
-done:
-
 	return res;
 }