[quagga-dev 8348] [PATCH 6/7] ospf6d: Route locking (memory) cleanup

Tom Goff thomas.goff at boeing.com
Wed Nov 10 21:03:02 GMT 2010


* ospf6_route.c: (ospf6_route_best_next) Allows unlock route, even
    when there's no next route.  This is consistent with how
    ospf6_route_next() behaves.

* ospf6_intra.c: (ospf6_intra_prefix_lsa_remove) Make sure the last
    route considered is always unlocked.  This is needed when the for
    loop terminates because ospf6_route_is_prefix() returns zero.

Signed-off-by: Tom Goff <thomas.goff at boeing.com>
---
 ospf6d/ospf6_intra.c |    2 ++
 ospf6d/ospf6_route.c |    3 ++-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ospf6d/ospf6_intra.c b/ospf6d/ospf6_intra.c
index 05b11ba..9bc603b 100644
--- a/ospf6d/ospf6_intra.c
+++ b/ospf6d/ospf6_intra.c
@@ -1177,6 +1177,8 @@ ospf6_intra_prefix_lsa_remove (struct ospf6_lsa *lsa)
             }
           ospf6_route_remove (route, oa->route_table);
         }
+      if (route)
+	ospf6_route_unlock (route);
     }
 
   if (current != end && IS_OSPF6_DEBUG_EXAMIN (INTRA_PREFIX))
diff --git a/ospf6d/ospf6_route.c b/ospf6d/ospf6_route.c
index 2d02710..398acfa 100644
--- a/ospf6d/ospf6_route.c
+++ b/ospf6d/ospf6_route.c
@@ -690,6 +690,8 @@ ospf6_route_best_next (struct ospf6_route *route)
   struct route_node *rnode;
   struct ospf6_route *next;
 
+  ospf6_route_unlock (route);
+
   rnode = route->rnode;
   route_lock_node (rnode);
   rnode = route_next (rnode);
@@ -701,7 +703,6 @@ ospf6_route_best_next (struct ospf6_route *route)
 
   assert (rnode->info);
   next = (struct ospf6_route *) rnode->info;
-  ospf6_route_unlock (route);
   ospf6_route_lock (next);
   return next;
 }
-- 
1.7.0.4




More information about the Quagga-dev mailing list