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/best-route.cc b/model/fw/best-route.cc
index 84e74fe..a034e1e 100644
--- a/model/fw/best-route.cc
+++ b/model/fw/best-route.cc
@@ -46,7 +46,7 @@
{
static TypeId tid = TypeId ("ns3::ndn::fw::BestRoute")
.SetGroupName ("Ndn")
- .SetParent <GreenYellowRed> ()
+ .SetParent <super> ()
.AddConstructor <BestRoute> ()
;
return tid;
@@ -57,16 +57,16 @@
}
bool
-BestRoute::DoPropagateInterest (const Ptr<Face> &incomingFace,
- Ptr<InterestHeader> header,
- const Ptr<const Packet> &packet,
+BestRoute::DoPropagateInterest (Ptr<Face> incomingFace,
+ Ptr<const InterestHeader> header,
+ Ptr<const Packet> origPacket,
Ptr<pit::Entry> pitEntry)
{
NS_LOG_FUNCTION (this);
// Try to work out with just green faces
- bool greenOk = super::DoPropagateInterest (incomingFace, header, packet, pitEntry);
+ bool greenOk = super::DoPropagateInterest (incomingFace, header, origPacket, pitEntry);
if (greenOk)
return true;
@@ -88,10 +88,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++;
break; // do only once