From e2ae41ad763585723b10a7d9623dfb44d830337a Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 11 Jun 2015 09:11:12 -0700 Subject: [PATCH] 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. --- zebra/zebra_rnh.c | 6 ++++++ 1 file changed, 6 insertions(+) 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)) { -- 2.39.5