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

zebra: fix nht validity checking to be same as when it's resolved

This reverts commit 7e3a435bd99 "A valid BGP nexthop is flagged as invalid"

Problem is BGP thinks the nexthop is accessible when it's recursive, and
selects it, but zebra rejects it at route install time. Causing FIB and
BGP state to be out-of-sync. Fix nht to follow same rules as zebra rib.

zebra/zebra_rnh.c

diff --git a/zebra/zebra_rnh.c b/zebra/zebra_rnh.c
index 97d3597..5762d3f 100644
--- a/zebra/zebra_rnh.c
+++ b/zebra/zebra_rnh.c
@@ -498,8 +498,8 @@
       nump = stream_get_endp(s);
       stream_putc (s, 0);
       for (nexthop = rib->nexthop; nexthop; nexthop = nexthop->next)
-	if ((CHECK_FLAG (nexthop->flags, NEXTHOP_FLAG_FIB) ||
-             CHECK_FLAG (nexthop->flags, NEXTHOP_FLAG_RECURSIVE)) &&
+	if (CHECK_FLAG (nexthop->flags, NEXTHOP_FLAG_FIB) &&
+            ! CHECK_FLAG (nexthop->flags, NEXTHOP_FLAG_RECURSIVE) &&
 	    CHECK_FLAG (nexthop->flags, NEXTHOP_FLAG_ACTIVE))
 	  {
 	    stream_putc (s, nexthop->type);