commit 40942f4676f18d6915a581690ed5afb77ed1577e
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sat Apr 21 20:53:16 2012 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sat Apr 21 20:53:16 2012 -0700
tree 3e01b3d367dbec25aaa24e7e0c694575c0d800b2
parent d7fc7c0c2a987651275a2ab33e7ba32d3b5ca16a

SyncMuc implementation...

model/sync-logic.cc

diff --git a/model/sync-logic.cc b/model/sync-logic.cc
index 403138a..49d9a24 100644
--- a/model/sync-logic.cc
+++ b/model/sync-logic.cc
@@ -107,6 +107,8 @@
 SyncLogic::StopApplication ()
 {
   m_ccnxHandle->StopApplication ();
+  m_scheduler.cancel (REEXPRESSING_INTEREST);
+  m_scheduler.cancel (DELAYED_INTEREST_PROCESSING);
 }
 #endif
 

model/sync-logic.h

diff --git a/model/sync-logic.h b/model/sync-logic.h
index 9734fad..3505d35 100644
--- a/model/sync-logic.h
+++ b/model/sync-logic.h
@@ -107,8 +107,8 @@
   getScheduler () { return m_scheduler; }
 #endif
 
-protected:
 #ifdef NS3_MODULE
+public:
   virtual void StartApplication ();
   virtual void StopApplication ();
 #endif
@@ -151,7 +151,11 @@
   ns3::UniformVariable m_rangeUniformRandom;
 #endif
   
+#ifndef NS3_MODULE
+  static const int m_syncResponseFreshness = 60;
+#else
   static const int m_syncResponseFreshness = 2;
+#endif
 
   enum EventLabels
     {

ns3/sync-ccnx-wrapper.cc

diff --git a/ns3/sync-ccnx-wrapper.cc b/ns3/sync-ccnx-wrapper.cc
index 9ef8cc4..e10e5b6 100644
--- a/ns3/sync-ccnx-wrapper.cc
+++ b/ns3/sync-ccnx-wrapper.cc
@@ -108,7 +108,7 @@
   CcnxInterestHeader interestHeader;
   interestHeader.SetNonce            (m_rand.GetValue ());
   interestHeader.SetName             (name);
-  interestHeader.SetInterestLifetime (Seconds (4.0));
+  interestHeader.SetInterestLifetime (Seconds (60.0));
 
   Ptr<Packet> packet = Create<Packet> ();
   packet->AddHeader (interestHeader);

wscript

diff --git a/wscript b/wscript
index 327815b..db7b242 100644
--- a/wscript
+++ b/wscript
@@ -105,6 +105,7 @@
             features=['cxx', 'cxxprogram'],
             source = ['evaluation/sync-eval.cc',
                       'evaluation/standard-muc.cc',
+                      'evaluation/sync-muc.cc',
                       ],
             use = 'sync-ns3',
             includes = ['model', 'ns3', 'helper'],