commit 9587cd6f26b1e6683cf96025388bcb8867216655
author Zhenkai Zhu <zhenkai@cs.ucla.edu> Wed Oct 17 11:58:37 2012 -0700
committer Zhenkai Zhu <zhenkai@cs.ucla.edu> Wed Oct 17 12:05:09 2012 -0700
tree 3c7b01332edf2fe9612ffdc9696bc483d61b957e
parent ba56f438f2305793f3437f49bf7d30a0ce942be9

reverse the "single pattern" in ccnx wrapper
disable ccn reconnect before the openssl bug get's fixed in ccnx code
it's parc's problem to fix the openssl bug

model/sync-logic.cc

diff --git a/model/sync-logic.cc b/model/sync-logic.cc
index f298768..acb4d90 100644
--- a/model/sync-logic.cc
+++ b/model/sync-logic.cc
@@ -66,7 +66,7 @@
   , m_onUpdate (onUpdate)
   , m_perBranch (false)
   , m_onRemove (onRemove)
-  , m_ccnxHandle(CcnxWrapper::Create ())
+  , m_ccnxHandle(new CcnxWrapper ())
   , m_recoveryRetransmissionInterval (m_defaultRecoveryRetransmitInterval)
 #ifndef NS3_MODULE
   , m_randomGenerator (static_cast<unsigned int> (std::time (0)))
@@ -96,7 +96,7 @@
   , m_syncPrefix (syncPrefix)
   , m_onUpdateBranch (onUpdateBranch)
   , m_perBranch(true)
-  , m_ccnxHandle(CcnxWrapper::Create ())
+  , m_ccnxHandle(new CcnxWrapper())
   , m_recoveryRetransmissionInterval (m_defaultRecoveryRetransmitInterval)
 #ifndef NS3_MODULE
   , m_randomGenerator (static_cast<unsigned int> (std::time (0)))
@@ -122,10 +122,6 @@
 SyncLogic::~SyncLogic ()
 {
   m_ccnxHandle->clearInterestFilter (m_syncPrefix);
-  m_ccnxHandle.reset ();
-  // m_scheduler.cancel (REEXPRESSING_INTEREST);
-  // m_scheduler.cancel (DELAYED_INTEREST_PROCESSING);
-  // sleep (m_syncInterestReexpress+1);
 }
 
 #ifdef NS3_MODULE