Correcting bugs with cleaning timeouts in PIT/RIT/ContentStore
Removing RIT concept. Instead, keep track of nonces for each PIT entry.
Many changes in CcnxL3Protocol regarding Interest/Data handling (NACK
are not yet handled at all)
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!!!!! Remove when is not actual !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!! Code is not compiling !!!!!!!!!!!!!!!!!!!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/model/ccnx-face.cc b/model/ccnx-face.cc
index 7821055..19eb21d 100644
--- a/model/ccnx-face.cc
+++ b/model/ccnx-face.cc
@@ -29,18 +29,6 @@
namespace ns3 {
-// NS_OBJECT_ENSURE_REGISTERED (CcnxFace);
-
-// TypeId
-// CcnxFace::GetTypeId (void)
-// {
-// static TypeId tid = TypeId ("ns3::CcnxFace")
-// .SetGroupName ("Ccnx")
-// .SetParent<Object> ()
-// ;
-// return tid;
-// }
-
/**
* By default, Ccnx face are created in the "down" state
* with no IP addresses. Before becoming useable, the user must
@@ -69,15 +57,6 @@
return *this;
}
-
-// void
-// CcnxFace::DoDispose (void)
-// {
-// NS_LOG_FUNCTION_NOARGS ();
-// m_node = 0;
-// Object::DoDispose ();
-// }
-
void
CcnxFace::SetNode (Ptr<Node> node)
{
@@ -132,15 +111,10 @@
}
bool
-CcnxFace::IsLocal() const
-{
- return m_isLocal;
-}
-
-bool
CcnxFace::operator== (const CcnxFace &face) const
{
- NS_ASSERT_MSG (m_node->GetId () == face.m_node->GetId (), "Faces of different nodes should not be compared to each other");
+ NS_ASSERT_MSG (m_node->GetId () == face.m_node->GetId (),
+ "Faces of different nodes should not be compared to each other");
return (m_id == face.m_id);
}
@@ -148,7 +122,8 @@
bool
CcnxFace::operator< (const CcnxFace &face) const
{
- NS_ASSERT_MSG (m_node->GetId () == face.m_node->GetId (), "Faces of different nodes should not be compared to each other");
+ NS_ASSERT_MSG (m_node->GetId () == face.m_node->GetId (),
+ "Faces of different nodes should not be compared to each other");
return (m_id < face.m_id);
}