[ndnSIM] daemon: HopCount handling as a tag of an lp Packet

Change-Id: I2c25bcf29f4858049d1040a3e421e1c7151b3ba2
diff --git a/daemon/fw/forwarder.cpp b/daemon/fw/forwarder.cpp
index f77a098..0f1c0d4 100644
--- a/daemon/fw/forwarder.cpp
+++ b/daemon/fw/forwarder.cpp
@@ -299,11 +299,14 @@
     return;
   }
 
+  shared_ptr<Data> dataCopyWithoutTag = make_shared<Data>(data);
+  dataCopyWithoutTag->removeTag<lp::HopCountTag>();
+
   // CS insert
   if (m_csFromNdnSim == nullptr)
-    m_cs.insert(data);
+    m_cs.insert(*dataCopyWithoutTag);
   else
-    m_csFromNdnSim->Add(data.shared_from_this());
+    m_csFromNdnSim->Add(dataCopyWithoutTag);
 
   // when only one PIT entry is matched, trigger strategy: after receive Data
   if (pitMatches.size() == 1) {