One more big change: prototypes of most of the forwarding strategy functions has been changed
InterestHeader now constant everywhere and only smart pointer is used, instead of passing some parameters by
reference to the smart pointer (doesn't really make sense).
Another big change that is not fully visible for now: PIT entry now
stores the whole pointer to InterestHeader, which can be used with
delayed Interest processing procedures (previously, only Name was
stored, which is really a big simplification of PIT).
diff --git a/model/fw/flooding.cc b/model/fw/flooding.cc
index be969be..8c43c52 100644
--- a/model/fw/flooding.cc
+++ b/model/fw/flooding.cc
@@ -59,9 +59,9 @@
}
bool
-Flooding::DoPropagateInterest (const Ptr<Face> &incomingFace,
- Ptr<InterestHeader> header,
- const Ptr<const Packet> &packet,
+Flooding::DoPropagateInterest (Ptr<Face> inFace,
+ Ptr<const InterestHeader> header,
+ Ptr<const Packet> origPacket,
Ptr<pit::Entry> pitEntry)
{
NS_LOG_FUNCTION (this);
@@ -74,7 +74,7 @@
if (metricFace.m_status == fib::FaceMetric::NDN_FIB_RED) // all non-read faces are in the front of the list
break;
- if (metricFace.m_face == incomingFace)
+ if (metricFace.m_face == inFace)
{
NS_LOG_DEBUG ("continue (same as incoming)");
continue; // same face as incoming, don't forward
@@ -86,10 +86,10 @@
}
//transmission
- Ptr<Packet> packetToSend = packet->Copy ();
+ Ptr<Packet> packetToSend = origPacket->Copy ();
metricFace.m_face->Send (packetToSend);
- DidSendOutInterest (metricFace.m_face, header, packet, pitEntry);
+ DidSendOutInterest (metricFace.m_face, header, origPacket, pitEntry);
propagatedCount++;
}