model: Another set of refactoring/renaming to make code compile (not tested yet)
Refs #1005 (http://redmine.named-data.net/)
diff --git a/model/ndn-interest.cc b/model/ndn-interest.cc
index 195c4f9..bd8784e 100644
--- a/model/ndn-interest.cc
+++ b/model/ndn-interest.cc
@@ -29,27 +29,25 @@
namespace ns3 {
namespace ndn {
-NS_OBJECT_ENSURE_REGISTERED (Interest);
-
-Interest::Interest ()
+Interest::Interest (Ptr<Packet> payload/* = Create<Packet> ()*/)
: m_name ()
, m_scope (0xFF)
, m_interestLifetime (Seconds (0))
, m_nonce (0)
, m_nackType (NORMAL_INTEREST)
- , m_payload (0)
+ , m_payload (payload)
, m_wire (0)
{
}
Interest::Interest (const Interest &interest)
- : m_name (Create<Name> (interest.GetName ()))
- , m_scope (interest.m_scope)
- , m_interestLifetime (interest.m_interestLifetime)
- , m_nonce (interest.m_nonce)
- , m_nackType (interest.m_nackType)
- , m_payload (interest.GetPayload ()->Copy ())
- , m_wire (0)
+ : m_name (Create<Name> (interest.GetName ()))
+ , m_scope (interest.m_scope)
+ , m_interestLifetime (interest.m_interestLifetime)
+ , m_nonce (interest.m_nonce)
+ , m_nackType (interest.m_nackType)
+ , m_payload (interest.GetPayload ()->Copy ())
+ , m_wire (0)
{
}
@@ -138,7 +136,7 @@
m_payload = payload;
}
-Ptr<const Payload>
+Ptr<const Packet>
Interest::GetPayload () const
{
return m_payload;