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/smart-flooding.cc b/model/fw/smart-flooding.cc
index 4ca0fd1..e74b612 100644
--- a/model/fw/smart-flooding.cc
+++ b/model/fw/smart-flooding.cc
@@ -79,22 +79,10 @@
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 == inFace)
- {
- NS_LOG_DEBUG ("continue (same as incoming)");
- continue; // same face as incoming, don't forward
- }
-
- 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++;
}