From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 24 Oct 2018 15:34:50 +0000 (-0400)
Subject: zebra: Notice when a route fails to install on *bsd
X-Git-Tag: frr-7.1-dev~244^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=560e313664699c02714ea6aed726e289107f749d;p=matthieu%2Ffrr.git

zebra: Notice when a route fails to install on *bsd

When we fail to install a route into bsd, note the case
where we have no viable nexthops installed for it, so
that we can know in zebra if the route is good or not.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/zebra/rt_socket.c b/zebra/rt_socket.c
index e8d0b71605..c49dc7bab2 100644
--- a/zebra/rt_socket.c
+++ b/zebra/rt_socket.c
@@ -245,9 +245,12 @@ static int kernel_rtm_ipv4(int cmd, const struct prefix *p,
 	} /* for (ALL_NEXTHOPS(...))*/
 
 	/* If there was no useful nexthop, then complain. */
-	if (nexthop_num == 0 && IS_ZEBRA_DEBUG_KERNEL)
-		zlog_debug("%s: No useful nexthops were found in RIB entry %p",
-			   __func__, re);
+	if (nexthop_num == 0) {
+		if (IS_ZEBRA_DEBUG_KERNEL)
+			zlog_debug("%s: No useful nexthops were found in RIB entry %p",
+				   __func__, re);
+		return 1;
+	}
 
 	return 0; /*XXX*/
 }
@@ -374,7 +377,7 @@ static int kernel_rtm_ipv6(int cmd, const struct prefix *p,
 	if (nexthop_num == 0) {
 		if (IS_ZEBRA_DEBUG_KERNEL)
 			zlog_debug("kernel_rtm_ipv6(): No useful nexthop.");
-		return 0;
+		return 1;
 	}
 
 	return 0; /*XXX*/