fw: remove EndpointId from egress APIs
This commit partially reverts c70794810592a90847656a97caf27f0326668240
refs: #4849, #4973
Change-Id: I1063e5de2c0e3c90971c4ae006ce46de386c2ed0
diff --git a/daemon/fw/strategy.hpp b/daemon/fw/strategy.hpp
index 190f1f2..7c93327 100644
--- a/daemon/fw/strategy.hpp
+++ b/daemon/fw/strategy.hpp
@@ -240,7 +240,7 @@
* In the base class this method does nothing.
*/
virtual void
- onDroppedInterest(const FaceEndpoint& egress, const Interest& interest);
+ onDroppedInterest(const Face& egress, const Interest& interest);
/** \brief Trigger after new nexthop is added
*
@@ -251,36 +251,35 @@
afterNewNextHop(const fib::NextHop& nextHop, const shared_ptr<pit::Entry>& pitEntry);
protected: // actions
- /** \brief Send Interest to egress
- * \param pitEntry PIT entry
- * \param egress face through which to send out the Interest and destination endpoint
+ /** \brief Send an Interest packet.
+ * \param pitEntry the PIT entry
+ * \param egress face through which to send out the Interest
* \param interest the Interest packet
*/
VIRTUAL_WITH_TESTS void
- sendInterest(const shared_ptr<pit::Entry>& pitEntry,
- const FaceEndpoint& egress, const Interest& interest);
+ sendInterest(const shared_ptr<pit::Entry>& pitEntry, Face& egress,
+ const Interest& interest);
- /** \brief Send \p data to \p egress
- * \param pitEntry PIT entry
+ /** \brief Send a Data packet.
+ * \param pitEntry the PIT entry
* \param data the Data packet
- * \param egress face through which to send out the Data and destination endpoint
+ * \param egress face through which to send out the Data
*/
VIRTUAL_WITH_TESTS void
- sendData(const shared_ptr<pit::Entry>& pitEntry, const Data& data, const FaceEndpoint& egress);
+ sendData(const shared_ptr<pit::Entry>& pitEntry, const Data& data, Face& egress);
- /** \brief Send \p data to all matched and qualified face-endpoint pairs
+ /** \brief Send a Data packet to all matched and qualified faces.
*
- * A matched face is qualified if it is ad-hoc or it is NOT \p ingress
+ * A matched face is qualified if it is ad-hoc or it is NOT \p inFace.
*
- * \param pitEntry PIT entry
- * \param ingress face through which the Data comes from and endpoint of the sender
+ * \param pitEntry the PIT entry
+ * \param inFace face on which the Data arrived
* \param data the Data packet
*/
VIRTUAL_WITH_TESTS void
- sendDataToAll(const shared_ptr<pit::Entry>& pitEntry,
- const FaceEndpoint& ingress, const Data& data);
+ sendDataToAll(const shared_ptr<pit::Entry>& pitEntry, const Face& inFace, const Data& data);
- /** \brief Schedule the PIT entry for immediate deletion
+ /** \brief Schedule the PIT entry for immediate deletion.
*
* This helper function sets the PIT entry expiry time to zero.
* The strategy should invoke this function when it concludes that the Interest cannot
@@ -292,31 +291,32 @@
this->setExpiryTimer(pitEntry, 0_ms);
}
- /** \brief Send Nack to egress
- * \param pitEntry PIT entry
- * \param egress face through which to send out the Nack and destination endpoint
- * \param header Nack header
+ /** \brief Send a Nack packet.
*
- * The egress must have a PIT in-record, otherwise this method has no effect.
+ * The egress face must have a PIT in-record, otherwise this method has no effect.
+ *
+ * \param pitEntry the PIT entry
+ * \param egress face through which to send out the Nack
+ * \param header the Nack header
*/
VIRTUAL_WITH_TESTS void
- sendNack(const shared_ptr<pit::Entry>& pitEntry,
- const FaceEndpoint& egress, const lp::NackHeader& header)
+ sendNack(const shared_ptr<pit::Entry>& pitEntry, Face& egress,
+ const lp::NackHeader& header)
{
m_forwarder.onOutgoingNack(pitEntry, egress, header);
}
- /** \brief Send Nack to every face-endpoint pair that has an in-record, except those in \p exceptFaceEndpoints
- * \param pitEntry PIT entry
- * \param header NACK header
- * \param exceptFaceEndpoints list of face-endpoint pairs that should be excluded from sending Nacks
- * \note This is not an action, but a helper that invokes the sendNack action.
+ /** \brief Send Nack to every face that has an in-record, except those in \p exceptFaces
+ * \param pitEntry the PIT entry
+ * \param header the Nack header
+ * \param exceptFaces list of faces that should be excluded from sending Nacks
+ * \note This is not an action, but a helper that invokes the sendNack() action.
*/
void
sendNacks(const shared_ptr<pit::Entry>& pitEntry, const lp::NackHeader& header,
- std::initializer_list<FaceEndpoint> exceptFaceEndpoints = {});
+ std::initializer_list<const Face*> exceptFaces = {});
- /** \brief Schedule the PIT entry to be erased after \p duration
+ /** \brief Schedule the PIT entry to be erased after \p duration.
*/
void
setExpiryTimer(const shared_ptr<pit::Entry>& pitEntry, time::milliseconds duration)
@@ -325,7 +325,7 @@
}
protected: // accessors
- /** \brief Performs a FIB lookup, considering Link object if present
+ /** \brief Performs a FIB lookup, considering Link object if present.
*/
const fib::Entry&
lookupFib(const pit::Entry& pitEntry) const;