commit 61c43a6f842dcf477a4c5b44d46b8a8acb6ff0e6
author Zhiyi Zhang <zhiyi@cs.ucla.edu> Mon Sep 28 12:56:01 2020 -0700
committer Zhiyi Zhang <zhiyi@cs.ucla.edu> Mon Sep 28 12:56:01 2020 -0700
tree 4ec780d82292bf2872bb3a62a83d9c84db539477
parent 48f2378f1f47ea0128d65fd05f8e3bd641831cec

prepare for using TLV in probe

Change-Id: I40dbf460909a20610b4e99be4701c58f80b1bc46

src/protocol-detail/probe.cpp

diff --git a/src/protocol-detail/probe.cpp b/src/protocol-detail/probe.cpp
index f8a561d..2a3a71e 100644
--- a/src/protocol-detail/probe.cpp
+++ b/src/protocol-detail/probe.cpp
@@ -19,10 +19,12 @@
  */
 
 #include "probe.hpp"
-#include "boost/throw_exception.hpp"
-#include "../logging.hpp"
+
+#include <boost/throw_exception.hpp>
 #include <ndn-cxx/encoding/tlv.hpp>
 
+#include "../logging.hpp"
+
 namespace ndn {
 namespace ndncert {
 
@@ -48,19 +50,18 @@
   auto content = makeEmptyBlock(tlv::ApplicationParameters);
 
   std::vector<std::string> fields = parseProbeComponents(ca.m_probe);
-  std::vector<std::string> arguments  = parseProbeComponents(probeInfo);;
+  std::vector<std::string> arguments = parseProbeComponents(probeInfo);
+  ;
 
   if (arguments.size() != fields.size()) {
-    BOOST_THROW_EXCEPTION(Error("Error in genProbeRequestJson: argument list does not match field list in the config file."));
+    BOOST_THROW_EXCEPTION(std::runtime_error("Error in genProbeRequestJson: argument list does not match field list in the config file."));
   }
 
   for (size_t i = 0; i < fields.size(); ++i) {
-      content.push_back(
-        makeStringBlock(tlv_parameter_key, fields.at(i))
-      );
-      content.push_back(
-        makeStringBlock(tlv_parameter_value, arguments.at(i))
-      );
+    content.push_back(
+        makeStringBlock(tlv_parameter_key, fields.at(i)));
+    content.push_back(
+        makeStringBlock(tlv_parameter_value, arguments.at(i)));
   }
   content.encode();
   return content;
@@ -81,7 +82,7 @@
   fields.push_back(m_probe.substr(last));
 
   Block content = makeEmptyBlock(tlv::Content);
-  
+
   // TODO: Currently have no mechanism to utilize the given params to determine name
   //for (size_t i = 0; i < fields.size(); ++i) {
   //  root.put(fields.at(i), parameterJson.get(fields.at(i), ""));