commit 0a61c34d5fc86d4ff0f27da47267c9e6137a6a38
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Dec 06 12:48:55 2011 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Dec 06 12:48:55 2011 -0800
tree 204368ca681d72bd75d67ad09b13f967cc6c3836
parent e67a97f3bdf1b87cdef6e34eac382725c66e41f9

Several fixes in forwarding strategies and NACK processing

- All strategies will forward to one green face first, if it exists
- Implemented logic to detect retransmitted interests (same face)
- If interest is retransmitted and all faces are exhausted during the
  propagation face, increase max retx counter and try again
- PIT entry lifetime is updated on every non-duplicate interest reception

model/ccnx-pit.cc

diff --git a/model/ccnx-pit.cc b/model/ccnx-pit.cc
index 9770bd0..1cfa3f9 100644
--- a/model/ccnx-pit.cc
+++ b/model/ccnx-pit.cc
@@ -171,9 +171,8 @@
 
       entry = insert (end (),
                       CcnxPitEntry (Create<CcnxNameComponents> (header.GetName ()),
-                                    Simulator::Now () +
-                                    (header.GetInterestLifetime ().IsZero ()?m_PitEntryDefaultLifetime
-                                     :                                       header.GetInterestLifetime ()),
+                                    header.GetInterestLifetime ().IsZero ()?m_PitEntryDefaultLifetime
+                                    :                                       header.GetInterestLifetime (),
                                     *fibEntry));
 
       // isDuplicate = false; // redundant