commit 1e9348fb8dbcb8020f95888314d9e16db78fb5a7
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sun Jan 22 17:15:54 2012 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sun Jan 22 17:15:54 2012 -0800
tree 3904d4bdae04d7c45e4647086f74850f90a082b9
parent 6c67838be4a53c3ba1f70cc588727fcabdfc3107

CcnxConsumer doubles timeout upon NACK and Timout

apps/ccnx-consumer-batches.cc

diff --git a/apps/ccnx-consumer-batches.cc b/apps/ccnx-consumer-batches.cc
index da95d48..2a86817 100644
--- a/apps/ccnx-consumer-batches.cc
+++ b/apps/ccnx-consumer-batches.cc
@@ -80,7 +80,7 @@
 CcnxConsumerBatches::ScheduleNextPacket ()
 {
   if (!m_sendEvent.IsRunning ())
-    m_sendEvent = Simulator::Schedule (Seconds(0.00001), &CcnxConsumer::SendPacket, this);
+    m_sendEvent = Simulator::Schedule (Seconds (m_rtt->RetransmitTimeout ().ToDouble (Time::S) * 0.1), &CcnxConsumer::SendPacket, this);
 }
 
 ///////////////////////////////////////////////////

apps/ccnx-consumer.cc

diff --git a/apps/ccnx-consumer.cc b/apps/ccnx-consumer.cc
index edac879..e4ebcd3 100644
--- a/apps/ccnx-consumer.cc
+++ b/apps/ccnx-consumer.cc
@@ -314,6 +314,7 @@
   m_retxSeqs.insert (seq);
   NS_LOG_INFO ("After: " << m_retxSeqs.size ());
 
+  m_rtt->IncreaseMultiplier ();             // Double the next RTO ??
   ScheduleNextPacket ();
 }
 
@@ -322,6 +323,7 @@
 {
   // std::cout << Simulator::Now () << ", TO: " << sequenceNumber << ", current RTO: " << m_rtt->RetransmitTimeout ().ToDouble (Time::S) << "s\n";
 
+  m_rtt->IncreaseMultiplier ();             // Double the next RTO
   m_rtt->SentSeq (SequenceNumber32 (sequenceNumber), 1); // make sure to disable RTT calculation for this sample
   m_retxSeqs.insert (sequenceNumber);
   ScheduleNextPacket ();