commit 0fd71cc4b93485aec33e060a128807971e0e3c8f
author Zhiyi Zhang <zhiyi@cs.ucla.edu> Wed Mar 01 10:18:58 2017 -0800
committer Zhiyi Zhang <zhiyi@cs.ucla.edu> Tue Mar 07 13:58:57 2017 -0800
tree cc6fe1da90697e97ea32d175d8697052c72f43be
parent 00a4a008d4c0ec61d69832a61294010545f3f6bf

Update JSON format: add status field in NEW's response

Change-Id: I7a58a92567c5d503bfca4f5efc3d66d09c20aa28

src/json-helper.cpp

diff --git a/src/json-helper.cpp b/src/json-helper.cpp
index a7cc897..78969fc 100644
--- a/src/json-helper.cpp
+++ b/src/json-helper.cpp
@@ -25,22 +25,24 @@
 namespace ndncert {
 
 const JsonSection
-genResponseProbeJson(const Name& identifier, const Name& CaInformation)
+genResponseProbeJson(const Name& identifier, const Name& caInformation)
 {
   JsonSection root;
 
   root.put(JSON_IDNENTIFIER, identifier.toUri());
-  root.put(JSON_CA_INFO, CaInformation.toUri());
+  root.put(JSON_CA_INFO, caInformation.toUri());
 
   return root;
 }
 
 const JsonSection
-genResponseNewJson(const std::string& requestId, const std::list<std::string>& challenges)
+genResponseNewJson(const std::string& requestId, const std::string& status,
+                   const std::list<std::string>& challenges)
 {
   JsonSection root;
   JsonSection challengesSection;
   root.put(JSON_REQUEST_ID, requestId);
+  root.put(JSON_STATUS, status);
 
   for (const auto& entry : challenges) {
     JsonSection challenge;

src/json-helper.hpp

diff --git a/src/json-helper.hpp b/src/json-helper.hpp
index c34c631..791fc12 100644
--- a/src/json-helper.hpp
+++ b/src/json-helper.hpp
@@ -40,19 +40,20 @@
  *
  * Target JSON format:
  * {
- *   "identifier": "",
- *   "ca-info": ""
+ *   "identifier": "@p identifier",
+ *   "ca-info": "@p caInformation"
  * }
  */
 const JsonSection
-genResponseProbeJson(const Name& identifier, const Name& CaInformation);
+genResponseProbeJson(const Name& identifier, const Name& caInformation);
 
 /**
  * @brief Generate JSON file to response NEW interest
  *
  * Target JSON format:
  * {
- *   "request-id": "",
+ *   "request-id": "@p requestId",
+ *   "status": "@p status",
  *   "challenges": [
  *     {
  *       "challenge-type": ""
@@ -65,7 +66,8 @@
  * }
  */
 const JsonSection
-genResponseNewJson(const std::string& requestId, const std::list<std::string>& challenges);
+genResponseNewJson(const std::string& requestId, const std::string& status,
+                   const std::list<std::string>& challenges);
 
 /**
  * @brief Generate JSON file to response _SELECT, _VALIDATE, and _STATUS interest
@@ -98,8 +100,8 @@
  *
  * Target JSON format:
  * {
- *   "status": "",
- *   "error-info": ""
+ *   "status": "error",
+ *   "error-info": "@p errorInfo"
  * }
  */
 const JsonSection