build: Upgrade waf to version 2.0.6
This commit also includes:
- cleanup of build scripts
- replacing log4cxx with ndn-cxx logging facility
Change-Id: I96fd673a3cd2e06061e9efc1a7891e41cf97ea4f
diff --git a/src/validator/certificate-fetcher-ndns-cert.cpp b/src/validator/certificate-fetcher-ndns-cert.cpp
index 8131bea..4e0f01c 100644
--- a/src/validator/certificate-fetcher-ndns-cert.cpp
+++ b/src/validator/certificate-fetcher-ndns-cert.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
- * Copyright (c) 2014-2017, Regents of the University of California.
+/*
+ * Copyright (c) 2014-2018, Regents of the University of California.
*
* This file is part of NDNS (Named Data Networking Domain Name Service).
* See AUTHORS.md for complete list of NDNS authors and contributors.
@@ -30,7 +30,7 @@
using security::v2::Certificate;
-NDNS_LOG_INIT("CertificateFetcherNdnsCert")
+NDNS_LOG_INIT(CertificateFetcherNdnsCert);
CertificateFetcherNdnsCert::CertificateFetcherNdnsCert(Face& face,
size_t nsCacheSize,
@@ -57,18 +57,18 @@
return ;
}
- auto query = make_shared<IterativeQueryController>(domain,
- label::NS_RR_TYPE,
- certRequest->m_interest.getInterestLifetime(),
- [=] (const Data& data, const Response& response) {
- nsSuccessCallback(data, certRequest, state, continueValidation);
- },
- [=] (uint32_t errCode, const std::string& errMsg) {
- nsFailCallback(errMsg, certRequest, state, continueValidation);
- },
- m_face,
- nullptr,
- m_nsCache.get());
+ auto query = std::make_shared<IterativeQueryController>(domain,
+ label::NS_RR_TYPE,
+ certRequest->m_interest.getInterestLifetime(),
+ [=] (const Data& data, const Response& response) {
+ nsSuccessCallback(data, certRequest, state, continueValidation);
+ },
+ [=] (uint32_t errCode, const std::string& errMsg) {
+ nsFailCallback(errMsg, certRequest, state, continueValidation);
+ },
+ m_face,
+ nullptr,
+ m_nsCache.get());
query->setStartComponentIndex(m_startComponentIndex);
query->start();
auto queryTag = make_shared<IterativeQueryTag>(query);
diff --git a/src/validator/validator.cpp b/src/validator/validator.cpp
index 3497d20..6c6e53a 100644
--- a/src/validator/validator.cpp
+++ b/src/validator/validator.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2017, Regents of the University of California.
+ * Copyright (c) 2014-2018, Regents of the University of California.
*
* This file is part of NDNS (Named Data Networking Domain Name Service).
* See AUTHORS.md for complete list of NDNS authors and contributors.
@@ -27,7 +27,7 @@
namespace ndn {
namespace ndns {
-NDNS_LOG_INIT("validator")
+NDNS_LOG_INIT(Validator);
std::string NdnsValidatorBuilder::VALIDATOR_CONF_FILE = DEFAULT_CONFIG_PATH "/" "validator.conf";