commit 91e1128c51f29a8f9b15a322753d8ba074dcbdf3
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Aug 21 17:23:11 2012 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Sep 04 00:00:50 2012 -0700
tree abbe1588edd6abb2e061dee7858599527df0fbd7
parent 5db9217da0434853432f32645c323714ee7db127

Another checkpoint

model/fw/per-fib-limits.cc

diff --git a/model/fw/per-fib-limits.cc b/model/fw/per-fib-limits.cc
index df4607d..d79a8fc 100644
--- a/model/fw/per-fib-limits.cc
+++ b/model/fw/per-fib-limits.cc
@@ -190,17 +190,20 @@
        queue != m_pitQueues.end ();
        queue++)
     {
-      if (queue->second.IsEmpty ())
-        continue;
+      Ptr<Face> outFace = queue->first;
+      
+      while (!queue->second.IsEmpty () && outFace->GetLimits ().IsBelowLimit ())
+        {
+          // now we have enqueued packet and have slot available. Send out delayed packet
+          Ptr<pit::Entry> pitEntry = queue->second.Pop ();
+          pitEntry->AddOutgoing (outFace);
 
-      // if (outFace->GetLimits ().IsBelowLimit ())
-      //   {
-      //     pitEntry->AddOutgoing (outFace);
-      //   }
-      // else
-      //   {
-      //     // do nothing
-      //   }
+          Ptr<Packet> packetToSend = Create<Packet> ();
+          packetToSend->AddHeader (*pitEntry->GetInterest ());
+          
+          outFace->Send (packetToSend);
+          DidSendOutInterest (outFace, pitEntry->GetInterest (), packetToSend, pitEntry);
+        }
     }
 }
 

model/pit/ndn-pit-entry.cc

diff --git a/model/pit/ndn-pit-entry.cc b/model/pit/ndn-pit-entry.cc
index 95b81dd..4dcf6d0 100644
--- a/model/pit/ndn-pit-entry.cc
+++ b/model/pit/ndn-pit-entry.cc
@@ -241,6 +241,11 @@
   return m_maxRetxCount;
 }
 
+Ptr<const InterestHeader>
+Entry::GetInterest () const
+{
+  return m_interest;
+}
 
 std::ostream& operator<< (std::ostream& os, const Entry &entry)
 {

model/pit/ndn-pit-entry.h

diff --git a/model/pit/ndn-pit-entry.h b/model/pit/ndn-pit-entry.h
index 1dc4264..ecec2a6 100644
--- a/model/pit/ndn-pit-entry.h
+++ b/model/pit/ndn-pit-entry.h
@@ -272,6 +272,12 @@
   inline void
   RemoveFwTag ();
 
+  /**
+   * @brief Get InterestHeader (if several interests are received, then nonce is from the first Interest)
+   */
+  Ptr<const InterestHeader>
+  GetInterest () const;
+
 private:
   friend std::ostream& operator<< (std::ostream& os, const Entry &entry);