commit 631fcd2e51b02b3d5548bee4108044921fb3e58b
author Timo Teräs <timo.teras@iki.fi> Wed Oct 19 16:02:31 2016 +0300
committer Paul Jakma <paul@quagga.net> Mon Jan 23 18:51:50 2017 +0000
tree 0723168ac470f529f2fbed9259196d62a5474c55
parent 3b0e3008e41c967e459f87b6ca8658ef26f49bc9

zebra: use FIB state for nexthop tracking

The FIB override routes can override ZEBRA_FLAG_SELECTED routes
in FIB. Use the FIB state instead to report correct nexthop when
FIB override routes are present.

zebra/zebra_rnh.c

diff --git a/zebra/zebra_rnh.c b/zebra/zebra_rnh.c
index 7b6d0f8..97d3597 100644
--- a/zebra/zebra_rnh.c
+++ b/zebra/zebra_rnh.c
@@ -223,7 +223,7 @@
 	    {
 	      if (CHECK_FLAG (rib->status, RIB_ENTRY_REMOVED))
 		continue;
-	      if (CHECK_FLAG (rib->flags, ZEBRA_FLAG_SELECTED))
+	      if (CHECK_FLAG (rib->status, RIB_ENTRY_SELECTED_FIB))
 		{
 		  if (CHECK_FLAG(rnh->flags, ZEBRA_NHT_CONNECTED))
 		    {