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.h b/model/ccnx-net-device-face.h
index baf6a48..6307413 100644
--- a/model/ccnx-net-device-face.h
+++ b/model/ccnx-net-device-face.h
@@ -45,12 +45,12 @@
class CcnxNetDeviceFace : public CcnxFace
{
public:
- /**
- * \brief Interface ID
- *
- * \return interface ID
- */
- static TypeId GetTypeId (void);
+ // /**
+ // * \brief Interface ID
+ // *
+ // * \return interface ID
+ // */
+ // static TypeId GetTypeId (void);
/**
* \brief Constructor
@@ -64,10 +64,14 @@
////////////////////////////////////////////////////////////////////
// methods overloaded from CcnxFace
- virtual void RegisterProtocolHandler (ProtocolHandler handler);
+ virtual void
+ RegisterProtocolHandler (ProtocolHandler handler);
- virtual void Send (Ptr<Packet> p);
+ virtual void
+ Send (Ptr<Packet> p);
+ virtual std::ostream&
+ Print (std::ostream &os) const;
////////////////////////////////////////////////////////////////////
/**
@@ -76,9 +80,6 @@
* \returns smart pointer to NetDevice associated with the face
*/
Ptr<NetDevice> GetNetDevice () const;
-
-protected:
- virtual void DoDispose ();
private:
CcnxNetDeviceFace (const CcnxNetDeviceFace &); ///< \brief Disabled copy constructor
@@ -96,8 +97,6 @@
Ptr<NetDevice> m_netDevice; ///< \brief Smart pointer to NetDevice
};
-std::ostream& operator<< (std::ostream& os, const CcnxNetDeviceFace &face);
-
} // namespace ns3
#endif //CCNX_NET_DEVICE_FACE_H