commit 5560861c8404f60e3d0f45b1e525e58d214d12bc
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Apr 30 13:24:50 2012 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Apr 30 13:24:50 2012 -0700
tree 82a7e272948ee0708024f731cc0dfb5d764e6d20
parent 280882c9c40397cdb11530677a0695c7574d3a57

Checkpoint

model/sync-logic.cc

diff --git a/model/sync-logic.cc b/model/sync-logic.cc
index faf4e50..b77f29d 100644
--- a/model/sync-logic.cc
+++ b/model/sync-logic.cc
@@ -70,8 +70,8 @@
   , m_rangeUniformRandom (m_randomGenerator, uniform_int<> (500,1000))
   , m_reexpressionJitter (m_randomGenerator, uniform_int<> (0,100))
 #else
-  , m_rangeUniformRandom (200,300)
-  , m_reexpressionJitter (0,200)
+  , m_rangeUniformRandom (200,1000)
+  , m_reexpressionJitter (100,500)
 #endif
 {
 #ifdef _STANDALONE

model/sync-logic.h

diff --git a/model/sync-logic.h b/model/sync-logic.h
index a3f5a6b..d13257a 100644
--- a/model/sync-logic.h
+++ b/model/sync-logic.h
@@ -157,7 +157,7 @@
   static const int m_unknownDigestStoreTime = 10; // seconds
 #ifdef NS3_MODULE
   static const int m_syncResponseFreshness = 100; // milliseconds
-  static const int m_syncInterestReexpress = 10000; // seconds
+  static const int m_syncInterestReexpress = 10; // 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 5260dfc..d0b8482 100644
--- a/ns3/sync-ccnx-wrapper.cc
+++ b/ns3/sync-ccnx-wrapper.cc
@@ -112,7 +112,7 @@
   _LOG_DEBUG ("Nonce: " << nonce);
   interestHeader.SetNonce            (nonce);
   interestHeader.SetName             (name);
-  interestHeader.SetInterestLifetime (Seconds (10000.0)); // really long-lived interests
+  interestHeader.SetInterestLifetime (Seconds (12000.0)); // really long-lived interests
 
   Ptr<Packet> packet = Create<Packet> ();
   packet->AddPacketTag (CreateObject<TypeTag> (TypeTag::INTEREST));