commit 73df9f587e1c16c4f67a0053fe29b68f523ff138
author Spyridon Mastorakis <spiros.mastorakis@gmail.com> Wed Dec 07 14:34:13 2016 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Dec 09 00:18:53 2016 -0500
tree ebc70a772c9a56ddc8f2fccc4d675732e9358b3d
parent 8a74d0c6f2029e0a0d169e46d1d201243f138be6

apps: Change to new HopCount tag that is carried in NDNLPv2 header between nodes

Change-Id: I3d16bcf29f4858049d1040a3e422e1a7131b3ba2
Refs: #3881

apps/ndn-consumer-zipf-mandelbrot.cpp

diff --git a/apps/ndn-consumer-zipf-mandelbrot.cpp b/apps/ndn-consumer-zipf-mandelbrot.cpp
index c6358c0..8fd1591 100644
--- a/apps/ndn-consumer-zipf-mandelbrot.cpp
+++ b/apps/ndn-consumer-zipf-mandelbrot.cpp
@@ -21,8 +21,6 @@
 
 #include "ndn-consumer-zipf-mandelbrot.hpp"
 
-#include "utils/ndn-fw-hop-count-tag.hpp"
-
 #include <math.h>
 
 NS_LOG_COMPONENT_DEFINE("ndn.ConsumerZipfMandelbrot");

apps/ndn-consumer.cpp

diff --git a/apps/ndn-consumer.cpp b/apps/ndn-consumer.cpp
index 3ed9355..a174fb3 100644
--- a/apps/ndn-consumer.cpp
+++ b/apps/ndn-consumer.cpp
@@ -32,6 +32,8 @@
 #include "utils/ndn-ns3-packet-tag.hpp"
 #include "utils/ndn-rtt-mean-deviation.hpp"
 
+#include <ndn-cxx/lp/tags.hpp>
+
 #include <boost/lexical_cast.hpp>
 #include <boost/ref.hpp>
 
@@ -223,14 +225,11 @@
   NS_LOG_INFO("< DATA for " << seq);
 
   int hopCount = 0;
-  auto ns3PacketTag = data->getTag<Ns3PacketTag>();
-  if (ns3PacketTag != nullptr) { // e.g., packet came from local node's cache
-    FwHopCountTag hopCountTag;
-    if (ns3PacketTag->getPacket()->PeekPacketTag(hopCountTag)) {
-      hopCount = hopCountTag.Get();
-      NS_LOG_DEBUG("Hop count: " << hopCount);
-    }
+  auto hopCountTag = data->getTag<lp::HopCountTag>();
+  if (hopCountTag != nullptr) { // e.g., packet came from local node's cache
+    hopCount = *hopCountTag;
   }
+  NS_LOG_DEBUG("Hop count: " << hopCount);
 
   SeqTimeoutsContainer::iterator entry = m_seqLastDelay.find(seq);
   if (entry != m_seqLastDelay.end()) {

apps/ndn-consumer.hpp

diff --git a/apps/ndn-consumer.hpp b/apps/ndn-consumer.hpp
index 872c46a..829c6ed 100644
--- a/apps/ndn-consumer.hpp
+++ b/apps/ndn-consumer.hpp
@@ -30,7 +30,6 @@
 
 #include "ns3/ndnSIM/model/ndn-common.hpp"
 #include "ns3/ndnSIM/utils/ndn-rtt-estimator.hpp"
-#include "ns3/ndnSIM/utils/ndn-fw-hop-count-tag.hpp"
 
 #include <set>
 #include <map>