commit 20643ac27cf8e3ba91d383cff3ce8f180eef4cbf
author swa770 <dsbrianwon@gmail.com> Thu Mar 26 02:24:45 2020 -0700
committer Zhiyi Zhang <zhiyi@cs.ucla.edu> Tue Sep 22 11:42:15 2020 -0700
tree 7af673dd74662473bd348b2a521b6d4bb058c6ca
parent de007bcbea7acb96d16964b27d01a97c592b1961

Separate INFO out of PROBE phase

Change-Id: I8c0cae1018b2a09f19e529bcb925c11237e32027

src/client-module.cpp

diff --git a/src/client-module.cpp b/src/client-module.cpp
index eff4e90..8e3bd17 100644
--- a/src/client-module.cpp
+++ b/src/client-module.cpp
@@ -46,12 +46,12 @@
 }
 
 shared_ptr<Interest>
-ClientModule::generateProbeInfoInterest(const Name& caName)
+ClientModule::generateInfoInterest(const Name& caName)
 {
   Name interestName = caName;
   if (readString(caName.at(-1)) != "CA")
     interestName.append("CA");
-  interestName.append("PROBE").append("INFO");
+  interestName.append("INFO");
   auto interest = make_shared<Interest>(interestName);
   interest->setMustBeFresh(true);
   interest->setCanBePrefix(false);
@@ -362,7 +362,7 @@
   return components;
 }
 
-const JsonSection
+JsonSection
 ClientModule::genProbeRequestJson(const ClientCaItem& ca, const std::string& probeInfo)
 {
   JsonSection root;
@@ -378,7 +378,7 @@
   return root;
 }
 
-const JsonSection
+JsonSection
 ClientModule::genNewRequestJson(const std::string& ecdhPub, const security::v2::Certificate& certRequest,
                                 const shared_ptr<Data>& probeToken)
 {