commit de007bcbea7acb96d16964b27d01a97c592b1961
author swa770 <dsbrianwon@gmail.com> Tue Mar 24 21:26:21 2020 -0700
committer Zhiyi Zhang <zhiyi@cs.ucla.edu> Tue Sep 22 11:40:11 2020 -0700
tree 306c2027d9671b7af3457312a6b90f1651c5e0b3
parent e0b60acdc19af596b6c455175193d1bedb07ba83

Remove _ from _PROBE, _NEW, _CHALLENGE

Change-Id: I5e7d660536ee3f118516f3e18c0e2016808715f2

src/client-module.cpp

diff --git a/src/client-module.cpp b/src/client-module.cpp
index 0daa72c..eff4e90 100644
--- a/src/client-module.cpp
+++ b/src/client-module.cpp
@@ -51,7 +51,7 @@
   Name interestName = caName;
   if (readString(caName.at(-1)) != "CA")
     interestName.append("CA");
-  interestName.append("_PROBE").append("INFO");
+  interestName.append("PROBE").append("INFO");
   auto interest = make_shared<Interest>(interestName);
   interest->setMustBeFresh(true);
   interest->setCanBePrefix(false);
@@ -97,7 +97,7 @@
 ClientModule::generateProbeInterest(const ClientCaItem& ca, const std::string& probeInfo)
 {
   Name interestName = ca.m_caName;
-  interestName.append("CA").append("_PROBE");
+  interestName.append("CA").append("PROBE");
   auto interest = make_shared<Interest>(interestName);
   interest->setMustBeFresh(true);
   interest->setCanBePrefix(false);
@@ -190,7 +190,7 @@
 
   // generate Interest packet
   Name interestName = m_ca.m_caName;
-  interestName.append("CA").append("_NEW");
+  interestName.append("CA").append("NEW");
   auto interest = make_shared<Interest>(interestName);
   interest->setMustBeFresh(true);
   interest->setCanBePrefix(false);
@@ -238,7 +238,7 @@
   m_challengeType = paramJson.get(JSON_CLIENT_SELECTED_CHALLENGE, "");
 
   Name interestName = m_ca.m_caName;
-  interestName.append("CA").append("_CHALLENGE").append(m_requestId);
+  interestName.append("CA").append("CHALLENGE").append(m_requestId);
   auto interest = make_shared<Interest>(interestName);
   interest->setMustBeFresh(true);
   interest->setCanBePrefix(false);
@@ -279,7 +279,7 @@
 ClientModule::generateDownloadInterest()
 {
   Name interestName = m_ca.m_caName;
-  interestName.append("CA").append("_DOWNLOAD").append(m_requestId);
+  interestName.append("CA").append("DOWNLOAD").append(m_requestId);
   auto interest = make_shared<Interest>(interestName);
   interest->setMustBeFresh(true);
   interest->setCanBePrefix(false);