summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Guibert <philippe.guibert@6wind.com>2020-02-19 17:27:06 +0100
committerPhilippe Guibert <philippe.guibert@6wind.com>2020-03-05 16:06:05 +0100
commit34b2ac58c5cdde140f73ec4d66a31297140a57e9 (patch)
tree13bd2e8e6af8dfa21924fb6420ebb20cc08e7e74
parentd0bfe25dead1d3dfdc18951f1b6d0023be9ac76c (diff)
zebra: when override flag is set, do not forget to update nht
this flag can be used when one routing daemon wants to force his route to be injected prioritary with other routes, including selected routes. for that, do not forget to update the new_selected pointer in the zebra nexthop tracking algorithm. Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
-rw-r--r--zebra/zebra_rnh.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/zebra/zebra_rnh.c b/zebra/zebra_rnh.c
index 74c3ac3712..8d99ce840e 100644
--- a/zebra/zebra_rnh.c
+++ b/zebra/zebra_rnh.c
@@ -669,7 +669,8 @@ zebra_rnh_resolve_nexthop_entry(struct zebra_vrf *zvrf, afi_t afi,
zebra_route_string(re->type));
continue;
}
- if (!CHECK_FLAG(re->flags, ZEBRA_FLAG_SELECTED)) {
+ if (!CHECK_FLAG(re->flags, ZEBRA_FLAG_SELECTED) &&
+ !CHECK_FLAG(re->flags, ZEBRA_FLAG_FIB_OVERRIDE)) {
if (IS_ZEBRA_DEBUG_NHT_DETAILED)
zlog_debug(
"\tRoute Entry %s !selected",