commit ea27f4e4b264d3cf4592098885514e9814afef69
author Ilya Moiseenko <iliamo@ucla.edu> Fri Oct 28 13:19:07 2011 -0700
committer Ilya Moiseenko <iliamo@ucla.edu> Fri Oct 28 13:40:13 2011 -0700
tree c6f58dc926e8bc3874185d4a94fd06373f98ab4f
parent 75d9bf53a2b81630fba285b2a297a42a02e715d8

Forwarding strategy refactoring

model/ccnx-forwarding-strategy.cc

diff --git a/model/ccnx-forwarding-strategy.cc b/model/ccnx-forwarding-strategy.cc
index b296959..f048e6e 100644
--- a/model/ccnx-forwarding-strategy.cc
+++ b/model/ccnx-forwarding-strategy.cc
@@ -42,15 +42,15 @@
 }
 
 void
-CcnxForwardingStrategy::SetCcnx(Ptr<Ccnx> ccnx)
+CcnxForwardingStrategy::SetPit(Ptr<CcnxPit> pit)
 {
-    m_ccnx = ccnx;
+    m_pit = pit;
 }
     
-Ptr<Ccnx>
-CcnxForwardingStrategy::GetCcnx()
+Ptr<CcnxPit>
+CcnxForwardingStrategy::GetPit()
 {
-    return m_ccnx;
+    return m_pit;
 }
     
 } //namespace ns3

model/ccnx-forwarding-strategy.h

diff --git a/model/ccnx-forwarding-strategy.h b/model/ccnx-forwarding-strategy.h
index 6b4a832..3f0f8ae 100644
--- a/model/ccnx-forwarding-strategy.h
+++ b/model/ccnx-forwarding-strategy.h
@@ -27,6 +27,8 @@
 
 #include "ccnx.h"
 #include "ccnx-fib.h"
+#include "ccnx-pit.h"
+#include "ccnx-pit-entry.h"
 
 namespace ns3 {
 
@@ -44,20 +46,22 @@
 
   CcnxForwardingStrategy ();
     
-  void SetCcnx(Ptr<Ccnx> ccnx);
+  void SetPit(Ptr<CcnxPit> pit);
     
   typedef
   Callback<void, const Ptr<CcnxFace> &, const Ptr<CcnxInterestHeader> &, const Ptr<Packet> &>
   SendCallback;
 
-  virtual bool PropagateInterest  (const Ptr<CcnxFace> &incomingFace,
+  virtual bool PropagateInterest  (CcnxPitEntryContainer::type::iterator pitEntry, 
+                                   CcnxFibEntryContainer::type::iterator fibEntry,
+                                   const Ptr<CcnxFace> &incomingFace,
                                    Ptr<CcnxInterestHeader> &header,
                                    const Ptr<const Packet> &packet,
                                    SendCallback ucb) = 0;
-  Ptr<Ccnx> GetCcnx();
+  Ptr<CcnxPit> GetPit();
     
 private:  
-  Ptr<Ccnx> m_ccnx;
+  Ptr<CcnxPit> m_pit;
 };
 
 } //namespace ns3