commit 44c6a35bf38b10d441409fccaa1a31352557b8eb
author Zhiyi Zhang <zhiyi@cs.ucla.edu> Mon Dec 14 10:57:17 2020 -0800
committer Zhiyi Zhang <zhiyi@cs.ucla.edu> Mon Dec 14 10:57:17 2020 -0800
tree 5277058eb068faac23b8aadeebb6b6209a56ec52
parent 2de4ea3dc75071a48c395af0a97d780c177bf1bf

remove m_ prefix

Change-Id: I67aa409174fcd3f8df477be8aa4efb8ca96cf012

src/requester.cpp

diff --git a/src/requester.cpp b/src/requester.cpp
index ca75708..0f237eb 100644
--- a/src/requester.cpp
+++ b/src/requester.cpp
@@ -67,7 +67,7 @@
 Requester::onCaProfileResponse(const Data& reply)
 {
   auto caItem = infotlv::decodeDataContent(reply.getContent());
-  if (!security::verifySignature(reply, *caItem.m_cert)) {
+  if (!security::verifySignature(reply, *caItem.cert)) {
     NDN_LOG_ERROR("Cannot verify replied Data packet signature.");
     NDN_THROW(std::runtime_error("Cannot verify replied Data packet signature."));
   }
@@ -78,9 +78,9 @@
 Requester::onCaProfileResponseAfterRedirection(const Data& reply, const Name& caCertFullName)
 {
   auto caItem = infotlv::decodeDataContent(reply.getContent());
-  auto certBlock = caItem.m_cert->wireEncode();
-  caItem.m_cert = std::make_shared<security::Certificate>(certBlock);
-  if (caItem.m_cert->getFullName() != caCertFullName) {
+  auto certBlock = caItem.cert->wireEncode();
+  caItem.cert = std::make_shared<security::Certificate>(certBlock);
+  if (caItem.cert->getFullName() != caCertFullName) {
     NDN_LOG_ERROR("Ca profile does not match the certificate information offered by the original CA.");
     NDN_THROW(std::runtime_error("Cannot verify replied Data packet signature."));
   }
@@ -90,7 +90,7 @@
 shared_ptr<Interest>
 Requester::genProbeInterest(const CaProfile& ca, std::multimap<std::string, std::string>&& probeInfo)
 {
-  Name interestName = ca.m_caPrefix;
+  Name interestName = ca.caPrefix;
   interestName.append("CA").append("PROBE");
   auto interest =std::make_shared<Interest>(interestName);
   interest->setMustBeFresh(true);
@@ -103,7 +103,7 @@
 Requester::onProbeResponse(const Data& reply, const CaProfile& ca,
                            std::vector<std::pair<Name, int>>& identityNames, std::vector<Name>& otherCas)
 {
-  if (!security::verifySignature(reply, *ca.m_cert)) {
+  if (!security::verifySignature(reply, *ca.cert)) {
     NDN_LOG_ERROR("Cannot verify replied Data packet signature.");
     NDN_THROW(std::runtime_error("Cannot verify replied Data packet signature."));
     return;
@@ -117,12 +117,12 @@
                           const time::system_clock::TimePoint& notBefore,
                           const time::system_clock::TimePoint& notAfter)
 {
-  if (!state.caProfile.m_caPrefix.isPrefixOf(identityName)) {
+  if (!state.caProfile.caPrefix.isPrefixOf(identityName)) {
     return nullptr;
   }
   if (identityName.empty()) {
     NDN_LOG_TRACE("Randomly create a new name because identityName is empty and the param is empty.");
-    state.identityName = state.caProfile.m_caPrefix;
+    state.identityName = state.caProfile.caPrefix;
     state.identityName.append(std::to_string(random::generateSecureWord64()));
   }
   else {
@@ -159,7 +159,7 @@
   state.keyChain.sign(certRequest, signingByKey(keyName).setSignatureInfo(signatureInfo));
 
   // generate Interest packet
-  Name interestName = state.caProfile.m_caPrefix;
+  Name interestName = state.caProfile.caPrefix;
   interestName.append("CA").append("NEW");
   auto interest =std::make_shared<Interest>(interestName);
   interest->setMustBeFresh(true);
@@ -175,11 +175,11 @@
 shared_ptr<Interest>
 Requester::genRevokeInterest(RequestState& state, const security::Certificate& certificate)
 {
-  if (!state.caProfile.m_caPrefix.isPrefixOf(certificate.getName())) {
+  if (!state.caProfile.caPrefix.isPrefixOf(certificate.getName())) {
     return nullptr;
   }
   // generate Interest packet
-  Name interestName = state.caProfile.m_caPrefix;
+  Name interestName = state.caProfile.caPrefix;
   interestName.append("CA").append("REVOKE");
   auto interest =std::make_shared<Interest>(interestName);
   interest->setMustBeFresh(true);
@@ -192,7 +192,7 @@
 std::list<std::string>
 Requester::onNewRenewRevokeResponse(RequestState& state, const Data& reply)
 {
-  if (!security::verifySignature(reply, *state.caProfile.m_cert)) {
+  if (!security::verifySignature(reply, *state.caProfile.cert)) {
     NDN_LOG_ERROR("Cannot verify replied Data packet signature.");
     NDN_THROW(std::runtime_error("Cannot verify replied Data packet signature."));
   }
@@ -236,7 +236,7 @@
   }
   auto challengeParams = challenge->genChallengeRequestTLV(state.status, state.challengeStatus, std::move(parameters));
 
-  Name interestName = state.caProfile.m_caPrefix;
+  Name interestName = state.caProfile.caPrefix;
   interestName.append("CA").append("CHALLENGE").append(state.requestId.data(), state.requestId.size());
   auto interest =std::make_shared<Interest>(interestName);
   interest->setMustBeFresh(true);
@@ -256,7 +256,7 @@
 void
 Requester::onChallengeResponse(RequestState& state, const Data& reply)
 {
-  if (!security::verifySignature(reply, *state.caProfile.m_cert)) {
+  if (!security::verifySignature(reply, *state.caProfile.cert)) {
     NDN_LOG_ERROR("Cannot verify replied Data packet signature.");
     NDN_THROW(std::runtime_error("Cannot verify replied Data packet signature."));
   }