commit 36d5c2a30796b71cb78c6a7bc947f3706cc0d200
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Jan 02 19:09:19 2012 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Jan 02 19:09:19 2012 -0800
tree 34c6f84374f615a4213988924224ed7aaddb23a7
parent 1d2642add75ee68aa940448ffacacc54e9255edb

Temp commit

apps/ccnx-consumer.cc

diff --git a/apps/ccnx-consumer.cc b/apps/ccnx-consumer.cc
index 6b63693..44573b6 100644
--- a/apps/ccnx-consumer.cc
+++ b/apps/ccnx-consumer.cc
@@ -121,7 +121,7 @@
 CcnxConsumer::CcnxConsumer ()
   : m_rand (0, std::numeric_limits<uint32_t>::max ())
   , m_desiredRate ("10Kbps")
-  , m_payloadSize (1024)
+  , m_payloadSize (1040)
   , m_seq (0)
 {
   NS_LOG_FUNCTION_NOARGS ();
@@ -230,6 +230,8 @@
 
   m_seqMax = floor(1.0 + size * 1024.0 * 1024.0 / m_payloadSize);
   NS_LOG_DEBUG ("MaxSeqNo: " << m_seqMax);
+
+  std::cout << "MaxSeqNo = " << m_seqMax << "\n";
 }
 
 
@@ -363,8 +365,11 @@
   //  NS_ASSERT_MSG (entry != m_seqTimeouts.end (),
   //             "Comment out this assert, if it causes problems");
 
-  if (entry != m_seqTimeouts.end ())
-    m_seqTimeouts.erase (entry);
+  // if (entry != m_seqTimeouts.end ())
+  //   m_seqTimeouts.erase (entry);
+
+  m_seqTimeouts.erase (seq);
+  m_retxSeqs.erase (seq);
 }
 
 void