face: use IncomingFaceId, NextHopFaceId, CachePolicy tags
This commit replaces all LocalControlHeader usages with these tags,
and deletes LocalFace.
This commit also does minor improvements in RIB test suites.
refs #3339
Change-Id: I14cbfc296a6723a5860bf8bd95d9804d3bac3da5
diff --git a/daemon/face/generic-link-service.hpp b/daemon/face/generic-link-service.hpp
index d7cc22f..8afc693 100644
--- a/daemon/face/generic-link-service.hpp
+++ b/daemon/face/generic-link-service.hpp
@@ -130,33 +130,28 @@
getCounters() const DECL_OVERRIDE;
private: // send path
- /** \brief sends Interest
+ /** \brief send Interest
*/
void
doSendInterest(const Interest& interest) DECL_OVERRIDE;
- /** \brief sends Data
+ /** \brief send Data
*/
void
doSendData(const Data& data) DECL_OVERRIDE;
- /** \brief sends Nack
- * This class does not send out a Nack.
+ /** \brief send Nack
*/
void
doSendNack(const ndn::lp::Nack& nack) DECL_OVERRIDE;
- /** \brief encode IncomingFaceId into LpPacket and verify local fields
+ /** \brief encode local fields from tags onto outgoing LpPacket
+ * \param pkt LpPacket containing a complete network layer packet
*/
- static bool
- encodeLocalFields(const Interest& interest, lp::Packet& lpPacket);
+ static void
+ encodeLocalFields(const ndn::TagHost& netPkt, lp::Packet& lpPacket);
- /** \brief encode CachingPolicy and IncomingFaceId into LpPacket and verify local fields
- */
- static bool
- encodeLocalFields(const Data& data, lp::Packet& lpPacket);
-
- /** \brief encode and send a complete network layer packet
+ /** \brief send a complete network layer packet
* \param pkt LpPacket containing a complete network layer packet
*/
void