Many corrections to face/local-face/net-device-face/fib/pit. Now
interest packets actually go down to ccnx stack. Also, now it is
possible to manually configure FIB entries.
CcnxFib now is an object aggregated to the node
diff --git a/model/ccnx-rit.cc b/model/ccnx-rit.cc
index 1eb1a74..c3db1ae 100644
--- a/model/ccnx-rit.cc
+++ b/model/ccnx-rit.cc
@@ -125,6 +125,7 @@
bool
CcnxRit::WasRecentlySatisfied (const CcnxInterestHeader &header)
{
+ NS_LOG_FUNCTION_NOARGS ();
std::pair<CcnxRitByNonce::type::iterator,CcnxRitByNonce::type::iterator>
entries = get<nonce> ().equal_range (header.GetNonce ());
@@ -145,6 +146,7 @@
void
CcnxRit::SetRecentlySatisfied (const CcnxInterestHeader &header)
{
+ NS_LOG_FUNCTION_NOARGS ();
NS_ASSERT_MSG (!WasRecentlySatisfied (header), "Duplicate recent interest should not be added to RIT");
get<timestamp> ().push_back (
@@ -157,27 +159,27 @@
void CcnxRit::CleanExpired ()
{
- NS_LOG_LOGIC ("Cleaning RIT");
+ // NS_LOG_LOGIC ("Cleaning RIT");
Time now = Simulator::Now ();
-#ifdef _DEBUG
- uint32_t count = 0;
-#endif
+// #ifdef _DEBUG
+// uint32_t count = 0;
+// #endif
while( !empty() )
{
if( get<timestamp> ().front ().m_expireTime <= now ) // is the record stale?
{
get<timestamp> ().pop_front( );
-#ifdef _DEBUG
- count++;
-#endif
+// #ifdef _DEBUG
+// count++;
+// #endif
}
else
break; // nothing else to do. All later records will not be stale
}
-#ifdef _DEBUG
- NS_LOG_DEBUG (count << " records cleaned");
-#endif
+// #ifdef _DEBUG
+// NS_LOG_DEBUG (count << " records cleaned");
+// #endif
// schedule next even
m_cleanupEvent = Simulator::Schedule (Simulator::Now () + m_cleanupTimeout,