Many corrections to face/local-face/net-device-face/fib/pit. Now
interest packets actually go down to ccnx stack. Also, now it is
possible to manually configure FIB entries.
CcnxFib now is an object aggregated to the node
diff --git a/helper/ccnx-producer-helper.cc b/helper/ccnx-producer-helper.cc
index 71a7c32..433a15a 100644
--- a/helper/ccnx-producer-helper.cc
+++ b/helper/ccnx-producer-helper.cc
@@ -72,11 +72,9 @@
Ptr<Application>
CcnxProducerHelper::InstallPriv (Ptr<Node> node)
{
- Ptr<CcnxLocalFace> localFace = CreateObject<CcnxLocalFace> ();
+ Ptr<CcnxLocalFace> localFace = Create<CcnxLocalFace> ();
localFace->SetNode(node);
-
-
-
+
//CreateAndAggregateObjectFromTypeId (node, "ns3::CcnxL3Protocol");
ObjectFactory factory;
factory.SetTypeId("ns3::CcnxL3Protocol");
@@ -92,7 +90,7 @@
return 0;
}
- m_factory.Set ("Face", PointerValue (localFace));
+ // m_factory.Set ("Face", PointerValue (localFace));
m_factory.Set ("Ccnx", PointerValue (ccnx));
Ptr<CcnxProducer> app = m_factory.Create<CcnxProducer> ();
@@ -104,4 +102,4 @@
return app;
}
-}
\ No newline at end of file
+}