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/model/ccnx-net-device-face.cc b/model/ccnx-net-device-face.cc
index 9bdcd43..8304711 100644
--- a/model/ccnx-net-device-face.cc
+++ b/model/ccnx-net-device-face.cc
@@ -32,17 +32,17 @@
namespace ns3 {
-NS_OBJECT_ENSURE_REGISTERED (CcnxNetDeviceFace);
+// NS_OBJECT_ENSURE_REGISTERED (CcnxNetDeviceFace);
-TypeId
-CcnxNetDeviceFace::GetTypeId ()
-{
- static TypeId tid = TypeId ("ns3::CcnxNetDeviceFace")
- .SetGroupName ("Ccnx")
- .SetParent<CcnxFace> ()
- ;
- return tid;
-}
+// TypeId
+// CcnxNetDeviceFace::GetTypeId ()
+// {
+// static TypeId tid = TypeId ("ns3::CcnxNetDeviceFace")
+// .SetGroupName ("Ccnx")
+// .SetParent<CcnxFace> ()
+// ;
+// return tid;
+// }
/**
* By default, Ccnx face are created in the "down" state. Before
@@ -69,15 +69,6 @@
return *this;
}
-
-void
-CcnxNetDeviceFace::DoDispose (void)
-{
- NS_LOG_FUNCTION_NOARGS ();
- m_netDevice = 0;
- Object::DoDispose ();
-}
-
Ptr<NetDevice>
CcnxNetDeviceFace::GetNetDevice () const
{
@@ -126,11 +117,11 @@
}
-std::ostream& operator<< (std::ostream& os, const CcnxNetDeviceFace &face)
+std::ostream&
+CcnxNetDeviceFace::Print (std::ostream& os) const
{
- return operator<< (os, static_cast<const CcnxFace&> (face)); // just call parent class for now
- // os << "id=" << face.GetId ();
- // return os;
+ os << "dev=net(" << GetId () << ")";
+ return os;
}
}; // namespace ns3