commit 16d252ade70f23aab6dc5b5ca5702fe942d60e64
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Dec 19 10:54:24 2013 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Dec 19 10:54:24 2013 -0800
tree d833e902ae957374bf64341d1f0fc90cd2f9d750
parent 1914d49395b8ca27a8925ebb6ef282b1ceb33d63

helper: ndn::GlobalRoutingHelper extension

Now CalculateRoutes and CalculateAllPossibleRoutes accept flag,
indicating whether to invalidate (default) or preserve existing routes

helper/ndn-global-routing-helper.cc

diff --git a/helper/ndn-global-routing-helper.cc b/helper/ndn-global-routing-helper.cc
index 6ecd944..04ecc6f 100644
--- a/helper/ndn-global-routing-helper.cc
+++ b/helper/ndn-global-routing-helper.cc
@@ -234,7 +234,7 @@
 }
 
 void
-GlobalRoutingHelper::CalculateRoutes ()
+GlobalRoutingHelper::CalculateRoutes (bool invalidatedRoutes/* = true*/)
 {
   /**
    * Implementation of route calculation is heavily based on Boost Graph Library
@@ -278,7 +278,10 @@
       // NS_LOG_DEBUG (predecessors.size () << ", " << distances.size ());
 
       Ptr<Fib>  fib  = source->GetObject<Fib> ();
-      fib->InvalidateAll ();
+      if (invalidatedRoutes)
+        {
+          fib->InvalidateAll ();
+        }
       NS_ASSERT (fib != 0);
 
       NS_LOG_DEBUG ("Reachability from Node: " << source->GetObject<Node> ()->GetId ());
@@ -324,7 +327,7 @@
 }
 
 void
-GlobalRoutingHelper::CalculateAllPossibleRoutes ()
+GlobalRoutingHelper::CalculateAllPossibleRoutes (bool invalidatedRoutes/* = true*/)
 {
   /**
    * Implementation of route calculation is heavily based on Boost Graph Library
@@ -350,7 +353,10 @@
 	}
 
       Ptr<Fib>  fib  = source->GetObject<Fib> ();
-      fib->InvalidateAll ();
+      if (invalidatedRoutes)
+        {
+          fib->InvalidateAll ();
+        }
       NS_ASSERT (fib != 0);
 
       NS_LOG_DEBUG ("===========");