commit 0620cfb3c3b99f024c7716db186cdde553357dab
author Spyridon Mastorakis <spiros.mastorakis@gmail.com> Tue Dec 06 16:32:19 2016 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Dec 06 18:26:49 2016 -0800
tree 276da7b1b83df4b92abb20bfa3f736f3c1262208
parent d0abae38024a6aecf6f956f4bbea36f4a9ff6d6f

[ndnSIM] daemon: Fixing HopCount calculation when data is retrieved from CS

Change-Id: I3d16bcf29f4858049d101ab3e422e1a7131b3ba2

daemon/fw/forwarder.cpp

diff --git a/daemon/fw/forwarder.cpp b/daemon/fw/forwarder.cpp
index ecdce2e..b35a321 100644
--- a/daemon/fw/forwarder.cpp
+++ b/daemon/fw/forwarder.cpp
@@ -340,11 +340,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);
 
   std::set<Face*> pendingDownstreams;
   // foreach PitEntry