summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Jakma <paul.jakma@sun.com>2007-06-27 11:12:38 +0000
committerPaul Jakma <paul.jakma@sun.com>2007-06-27 11:12:38 +0000
commit0b8c4f1d811170224e467b305137ac94861daee6 (patch)
tree1f334740ab6492fd10b882b59f459ad470e9c6e3
parentfbf24544a2e2ac97192502d34729f57933d1eb4c (diff)
[zebra] rib loop check for RIB_ENTRY_REMOVED checks wrong var
2007-06-25 Denis Ovsienko * zebra_rib.c: (rib_add_ipv4_multipath) Loop through RIB is using 'same' variable, but RIB_ENTRY_REMOVED check is testing the constant 'rib' variable, fix. Impact unknown at this point.
-rw-r--r--zebra/ChangeLog7
-rw-r--r--zebra/zebra_rib.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/zebra/ChangeLog b/zebra/ChangeLog
index 6a86122c..ab6688c6 100644
--- a/zebra/ChangeLog
+++ b/zebra/ChangeLog
@@ -1,3 +1,10 @@
+2007-06-25 Denis Ovsienko
+
+ * zebra_rib.c: (rib_add_ipv4_multipath) Loop through RIB
+ is using 'same' variable, but RIB_ENTRY_REMOVED check
+ is testing the constant 'rib' variable, fix. Impact
+ unknown at this point.
+
2007-05-30 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* zebra_routemap.c: (route_set_src_compile) Use '#ifdef HAVE_IPV6'
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index 693b3331..a85c49fd 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -1393,7 +1393,7 @@ rib_add_ipv4_multipath (struct prefix_ipv4 *p, struct rib *rib)
withdraw. */
for (same = rn->info; same; same = same->next)
{
- if (CHECK_FLAG (rib->status, RIB_ENTRY_REMOVED))
+ if (CHECK_FLAG (same->status, RIB_ENTRY_REMOVED))
continue;
if (same->type == rib->type && same->table == rib->table