From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Thu, 11 Jun 2015 16:11:12 +0000 (-0700)
Subject: If the nexthop is only resolved over a default route and that is not
X-Git-Tag: frr-2.0-rc1~1349
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=e2ae41ad763585723b10a7d9623dfb44d830337a;p=matthieu%2Ffrr.git

If the nexthop is only resolved over a default route and that is not
explicitly allowed, don't treat it as a change for routes using this
nexthop, unless the resolution has really changed.
---

diff --git a/zebra/zebra_rnh.c b/zebra/zebra_rnh.c
index f5bd1463aa..73a81b1360 100644
--- a/zebra/zebra_rnh.c
+++ b/zebra/zebra_rnh.c
@@ -389,6 +389,12 @@ zebra_evaluate_rnh (int vrfid, int family, int force, rnh_type_t type,
 	  goto loopend;
 	}
 
+      /* If nexthop cannot be resolved and that is also the existing state,
+       * there is nothing further to do.
+       */
+      if (!rib && rnh->state == NULL)
+        goto loopend;
+
       /* Ensure prefixes we're resolving over have stayed the same */
       if (!prefix_same(&rnh->resolved_route, &prn->p))
 	{