commit 3a4a0b3901b612b2e8931dc7a2724f2695330bf1
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Jun 28 14:14:22 2012 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Jun 28 14:14:22 2012 -0700
tree 4401bd9226c8c2529acc01c2f69c4bbdb493426c
parent da02101b09346d61ce11cbcc15c7764ca1b7bf1b

Changing internals. PIT, FIB, CS, and ForwardingStrategy now are aggregated onto the node

Also, CcnxStackHelper provide an easy way to set up individual
parameters for them.

model/ccnx-forwarding-strategy.cc

diff --git a/model/ccnx-forwarding-strategy.cc b/model/ccnx-forwarding-strategy.cc
index a856577..93c3847 100644
--- a/model/ccnx-forwarding-strategy.cc
+++ b/model/ccnx-forwarding-strategy.cc
@@ -67,9 +67,18 @@
 }
 
 void
-CcnxForwardingStrategy::SetPit (Ptr<CcnxPit> pit)
+CcnxForwardingStrategy::NotifyNewAggregate ()
 {
-  m_pit = pit;
+  if (m_pit == 0)
+    {
+      m_pit = GetObject<CcnxPit> ();
+    }
+}
+
+void
+CcnxForwardingStrategy::DoDispose ()
+{
+  // nothing to do...
 }
 
 bool
@@ -79,6 +88,7 @@
                                                    const Ptr<const Packet> &packet)
 {
   NS_LOG_FUNCTION (this);
+  NS_ASSERT_MSG (m_pit != 0, "PIT should be aggregated with forwarding strategy");
 
   int propagatedCount = 0;