tools: improve user experience by choosing best certificate
automatically and print final response in a pretty way
ndns-update
- pick the best certificate to sign the Update automatically
- support multiple token for content option
ndns-dig
- enhance output option
- change behavior of iterative query controller when NS query is NACKed
logger
- set default logger output to std::cerr
Change-Id: Ib06981c224ccad2a122a4505c84a60977184a55b
diff --git a/src/clients/iterative-query-controller.cpp b/src/clients/iterative-query-controller.cpp
index 1d7af26..c5e5104 100644
--- a/src/clients/iterative-query-controller.cpp
+++ b/src/clients/iterative-query-controller.cpp
@@ -74,10 +74,7 @@
switch (m_step) {
case QUERY_STEP_QUERY_NS:
if (ndnsType == NDNS_NACK) {
- if (m_nFinishedComps + m_nTryComps == m_dstLabel.size() && m_rrType != label::NS_RR_TYPE)
- m_step = QUERY_STEP_QUERY_RR;
- else
- m_step = QUERY_STEP_ANSWER_STUB;
+ m_step = QUERY_STEP_QUERY_RR;
}
else if (ndnsType == NDNS_RESP) {
if (m_nFinishedComps + m_nTryComps == m_dstLabel.size() && m_rrType == label::NS_RR_TYPE) {
diff --git a/src/daemon/name-server.cpp b/src/daemon/name-server.cpp
index b02a423..f796e13 100644
--- a/src/daemon/name-server.cpp
+++ b/src/daemon/name-server.cpp
@@ -138,8 +138,7 @@
bind(&NameServer::doUpdate, this, interest.shared_from_this(), data),
[this] (const shared_ptr<const Data>& data, const std::string& msg) {
NDNS_LOG_WARN("Ignoring update that did not pass the verification. "
- << "Validator cannot fetch certificate from the face "
- << "that used by validator itself to send Interest");
+ << "Check the root certificate")
});
}
}
diff --git a/src/logger.cpp b/src/logger.cpp
index 274e10e..e4f5b9b 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -46,7 +46,7 @@
else {
PatternLayoutPtr layout(new PatternLayout("%d{HH:mm:ss} %p %c{1} - %m%n"));
ConsoleAppenderPtr appender(new ConsoleAppender(layout));
-
+ appender->setTarget("System.cerr");
BasicConfigurator::configure(appender);
Logger::getRootLogger()->setLevel(log4cxx::Level::getInfo());
}
diff --git a/src/util/util.cpp b/src/util/util.cpp
new file mode 100644
index 0000000..1b14896
--- /dev/null
+++ b/src/util/util.cpp
@@ -0,0 +1,60 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/**
+ * Copyright (c) 2014, 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.
+ *
+ * NDNS is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * NDNS is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * NDNS, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "util.hpp"
+#include <ndn-cxx/security/cryptopp.hpp>
+
+namespace ndn {
+namespace ndns {
+
+NdnsType
+toNdnsType(const std::string& str)
+{
+ if (str == "resp")
+ return NDNS_RESP;
+ else if (str == "nack")
+ return NDNS_NACK;
+ else if (str == "auth")
+ return NDNS_AUTH;
+ else if (str == "raw")
+ return NDNS_RAW;
+ else
+ return NDNS_UNKNOWN;
+}
+
+void
+output(const Data& data, std::ostream& os, const bool isPretty)
+{
+ using namespace CryptoPP;
+ const Block& block = data.wireEncode();
+ if (!isPretty) {
+ StringSource ss(block.wire(), block.size(), true,
+ new Base64Encoder(new FileSink(os), true, 64));
+ }
+ else {
+ os << "Name: " << data.getName().toUri() << std::endl;
+ os << "KeyLocator: " << data.getSignature().getKeyLocator().getName().toUri() << std::endl;
+ StringSource ss(block.wire(), block.size(), true,
+ new Base64Encoder(new FileSink(os), true, 64));
+ os << std::endl;
+ }
+}
+
+} // namespace ndns
+} // namespace ndn
diff --git a/src/util/util.hpp b/src/util/util.hpp
index 2733cf1..7acf496 100644
--- a/src/util/util.hpp
+++ b/src/util/util.hpp
@@ -20,23 +20,23 @@
#ifndef NDNS_UTIL_UTIL_HPP
#define NDNS_UTIL_UTIL_HPP
+#include "ndns-enum.hpp"
+#include <ndn-cxx/data.hpp>
+
namespace ndn {
namespace ndns {
NdnsType
-toNdnsType(const std::string& str)
-{
- if (str == "resp")
- return NDNS_RESP;
- else if (str == "nack")
- return NDNS_NACK;
- else if (str == "auth")
- return NDNS_AUTH;
- else if (str == "raw")
- return NDNS_RAW;
- else
- return NDNS_UNKNOWN;
-}
+toNdnsType(const std::string& str);
+
+/**
+ * @brief print the data in a flexible way
+ * @param data The data to be printed
+ * @param os the ostream that received printed message
+ * @param isPretty whether to use pretty way
+ */
+void
+output(const Data& data, std::ostream& os, const bool isPretty);
} // namespace ndns
} // namespace ndn