commit ef056554d096a11e54b446056b0c9d334f8d7af1
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Jan 20 16:19:12 2012 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Jan 20 16:19:12 2012 -0800
tree 99bcfd38b5bbbbad7c4b7536bf2691bce8319329
parent 17acc1159f79a9b3dbf1e85f4f8515f62f62e6fa

OSPF metric bug in BaseExperiment. Moving ApplyOSPFMetric to the right place

examples/base-experiment.h

diff --git a/examples/base-experiment.h b/examples/base-experiment.h
index c77760d..603687f 100644
--- a/examples/base-experiment.h
+++ b/examples/base-experiment.h
@@ -81,14 +81,14 @@
     ccnxHelper.SetDefaultRoutes (false);
     ccnxHelper.InstallAll ();
 
+    reader->ApplyOspfMetric ();
+
     ccnxHelper.InstallFakeGlobalRoutes ();
     if (installFIBs)
       {
         // // Populate FIB based on IPv4 global routing controller
         ccnxHelper.InstallRoutesToAll ();
       }
-    
-    reader->ApplyOspfMetric ();
   }
   
   void InstallIpStack ()

model/ccnx-fib.h

diff --git a/model/ccnx-fib.h b/model/ccnx-fib.h
index f383961..318bc54 100644
--- a/model/ccnx-fib.h
+++ b/model/ccnx-fib.h
@@ -60,7 +60,7 @@
    * \param face Face for which metric
    * \param cost Initial value for routing cost
    */
-  CcnxFibFaceMetric (Ptr<CcnxFace> face, int cost)
+  CcnxFibFaceMetric (Ptr<CcnxFace> face, int32_t cost)
     : m_face (face)
     , m_status (NDN_FIB_YELLOW)
     , m_routingCost (cost)