Solving compilation problems, adding more comments. Modified ccnx-test example
diff --git a/model/ccnx-net-device-face.cc b/model/ccnx-net-device-face.cc
index 37a3555..b5816a4 100644
--- a/model/ccnx-net-device-face.cc
+++ b/model/ccnx-net-device-face.cc
@@ -44,14 +44,14 @@
}
/**
- * By default, Ccnx face are created in the "down" state
- * with no IP addresses. Before becoming useable, the user must
- * invoke SetUp on them once an Ccnx address and mask have been set.
+ * By default, Ccnx face are created in the "down" state. Before
+ * becoming useable, the user must invoke SetUp on the face
*/
-CcnxNetDeviceFace::CcnxNetDeviceFace ()
- : m_netDevice (0)
+CcnxNetDeviceFace::CcnxNetDeviceFace (const Ptr<NetDevice> &netDevice)
{
NS_LOG_FUNCTION (this);
+
+ m_netDevice = netDevice;
}
CcnxNetDeviceFace::~CcnxNetDeviceFace ()
@@ -77,12 +77,6 @@
Object::DoDispose ();
}
-void
-CcnxNetDeviceFace::SetNetDevice (Ptr<NetDevice> netDevice)
-{
- m_netDevice = netDevice;
-}
-
Ptr<NetDevice>
CcnxNetDeviceFace::GetNetDevice () const
{
@@ -127,7 +121,7 @@
const Address &to,
NetDevice::PacketType packetType)
{
- // bla bla bla
+ m_protocolHandler (Ptr<CcnxFace>(this), p);
}