commit b550d6a222c862a4c9159765943299e77d74b513
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Apr 09 15:03:16 2012 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Apr 09 15:03:16 2012 -0700
tree ba64d0d3f7e28f1f3fc4f0651e57f50245623de2
parent 181d7e5c34119c7d56ab8a351605ff774bb46157

First simple NS-3 scenario that seems to work

model/sync-logic.cc

diff --git a/model/sync-logic.cc b/model/sync-logic.cc
index 17a0935..528f212 100644
--- a/model/sync-logic.cc
+++ b/model/sync-logic.cc
@@ -61,6 +61,11 @@
 #endif
 #endif
 #endif
+
+  _LOG_DEBUG ("syncPrefix");
+  
+#ifndef NS3_MODULE
+  // In NS3 module these functions are moved to StartApplication method
   
   m_ccnxHandle->setInterestFilter (m_syncPrefix,
                                    bind (&SyncLogic::respondSyncInterest, this, _1));
@@ -68,6 +73,7 @@
   m_scheduler.schedule (TIME_SECONDS (0),
                         bind (&SyncLogic::sendSyncInterest, this),
                         REEXPRESSING_INTEREST);
+#endif
 }
 
 SyncLogic::~SyncLogic ()
@@ -78,6 +84,29 @@
   m_ccnxHandle.reset ();
 }
 
+#ifdef NS3_MODULE
+void
+SyncLogic::StartApplication ()
+{
+  m_ccnxHandle->SetNode (GetNode ());
+  m_ccnxHandle->StartApplication ();
+
+  m_ccnxHandle->setInterestFilter (m_syncPrefix,
+                                   bind (&SyncLogic::respondSyncInterest, this, _1));
+
+  m_scheduler.schedule (TIME_SECONDS (0),
+                        bind (&SyncLogic::sendSyncInterest, this),
+                        REEXPRESSING_INTEREST);
+}
+
+void
+SyncLogic::StopApplication ()
+{
+  m_ccnxHandle->StopApplication ();
+}
+#endif
+
+
 void
 SyncLogic::respondSyncInterest (const string &interest)
 {
@@ -410,20 +439,4 @@
                         REEXPRESSING_INTEREST);
 }
 
-#ifdef NS3_MODULE
-void
-SyncLogic::StartApplication ()
-{
-  m_ccnxHandle->SetNode (GetNode ());
-  m_ccnxHandle->StartApplication ();
-}
-
-void
-SyncLogic::StopApplication ()
-{
-  m_ccnxHandle->StopApplication ();
-}
-#endif
-
-
 }