From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Wed, 14 Feb 2018 02:30:03 +0000 (-0500)
Subject: zebra: Fix situation where we would notify the owner it lost due to admin distance
X-Git-Tag: frr-5.0-dev~207^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=9a9f89267a4aaf2904673b204a21e05e0832bbef;p=matthieu%2Ffrr.git

zebra: Fix situation where we would notify the owner it lost due to admin distance

The 'struct route_entry *old' and 'struct route_entry *new' can sometimes
be the same route type( for a route replace ), so when we are checking
to see if a new owner has taken over, don't tell the owner it is
replacing it self.

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

diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index 1ba85f0ea2..82b92ae0dd 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -1110,7 +1110,7 @@ void rib_install_kernel(struct route_node *rn, struct route_entry *re,
 	 * If this is a replace to a new RE let the originator of the RE
 	 * know that they've lost
 	 */
-	if (old && old != re)
+	if (old && (old != re) && (old->type != re->type))
 		zsend_route_notify_owner(old, p, ZAPI_ROUTE_BETTER_ADMIN_WON);
 
 	/*