commit 4a315b366b322c9cbcd83f2483abda59d31a88ce
author Davide Pesavento <davide.pesavento@lip6.fr> Sat Nov 24 14:32:19 2018 -0500
committer Davide Pesavento <davide.pesavento@lip6.fr> Sat Nov 24 20:24:32 2018 -0500
tree 4bae0f1215cd50c76f04398669b7102cee74b155
parent 9edaf26034db6642ffceb73f336a1c295d9370b1

Fix build with current ndn-cxx and update CI scripts

Change-Id: I766c4679456561d6d7335889b8b9974dc7b94aa6

src/validator/certificate-fetcher-ndns-cert.cpp

diff --git a/src/validator/certificate-fetcher-ndns-cert.cpp b/src/validator/certificate-fetcher-ndns-cert.cpp
index 4e0f01c..b5a0b9f 100644
--- a/src/validator/certificate-fetcher-ndns-cert.cpp
+++ b/src/validator/certificate-fetcher-ndns-cert.cpp
@@ -46,7 +46,7 @@
                                     const ValidationContinuation& continueValidation)
 {
   using IterativeQueryTag = SimpleTag<shared_ptr<IterativeQueryController>, 1086>;
-  const Name& key = certRequest->m_interest.getName();
+  const Name& key = certRequest->interest.getName();
   Name domain = calculateDomain(key);
   if (domain.size() == m_startComponentIndex) {
     // NS record does not exist, since the domain is actually globally routable
@@ -59,7 +59,7 @@
 
   auto query = std::make_shared<IterativeQueryController>(domain,
                                                           label::NS_RR_TYPE,
-                                                          certRequest->m_interest.getInterestLifetime(),
+                                                          certRequest->interest.getInterestLifetime(),
                                                           [=] (const Data& data, const Response& response) {
                                                             nsSuccessCallback(data, certRequest, state, continueValidation);
                                                           },
@@ -81,7 +81,7 @@
                                               const shared_ptr<security::v2::ValidationState>& state,
                                               const ValidationContinuation& continueValidation)
 {
-  Name interestName(certRequest->m_interest.getName());
+  Name interestName(certRequest->interest.getName());
   interestName.append(label::CERT_RR_TYPE);
   Interest interest(interestName);
 
@@ -118,9 +118,9 @@
                                            const ValidationContinuation& continueValidation)
 {
   NDNS_LOG_WARN("Cannot fetch link due to " +
-                errMsg + " `" + certRequest->m_interest.getName().toUri() + "`");
+                errMsg + " `" + certRequest->interest.getName().toUri() + "`");
 
-  Name interestName(certRequest->m_interest.getName());
+  Name interestName(certRequest->interest.getName());
   interestName.append(label::CERT_RR_TYPE);
   Interest interest(interestName);
   m_face.expressInterest(interest,
@@ -172,16 +172,16 @@
                                          const ValidationContinuation& continueValidation)
 {
   NDNS_LOG_DEBUG("NACK (" << nack.getReason() <<  ") while fetching certificate "
-                 << certRequest->m_interest.getName());
+                 << certRequest->interest.getName());
 
-  --certRequest->m_nRetriesLeft;
-  if (certRequest->m_nRetriesLeft >= 0) {
+  --certRequest->nRetriesLeft;
+  if (certRequest->nRetriesLeft >= 0) {
     // TODO implement delay for the the next fetch
     fetch(certRequest, state, continueValidation);
   }
   else {
     state->fail({security::v2::ValidationError::Code::CANNOT_RETRIEVE_CERT, "Cannot fetch certificate after all "
-                 "retries `" + certRequest->m_interest.getName().toUri() + "`"});
+                 "retries `" + certRequest->interest.getName().toUri() + "`"});
   }
 }
 
@@ -190,16 +190,16 @@
                                             const shared_ptr<security::v2::ValidationState>& state,
                                             const ValidationContinuation& continueValidation)
 {
-  NDNS_LOG_DEBUG("Timeout while fetching certificate " << certRequest->m_interest.getName()
+  NDNS_LOG_DEBUG("Timeout while fetching certificate " << certRequest->interest.getName()
                  << ", retrying");
 
-  --certRequest->m_nRetriesLeft;
-  if (certRequest->m_nRetriesLeft >= 0) {
+  --certRequest->nRetriesLeft;
+  if (certRequest->nRetriesLeft >= 0) {
     fetch(certRequest, state, continueValidation);
   }
   else {
     state->fail({security::v2::ValidationError::Code::CANNOT_RETRIEVE_CERT, "Cannot fetch certificate after all "
-                 "retries `" + certRequest->m_interest.getName().toUri() + "`"});
+                 "retries `" + certRequest->interest.getName().toUri() + "`"});
   }
 }