Implementing window-based CCNx consumer. Adding RTO estimation.
- ContentObject increases window by 1
- NACK decreases window by 1
- TO doesn't change window
If window is zero, next packet is scheduled after 0.1*RTO
diff --git a/apps/ccnx-consumer-cbr.cc b/apps/ccnx-consumer-cbr.cc
index a41753f..5a2a759 100644
--- a/apps/ccnx-consumer-cbr.cc
+++ b/apps/ccnx-consumer-cbr.cc
@@ -34,13 +34,6 @@
#include "ns3/ccnx-interest-header.h"
#include "ns3/ccnx-content-object-header.h"
-#include <boost/ref.hpp>
-#include <boost/lexical_cast.hpp>
-#include <boost/lambda/lambda.hpp>
-#include <boost/lambda/bind.hpp>
-
-namespace ll = boost::lambda;
-
NS_LOG_COMPONENT_DEFINE ("CcnxConsumerCbr");
namespace ns3
@@ -77,7 +70,7 @@
CcnxConsumerCbr::UpdateMean ()
{
double mean = 8.0 * m_payloadSize / m_desiredRate.GetBitRate ();
- m_randExp = ExponentialVariable (mean, 10000 * mean); // set upper limit to inter-arrival time
+ m_randExp = ExponentialVariable (mean, 100 * mean); // set upper limit to inter-arrival time
}
void
@@ -104,9 +97,12 @@
void
CcnxConsumerCbr::ScheduleNextPacket ()
{
+ // double mean = 8.0 * m_payloadSize / m_desiredRate.GetBitRate ();
+
if (!m_sendEvent.IsRunning ())
m_sendEvent = Simulator::Schedule (
Seconds(m_randExp.GetValue ()),
+ // Seconds(mean),
&CcnxConsumer::SendPacket, this);
}