[ndnSIM] lp, face: Adding HopCount as an lp packet tag and properly decoding lp::HopCountTagField into tag
Change-Id: I2c25bcf29f3928049d1040a3e421e1c7151b3ba2
diff --git a/src/lp/fields.hpp b/src/lp/fields.hpp
index 5612b16..db73cef 100644
--- a/src/lp/fields.hpp
+++ b/src/lp/fields.hpp
@@ -84,6 +84,11 @@
tlv::TxSequence> TxSequenceField;
BOOST_CONCEPT_ASSERT((Field<TxSequenceField>));
+typedef FieldDecl<field_location_tags::Header,
+ uint64_t,
+ tlv::HopCountTag> HopCountTagField;
+BOOST_CONCEPT_ASSERT((Field<HopCountTagField>));
+
/**
* The value of the wire encoded field is the data between the provided iterators. During
* encoding, the data is copied from the Buffer into the wire buffer.
@@ -107,7 +112,8 @@
IncomingFaceIdField,
CongestionMarkField,
AckField,
- TxSequenceField
+ TxSequenceField,
+ HopCountTagField
> FieldSet;
} // namespace lp
diff --git a/src/lp/tags.hpp b/src/lp/tags.hpp
index 4bcadae..9a7d21f 100644
--- a/src/lp/tags.hpp
+++ b/src/lp/tags.hpp
@@ -56,6 +56,13 @@
*/
typedef SimpleTag<uint64_t, 13> CongestionMarkTag;
+/** \class HopCountTag
+ * \brief a packet tag for HopCount field
+ *
+ * This tag can be attached to Interest, Data, Nack.
+ */
+typedef SimpleTag<uint64_t, 0x60000000> HopCountTag;
+
} // namespace lp
} // namespace ndn
diff --git a/src/lp/tlv.hpp b/src/lp/tlv.hpp
index 5ab1a92..e661217 100644
--- a/src/lp/tlv.hpp
+++ b/src/lp/tlv.hpp
@@ -35,6 +35,7 @@
Sequence = 81,
FragIndex = 82,
FragCount = 83,
+ HopCountTag = 84,
Nack = 800,
NackReason = 801,
NextHopFaceId = 816,