Checkpoint. Some changes in forwarding strategy API
Removing WillSendOutInterest and adding TrySendOutInterests, which
should be fully defined in child classes (or fully used from parent, but
not combined).
diff --git a/model/fw/green-yellow-red.cc b/model/fw/green-yellow-red.cc
index f13b29b..6611c13 100644
--- a/model/fw/green-yellow-red.cc
+++ b/model/fw/green-yellow-red.cc
@@ -79,19 +79,10 @@
metricFace.m_status == fib::FaceMetric::NDN_FIB_YELLOW)
break; //propagate only to green faces
- if (pitEntry->GetIncoming ().find (metricFace.m_face) != pitEntry->GetIncoming ().end ())
- continue; // don't forward to face that we received interest from
-
- if (!WillSendOutInterest (metricFace.m_face, header, pitEntry))
+ if (!TrySendOutInterest (inFace, metricFace.m_face, header, origPacket, pitEntry))
{
continue;
}
-
- //transmission
- Ptr<Packet> packetToSend = origPacket->Copy ();
- metricFace.m_face->Send (packetToSend);
-
- DidSendOutInterest (metricFace.m_face, header, origPacket, pitEntry);
propagatedCount++;
break; // propagate only one interest