commit 57462cacf2bdc7cd3fbb8263e708a113f8b24659
author Suyong Won <swa770@g.ucla.edu> Tue May 05 22:20:09 2020 -0700
committer Zhiyi Zhang <zhiyi@cs.ucla.edu> Tue Sep 22 11:43:46 2020 -0700
tree d244df2deb72198aed0d089b64a9d9f7ef064ed6
parent b8cb0470454d32ab1b42b2bdb9ad92754a84a5bf

working on TLV encoding

src/client-config.cpp

diff --git a/src/client-config.cpp b/src/client-config.cpp
index 589cd49..9273760 100644
--- a/src/client-config.cpp
+++ b/src/client-config.cpp
@@ -19,6 +19,7 @@
  */
 
 #include "client-config.hpp"
+#include "tlv.hpp"
 
 #include <ndn-cxx/util/io.hpp>
 #include <fstream>
@@ -83,17 +84,21 @@
 }
 
 ClientCaItem
-ClientConfig::extractCaItem(const JsonSection& configSection)
+ClientConfig::extractCaItem(const Block& contentBlock)
 {
   ClientCaItem item;
-  item.m_caName = Name(configSection.get("ca-prefix", ""));
+  item.m_caName = Name(readString(contentBlock.get(CAPrefix)));
   if (item.m_caName.empty()) {
     BOOST_THROW_EXCEPTION(Error("Cannot read ca-prefix from the config file"));
   }
-  item.m_caInfo = configSection.get("ca-info", "");
-  item.m_probe = configSection.get("probe", "");
-  std::istringstream ss(configSection.get("certificate", ""));
-  auto anchor = io::load<security::v2::Certificate>(ss);
+  item.m_caInfo = readString(contentBlock.get(CAInfo));
+  // item.m_probe = configSection.get("probe", "");
+
+  security::v2::Certificate anchor = contentBlock.get(CACertificate);
+
+  //std::istringstream ss(configSection.get("certificate", ""));
+  //auto anchor = io::load<security::v2::Certificate>(ss);
+
   if (anchor == nullptr) {
     BOOST_THROW_EXCEPTION(Error("Cannot load the certificate from config file"));
   }