commit 120bf317ce654198d9b6af2f67b7bd75e003ee6a
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Dec 19 01:24:47 2011 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Dec 19 01:24:47 2011 -0800
tree b88b8fa68611e775524ac490235b0213efc25f77
parent 8f5a9bbe845300e398e72d3a5ce04c66889726a2

When giving up PIT entry, remove all outgoing interests. Otherwise,
everything can stuck (was happening...)

Modified experiment with synthetic topology

model/ccnx-l3-protocol.cc

diff --git a/model/ccnx-l3-protocol.cc b/model/ccnx-l3-protocol.cc
index 4e3e460..5b55906 100644
--- a/model/ccnx-l3-protocol.cc
+++ b/model/ccnx-l3-protocol.cc
@@ -76,7 +76,7 @@
     
     .AddAttribute ("BucketLeakInterval",
                    "Interval to leak buckets",
-                   StringValue ("10ms"),
+                   StringValue ("100ms"),
                    MakeTimeAccessor (&CcnxL3Protocol::GetBucketLeakInterval,
                                      &CcnxL3Protocol::SetBucketLeakInterval),
                    MakeTimeChecker ())
@@ -398,9 +398,11 @@
   // Lookup of Pit (and associated Fib) entry for this Interest 
   tuple<const CcnxPitEntry&,bool,bool> ret = m_pit->Lookup (*header);
   CcnxPitEntry const& pitEntry = ret.get<0> ();
-  // bool isNew = ret.get<1> ();
+  bool isNew = ret.get<1> ();
   bool isDuplicated = ret.get<2> ();
 
+  NS_LOG_DEBUG ("isNew: " << isNew << ", isDup: " << isDuplicated);
+  
   if (isDuplicated) 
     {
       m_dropInterests (header, DUPLICATED, incomingFace);
@@ -463,6 +465,8 @@
                      ll::var(inFace) = ll::bind (&CcnxPitEntry::AddIncoming, ll::_1, incomingFace));
     }
 
+  NS_LOG_DEBUG ("IsRetx: " << isRetransmitted);
+
   // update PIT entry lifetime
   m_pit->modify (m_pit->iterator_to (pitEntry),
                  ll::bind (&CcnxPitEntry::UpdateLifetime, ll::_1,
@@ -516,6 +520,7 @@
   // ForwardingStrategy failed to find it. 
   if (!propagated)
     {
+      NS_LOG_DEBUG ("Not propagated");
       m_dropInterests (header, NO_FACES, incomingFace);
       GiveUpInterest (pitEntry, header);
     }
@@ -620,6 +625,10 @@
   m_pit->modify (m_pit->iterator_to (pitEntry),
                  ll::bind (&CcnxPitEntry::ClearIncoming, ll::_1));
 
+  // Remove also outgoing
+  m_pit->modify (m_pit->iterator_to (pitEntry),
+                 ll::bind (&CcnxPitEntry::ClearOutgoing, ll::_1));
+  
   // Set pruning timout on PIT entry (instead of deleting the record)
   m_pit->modify (m_pit->iterator_to (pitEntry),
                  ll::bind (&CcnxPitEntry::SetExpireTime, ll::_1,