Modification of CcnxFace interface and unification of CCNx applications via common CcnxApp class
Moving functionality of interest limits from PIT to Face.
!!! Code compiles, but probably doesn't work !!!
diff --git a/model/ccnx-net-device-face.cc b/model/ccnx-net-device-face.cc
index 12cb272..72aa14a 100644
--- a/model/ccnx-net-device-face.cc
+++ b/model/ccnx-net-device-face.cc
@@ -36,11 +36,13 @@
* By default, Ccnx face are created in the "down" state. Before
* becoming useable, the user must invoke SetUp on the face
*/
-CcnxNetDeviceFace::CcnxNetDeviceFace (const Ptr<NetDevice> &netDevice)
+CcnxNetDeviceFace::CcnxNetDeviceFace (Ptr<Node> node, const Ptr<NetDevice> &netDevice)
+ : CcnxFace (node)
+ , m_netDevice (netDevice)
{
- NS_LOG_FUNCTION (this);
+ NS_LOG_FUNCTION (this << netDevice);
- m_netDevice = netDevice;
+ NS_ASSERT_MSG (m_netDevice != 0, "CcnxNetDeviceFace needs to be assigned a valid NetDevice");
}
CcnxNetDeviceFace::~CcnxNetDeviceFace ()
@@ -66,11 +68,10 @@
void
CcnxNetDeviceFace::RegisterProtocolHandler (ProtocolHandler handler)
{
- NS_LOG_FUNCTION(this);
- NS_ASSERT_MSG (m_netDevice != 0, "CcnxNetDeviceFace needs to be assigned NetDevice first");
-
- m_protocolHandler = handler;
+ NS_LOG_FUNCTION (this << handler);
+ CcnxFace::RegisterProtocolHandler (handler);
+
m_node->RegisterProtocolHandler (MakeCallback (&CcnxNetDeviceFace::ReceiveFromNetDevice, this),
CcnxL3Protocol::ETHERNET_FRAME_TYPE, m_netDevice, true/*promiscuous mode*/);
}
@@ -78,17 +79,13 @@
void
CcnxNetDeviceFace::Send (Ptr<Packet> packet)
{
+ NS_LOG_FUNCTION (this << packet);
+
NS_ASSERT_MSG (packet->GetSize () <= m_netDevice->GetMtu (),
"Packet size " << packet->GetSize () << " exceeds device MTU "
<< m_netDevice->GetMtu ()
<< " for Ccnx; fragmentation not supported");
- NS_LOG_FUNCTION (*packet);
- if (!IsUp ())
- {
- return;
- }
-
m_netDevice->Send (packet, m_netDevice->GetBroadcast (),
CcnxL3Protocol::ETHERNET_FRAME_TYPE);
}
@@ -102,7 +99,7 @@
const Address &to,
NetDevice::PacketType packetType)
{
- m_protocolHandler (Ptr<CcnxFace>(this), p);
+ Receive (p);
}