Revert "Fix management of route changes"

This reverts commit d10d6c178e3c91e0dc73b6924099cb8fa416c279.

1 files changed, 27 insertions, 45 deletions

diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index a511577b..145005d3 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -381,12 +381,11 @@ nexthop_active_ipv4 (struct rib *rib, struct nexthop *nexthop, int set,
   struct rib *match;
   struct nexthop *newhop;
 
+  if (nexthop->type == NEXTHOP_TYPE_IPV4)
+    nexthop->ifindex = 0;
+
   if (set)
-    {
-      UNSET_FLAG (nexthop->flags, NEXTHOP_FLAG_RECURSIVE);
-      if (nexthop->type == NEXTHOP_TYPE_IPV4)
-	nexthop->ifindex = 0;
-    }
+    UNSET_FLAG (nexthop->flags, NEXTHOP_FLAG_RECURSIVE);
 
   /* Make lookup prefix. */
   memset (&p, 0, sizeof (struct prefix_ipv4));
@@ -412,7 +411,7 @@ nexthop_active_ipv4 (struct rib *rib, struct nexthop *nexthop, int set,
       for (match = rn->info; match; match = match->next)
 	{
 	  if (CHECK_FLAG (match->status, RIB_ENTRY_REMOVED))
-	    continue;
+	      continue;
 	  if (CHECK_FLAG (match->flags, ZEBRA_FLAG_SELECTED))
 	    break;
 	}
@@ -437,19 +436,17 @@ nexthop_active_ipv4 (struct rib *rib, struct nexthop *nexthop, int set,
 	      if (!newhop)
 		return 0;	/* dead route */
 
+	      /* recursive route, remember index */
+	      if (set && nexthop->type == NEXTHOP_TYPE_IPV4)
+		nexthop->ifindex = newhop->ifindex;
+	      
 	      if (nexthop_isactive (newhop))
 		{
-		  if (set)
-		    {
-		      if (nexthop->type == NEXTHOP_TYPE_IPV4)
-			nexthop->ifindex = newhop->ifindex;
-		    }
-		  else 
-		    {
-		      if (nexthop->ifindex != newhop->ifindex ||
-			  CHECK_FLAG (nexthop->flags, NEXTHOP_FLAG_RECURSIVE))
-			SET_FLAG (rib->flags, ZEBRA_FLAG_CHANGED);
-		    }
+		  /* if new match is different  then force the CHANGED flag.
+		   * FIXME (have this routine return NULL or nexhop instead)
+		   */
+		  if (newhop != nexthop)
+		    SET_FLAG (rib->flags, ZEBRA_FLAG_CHANGED);
 		  return 1;
 		}
 	    }
@@ -461,6 +458,9 @@ nexthop_active_ipv4 (struct rib *rib, struct nexthop *nexthop, int set,
 		    && ! CHECK_FLAG (newhop->flags, NEXTHOP_FLAG_RECURSIVE)
 		    && nexthop_isactive (newhop))
 		  {
+		    if (newhop != nexthop)
+		      SET_FLAG (rib->flags, ZEBRA_FLAG_CHANGED);
+
 		    if (set)
 		      {
 			SET_FLAG (nexthop->flags, NEXTHOP_FLAG_RECURSIVE);
@@ -472,14 +472,7 @@ nexthop_active_ipv4 (struct rib *rib, struct nexthop *nexthop, int set,
 			    || newhop->type == NEXTHOP_TYPE_IFNAME
 			    || newhop->type == NEXTHOP_TYPE_IPV4_IFINDEX)
 			  nexthop->rifindex = newhop->ifindex;
-			if (nexthop->type == NEXTHOP_TYPE_IPV4)
-			  nexthop->ifindex = newhop->ifindex;
 		      }
-		    else if (! CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_RECURSIVE)
-			     || newhop->ifindex != nexthop->ifindex
-			     || nexthop->gate.ipv4.s_addr != newhop->gate.ipv4.s_addr)
-		      SET_FLAG (rib->flags, ZEBRA_FLAG_CHANGED);
-
 
 		    return 1;
 		  }
@@ -537,7 +530,7 @@ nexthop_active_ipv6 (struct rib *rib, struct nexthop *nexthop, int set,
       for (match = rn->info; match; match = match->next)
 	{
 	  if (CHECK_FLAG (match->status, RIB_ENTRY_REMOVED))
-	    continue;
+	      continue;
 	  if (CHECK_FLAG (match->flags, ZEBRA_FLAG_SELECTED))
 	    break;
 	}
@@ -563,22 +556,16 @@ nexthop_active_ipv6 (struct rib *rib, struct nexthop *nexthop, int set,
 		return 0;	/* dead route */
 
 	      /* recursive route, remember index */
-	      if (nexthop->type == NEXTHOP_TYPE_IPV6)
+	      if (set && nexthop->type == NEXTHOP_TYPE_IPV6)
 		nexthop->ifindex = newhop->ifindex;
 	      
 	      if (nexthop_isactive (newhop))
 		{
-		  if (set)
-		    {
-		      if (nexthop->type == NEXTHOP_TYPE_IPV6)
-			nexthop->ifindex = newhop->ifindex;
-		    }
-		  else 
-		    {
-		      if (nexthop->ifindex != newhop->ifindex ||
-			  CHECK_FLAG (nexthop->flags, NEXTHOP_FLAG_RECURSIVE))
-			SET_FLAG (rib->flags, ZEBRA_FLAG_CHANGED);
-		    }
+		  /* if new match is different  then force the CHANGED flag.
+		   * FIXME (have this routine return NULL or nexhop instead)
+		   */
+		  if (newhop != nexthop)
+		    SET_FLAG (rib->flags, ZEBRA_FLAG_CHANGED);
 		  return 1;
 		}
 	    }
@@ -589,6 +576,9 @@ nexthop_active_ipv6 (struct rib *rib, struct nexthop *nexthop, int set,
 		    && ! CHECK_FLAG (newhop->flags, NEXTHOP_FLAG_RECURSIVE)
 		    && nexthop_isactive (newhop))
 		  {
+		    if (newhop != nexthop)
+		      SET_FLAG (rib->flags, ZEBRA_FLAG_CHANGED);
+
 		    if (set)
 		      {
 			SET_FLAG (nexthop->flags, NEXTHOP_FLAG_RECURSIVE);
@@ -602,15 +592,7 @@ nexthop_active_ipv6 (struct rib *rib, struct nexthop *nexthop, int set,
 			    || newhop->type == NEXTHOP_TYPE_IPV6_IFINDEX
 			    || newhop->type == NEXTHOP_TYPE_IPV6_IFNAME)
 			  nexthop->rifindex = newhop->ifindex;
-			if (nexthop->type == NEXTHOP_TYPE_IPV6)
-			  nexthop->ifindex = newhop->ifindex;
 		      }
-		    else if (! CHECK_FLAG(nexthop->flags, NEXTHOP_FLAG_RECURSIVE)
-			     || newhop->ifindex != nexthop->ifindex
-			     || !IPV6_ADDR_SAME(&nexthop->gate.ipv6, 
-						&newhop->gate.ipv4))
-		      SET_FLAG (rib->flags, ZEBRA_FLAG_CHANGED);
-
 		    return 1;
 		  }
 	      return 0;