add name field and print at classification

glasgow-ipl · Aug 2, 2024 · 0a5040e · 0a5040e
1 parent 8c43b3c
commit 0a5040e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/daemon/face/generic-link-service.cpp b/daemon/face/generic-link-service.cpp
@@ -110,6 +110,7 @@ GenericLinkService::sendLpPacket(lp::Packet&& pkt)
     return;
   }
   block.set_fbField(pkt.get_fbField());
+  block.set_name(pkt.get_name());
   this->sendPacket(block);
 }
 
@@ -121,6 +122,8 @@ GenericLinkService::doSendInterest(const Interest& interest)
   encodeLpFields(interest, lpPacket);
   uint16_t fbField = interest.getFbField();
   lpPacket.set_fbField(fbField);
+  std::string name = interest.getName().toUri();
+  lpPacket.set_name(name);
   this->sendNetPacket(std::move(lpPacket), true);
 }
 
@@ -130,7 +133,10 @@ GenericLinkService::doSendData(const Data& data)
   lp::Packet lpPacket(data.wireEncode());
 
   encodeLpFields(data, lpPacket);
-
+  uint16_t fbField = data.getFbField();
+  lpPacket.set_fbField(fbField);
+  std::string name = data.getName().toUri();
+  lpPacket.set_name(name);
   this->sendNetPacket(std::move(lpPacket), false);
 }
 

diff --git a/daemon/fw/forwarder.cpp b/daemon/fw/forwarder.cpp
@@ -439,8 +439,9 @@ Forwarder::onOutgoingData(const Data& data, Face& egress)
   }
 
   // TODO traffic manager
-   m_qos.markPacket( (ndn::PacketBase&) data, data.getName());
-
+  NFD_LOG_DEBUG("marking data Packet");
+  m_qos.markPacket( (ndn::PacketBase&) data, data.getName());
+  std::cout << "onOutGoingData mark:" + std::to_string(data.getFbField()) << ",Data:"+ data.getName().toUri() << std::endl;
   // send Data
   egress.sendData(data);
   ++m_counters.nOutData;