commit 77a1c4e05ca5a7d7bf07456758f7c934ee867884
author Joakim Tjernlund <Joakim.Tjernlund@transmode.se> Sun Feb 01 11:12:11 2009 +0100
committer Paul Jakma <paul@quagga.net> Thu Jun 25 15:36:08 2009 +0100
tree 47553373b16dd033a0866624dd54b8b851cbdb09
parent cbcd9bfc503f08b99f5360b1aae3a5362d25a665

[ospfd] compare ifIndex too when matching paths

ospf_path_lookup(), ospf_route_match_same() and
ospf_ase_route_match_same() needs to
compare if the interface matches too.

ospfd/ospf_ase.c

diff --git a/ospfd/ospf_ase.c b/ospfd/ospf_ase.c
index 3eb29f8..044f97c 100644
--- a/ospfd/ospf_ase.c
+++ b/ospfd/ospf_ase.c
@@ -593,6 +593,8 @@
        
        if (! IPV4_ADDR_SAME (&op->nexthop, &newop->nexthop))
 	 return 0;
+       if (op->oi->ifp->ifindex != newop->oi->ifp->ifindex)
+	 return 0;
      }
    return 1;
 }

ospfd/ospf_route.c

diff --git a/ospfd/ospf_route.c b/ospfd/ospf_route.c
index 50fba75..0829e8e 100644
--- a/ospfd/ospf_route.c
+++ b/ospfd/ospf_route.c
@@ -165,6 +165,8 @@
 
 	       if (! IPV4_ADDR_SAME (&op->nexthop, &newop->nexthop))
 		 return 0;
+	       if (op->oi->ifp->ifindex != newop->oi->ifp->ifindex)
+		 return 0;
 	     }
 	   return 1;
 	 }
@@ -827,10 +829,15 @@
   struct ospf_path *op;
 
   for (ALL_LIST_ELEMENTS_RO (plist, node, op))
-    if (IPV4_ADDR_SAME (&op->nexthop, &path->nexthop) &&
-        IPV4_ADDR_SAME (&op->adv_router, &path->adv_router))
-      return op;
-
+  {
+    if (!IPV4_ADDR_SAME (&op->nexthop, &path->nexthop))
+      continue;
+    if (!IPV4_ADDR_SAME (&op->adv_router, &path->adv_router))
+      continue;
+    if (op->oi->ifp->ifindex != path->oi->ifp->ifindex)
+      continue;
+    return op;
+  }
   return NULL;
 }