Finalizing interest limits. Now everything seem to work.
To work correctly, a lot of parameters have to be adjusted, including average
contentObject size, averageRTT, queues on nodes.
diff --git a/model/ccnx-face.h b/model/ccnx-face.h
index 40de808..0499abb 100644
--- a/model/ccnx-face.h
+++ b/model/ccnx-face.h
@@ -165,13 +165,13 @@
*
* @param bucket maximum value for Interest allowance. If < 0, then limit will be disabled
*/
- inline void
+ void
SetBucketMax (double bucket);
/**
* @brief Set a normalized value (one second) for Interest allowance bucket leak
*/
- inline void
+ void
SetBucketLeak (double leak);
/**
@@ -182,7 +182,7 @@
void
LeakBucket (const Time &interval);
- inline void
+ void
LeakBucketByOnePacket ();
/**
@@ -248,24 +248,6 @@
return m_id;
}
-void
-CcnxFace::SetBucketMax (double bucket)
-{
- m_bucketMax = bucket;
-}
-
-void
-CcnxFace::SetBucketLeak (double leak)
-{
- m_bucketLeak = leak;
-}
-
-void
-CcnxFace::LeakBucketByOnePacket ()
-{
- m_bucket -= std::max (0.0, m_bucket-1.0);
-}
-
} // namespace ns3
#endif //CCNX_FACE_H