commit 085742a153cb601d85ed0d22413582f816ee8087
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Apr 26 12:24:57 2012 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Apr 26 12:24:57 2012 -0700
tree 4f5b731fc412d89c57fef8ff4444cd9dfa4cbe99
parent 3a22913d77e28f36f6614355e187bbb1e7e3dd3e

Checkpoint

model/sync-logic.cc

diff --git a/model/sync-logic.cc b/model/sync-logic.cc
index 5a0f443..d4e5163 100644
--- a/model/sync-logic.cc
+++ b/model/sync-logic.cc
@@ -50,9 +50,11 @@
   , m_ccnxHandle(new CcnxWrapper())
 #ifndef NS3_MODULE
   , m_randomGenerator (static_cast<unsigned int> (std::time (0)))
-  , m_rangeUniformRandom (m_randomGenerator, uniform_int<> (20,80))
+  , m_rangeUniformRandom (m_randomGenerator, uniform_int<> (200,300))
+  , m_reexpressionJitter (m_randomGenerator, uniform_int<> (0,100))
 #else
-  , m_rangeUniformRandom (1000,2000)
+  , m_rangeUniformRandom (200,300)
+  , m_reexpressionJitter (0, 100)
 #endif
 {
 #ifdef _STANDALONE
@@ -216,7 +218,7 @@
         }
       else
         {
-          m_recentUnknownDigests.insert (DigestTime (digest, TIME_NOW + TIME_SECONDS (m_unknownDigestStoreTime)));
+          // m_recentUnknownDigests.insert (DigestTime (digest, TIME_NOW + TIME_SECONDS (m_unknownDigestStoreTime)));
           
           uint32_t waitDelay =
 #ifndef NS3_MODULE

model/sync-logic.h

diff --git a/model/sync-logic.h b/model/sync-logic.h
index 12b9f54..a3f5a6b 100644
--- a/model/sync-logic.h
+++ b/model/sync-logic.h
@@ -148,14 +148,16 @@
 #ifndef NS3_MODULE
   boost::mt19937 m_randomGenerator;
   boost::variate_generator<boost::mt19937&, boost::uniform_int<> > m_rangeUniformRandom;
+  boost::variate_generator<boost::mt19937&, boost::uniform_int<> > m_reexpressionJitter;
 #else
   ns3::UniformVariable m_rangeUniformRandom;
+  ns3::UniformVariable m_reexpressionJitter;
 #endif
 
   static const int m_unknownDigestStoreTime = 10; // seconds
 #ifdef NS3_MODULE
   static const int m_syncResponseFreshness = 100; // milliseconds
-  static const int m_syncInterestReexpress = 10; // seconds
+  static const int m_syncInterestReexpress = 10000; // seconds
   // don't forget to adjust value in SyncCcnxWrapper
 #else
   static const int m_syncResponseFreshness = 2000;

ns3/sync-ccnx-wrapper.cc

diff --git a/ns3/sync-ccnx-wrapper.cc b/ns3/sync-ccnx-wrapper.cc
index dc768f6..b61f034 100644
--- a/ns3/sync-ccnx-wrapper.cc
+++ b/ns3/sync-ccnx-wrapper.cc
@@ -110,7 +110,7 @@
   CcnxInterestHeader interestHeader;
   interestHeader.SetNonce            (m_rand.GetValue ());
   interestHeader.SetName             (name);
-  interestHeader.SetInterestLifetime (Seconds (10.0)); // really long-lived interests
+  interestHeader.SetInterestLifetime (Seconds (10000.0)); // really long-lived interests
 
   Ptr<Packet> packet = Create<Packet> ();
   packet->AddPacketTag (CreateObject<TypeTag> (TypeTag::INTEREST));