model+test: Fixing tests and making sure all tests pass
Refs #1005 (http://redmine.named-data.net/)
diff --git a/model/fw/ndn-forwarding-strategy.cc b/model/fw/ndn-forwarding-strategy.cc
index df417dd..2275a8c 100644
--- a/model/fw/ndn-forwarding-strategy.cc
+++ b/model/fw/ndn-forwarding-strategy.cc
@@ -145,6 +145,7 @@
ForwardingStrategy::OnInterest (Ptr<Face> inFace,
Ptr<Interest> interest)
{
+ NS_LOG_FUNCTION (inFace << interest->GetName ());
m_inInterests (interest, inFace);
Ptr<pit::Entry> pitEntry = m_pit->Lookup (*interest);
diff --git a/model/ndn-content-object.cc b/model/ndn-content-object.cc
index 7fcb459..582ebc9 100644
--- a/model/ndn-content-object.cc
+++ b/model/ndn-content-object.cc
@@ -51,12 +51,14 @@
ContentObject::SetName (Ptr<Name> name)
{
m_name = name;
+ m_wire = 0;
}
void
ContentObject::SetName (const Name &name)
{
m_name = Create<Name> (name);
+ m_wire = 0;
}
const Name&
@@ -77,6 +79,7 @@
ContentObject::SetTimestamp (const Time ×tamp)
{
m_timestamp = timestamp;
+ m_wire = 0;
}
Time
@@ -89,8 +92,10 @@
ContentObject::SetFreshness (const Time &freshness)
{
m_freshness = freshness;
+ m_wire = 0;
}
+
Time
ContentObject::GetFreshness () const
{
@@ -101,6 +106,7 @@
ContentObject::SetSignature (uint32_t signature)
{
m_signature = signature;
+ m_wire = 0;
}
uint32_t
@@ -120,6 +126,7 @@
ContentObject::SetPayload (Ptr<Packet> payload)
{
m_payload = payload;
+ m_wire = 0;
}
Ptr<const Packet>
diff --git a/model/ndn-interest.cc b/model/ndn-interest.cc
index bd8784e..ffcaa0d 100644
--- a/model/ndn-interest.cc
+++ b/model/ndn-interest.cc
@@ -134,6 +134,7 @@
Interest::SetPayload (Ptr<Packet> payload)
{
m_payload = payload;
+ m_wire = 0;
}
Ptr<const Packet>