From 56f79d69070e58fa7cfe44bfcf5c9ba7260f7dfb Mon Sep 17 00:00:00 2001
From: Davide Pesavento <davidepesa@gmail.com>
Date: Sat, 26 Jan 2019 17:30:32 -0500
Subject: [PATCH] client: CanBePrefix support

Change-Id: I7a05a4af0a3d40d70fcb056f9dc94d0a5064da40
---
 ndn-traffic-client.conf.sample |  1 +
 src/ndn-traffic-client.cpp     | 55 ++++++++++++++++++++++------------
 2 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/ndn-traffic-client.conf.sample b/ndn-traffic-client.conf.sample
index 1695ec7..821528d 100644
--- a/ndn-traffic-client.conf.sample
+++ b/ndn-traffic-client.conf.sample
@@ -22,6 +22,7 @@
 # (Optional)
 #NameAppendBytes=NNI [>0]
 #NameAppendSequenceNumber=NNI [>=0]
+#CanBePrefix=Boolean
 #MustBeFresh=Boolean
 #NonceDuplicationPercentage=NNI [0-100]
 #InterestLifetime=Milliseconds [>=0]
diff --git a/src/ndn-traffic-client.cpp b/src/ndn-traffic-client.cpp
index 005b8d4..21b1750 100644
--- a/src/ndn-traffic-client.cpp
+++ b/src/ndn-traffic-client.cpp
@@ -27,6 +27,7 @@
 #include <ndn-cxx/util/random.hpp>
 
 #include <limits>
+#include <sstream>
 #include <vector>
 
 #include <boost/asio/deadline_timer.hpp>
@@ -124,27 +125,38 @@ private:
     void
     printTrafficConfiguration(Logger& logger) const
     {
-      std::string detail;
+      std::ostringstream os;
 
-      detail += "TrafficPercentage=" + to_string(m_trafficPercentage) + ", ";
-      detail += "Name=" + m_name + ", ";
-      if (m_nameAppendBytes)
-        detail += "NameAppendBytes=" + to_string(*m_nameAppendBytes) + ", ";
-      if (m_nameAppendSeqNum)
-        detail += "NameAppendSequenceNumber=" + to_string(*m_nameAppendSeqNum) + ", ";
-      detail += "MustBeFresh=" + to_string(m_mustBeFresh) + ", ";
-      if (m_nonceDuplicationPercentage > 0)
-        detail += "NonceDuplicationPercentage=" + to_string(m_nonceDuplicationPercentage) + ", ";
-      if (m_interestLifetime >= 0_ms)
-        detail += "InterestLifetime=" + to_string(m_interestLifetime.count()) + ", ";
-      if (m_nextHopFaceId > 0)
-        detail += "NextHopFaceId=" + to_string(m_nextHopFaceId) + ", ";
-      if (m_expectedContent)
-        detail += "ExpectedContent=" + *m_expectedContent + ", ";
-      if (detail.length() >= 2)
-        detail = detail.substr(0, detail.length() - 2); // Removing suffix ", "
+      os << "TrafficPercentage=" << m_trafficPercentage << ", ";
+      os << "Name=" << m_name << ", ";
+      if (m_nameAppendBytes) {
+        os << "NameAppendBytes=" << *m_nameAppendBytes << ", ";
+      }
+      if (m_nameAppendSeqNum) {
+        os << "NameAppendSequenceNumber=" << *m_nameAppendSeqNum << ", ";
+      }
+      if (m_canBePrefix) {
+        os << "CanBePrefix=" << m_canBePrefix << ", ";
+      }
+      if (m_mustBeFresh) {
+        os << "MustBeFresh=" << m_mustBeFresh << ", ";
+      }
+      if (m_nonceDuplicationPercentage > 0) {
+        os << "NonceDuplicationPercentage=" << m_nonceDuplicationPercentage << ", ";
+      }
+      if (m_interestLifetime >= 0_ms) {
+        os << "InterestLifetime=" << m_interestLifetime.count() << ", ";
+      }
+      if (m_nextHopFaceId > 0) {
+        os << "NextHopFaceId=" << m_nextHopFaceId << ", ";
+      }
+      if (m_expectedContent) {
+        os << "ExpectedContent=" << *m_expectedContent << ", ";
+      }
 
-      logger.log(detail, false, false);
+      auto str = os.str();
+      str = str.substr(0, str.length() - 2); // remove suffix ", "
+      logger.log(str, false, false);
     }
 
     bool
@@ -169,6 +181,9 @@ private:
       else if (parameter == "NameAppendSequenceNumber") {
         m_nameAppendSeqNum = std::stoull(value);
       }
+      else if (parameter == "CanBePrefix") {
+        m_canBePrefix = parseBoolean(value);
+      }
       else if (parameter == "MustBeFresh") {
         m_mustBeFresh = parseBoolean(value);
       }
@@ -202,6 +217,7 @@ private:
     std::string m_name;
     optional<std::size_t> m_nameAppendBytes;
     optional<uint64_t> m_nameAppendSeqNum;
+    bool m_canBePrefix = false;
     bool m_mustBeFresh = false;
     uint8_t m_nonceDuplicationPercentage = 0;
     time::milliseconds m_interestLifetime = -1_ms;
@@ -345,6 +361,7 @@ private:
     }
     interest.setName(name);
 
+    interest.setCanBePrefix(pattern.m_canBePrefix);
     interest.setMustBeFresh(pattern.m_mustBeFresh);
 
     static std::uniform_int_distribution<> duplicateNonceDist(1, 100);