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.h b/model/ccnx-net-device-face.h
index e6fbc12..482d5d3 100644
--- a/model/ccnx-net-device-face.h
+++ b/model/ccnx-net-device-face.h
@@ -45,31 +45,26 @@
class CcnxNetDeviceFace : public CcnxFace
{
public:
- // /**
- // * \brief Interface ID
- // *
- // * \return interface ID
- // */
- // static TypeId GetTypeId (void);
-
/**
* \brief Constructor
*
* \param netDevice a smart pointer to NetDevice object to which
* this face will be associate
*/
- CcnxNetDeviceFace (const Ptr<NetDevice> &netDevice);
+ CcnxNetDeviceFace (Ptr<Node> node, const Ptr<NetDevice> &netDevice);
virtual ~CcnxNetDeviceFace();
////////////////////////////////////////////////////////////////////
// methods overloaded from CcnxFace
-
virtual void
RegisterProtocolHandler (ProtocolHandler handler);
+protected:
+ // also from CcnxFace
virtual void
- Send (Ptr<Packet> p);
-
+ SendImpl (Ptr<Packet> p);
+
+public:
virtual std::ostream&
Print (std::ostream &os) const;
////////////////////////////////////////////////////////////////////