tools: switch to v2::Validator in nfdc
"nfdid" field in 'nfdc status show' command is temporarily unavailable
because NfdIdCollector relies on v1 Validator. It will be re-implemented
in a future commit.
refs #4089
Change-Id: I21feae43055a17438d8bd3c0439ae4e0a2d5d14c
diff --git a/tools/nfdc/status.cpp b/tools/nfdc/status.cpp
index f87cd8b..529ee82 100644
--- a/tools/nfdc/status.cpp
+++ b/tools/nfdc/status.cpp
@@ -1,5 +1,5 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
+/*
* Copyright (c) 2014-2017, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
@@ -40,17 +40,17 @@
void
reportStatus(ExecuteContext& ctx, const StatusReportOptions& options)
{
- unique_ptr<Validator> validator = make_unique<ndn::ValidatorNull>();
+ unique_ptr<ndn::security::v2::Validator> validator = make_unique<ndn::security::v2::ValidatorNull>();
CommandOptions ctrlOptions;
StatusReport report;
if (options.wantForwarderGeneral) {
- auto nfdIdCollector = make_unique<NfdIdCollector>(std::move(validator));
+ // auto nfdIdCollector = make_unique<NfdIdCollector>(std::move(validator));
auto forwarderGeneralModule = make_unique<ForwarderGeneralModule>();
- forwarderGeneralModule->setNfdIdCollector(*nfdIdCollector);
+ // forwarderGeneralModule->setNfdIdCollector(*nfdIdCollector);
report.sections.push_back(std::move(forwarderGeneralModule));
- validator = std::move(nfdIdCollector);
+ // validator = std::move(nfdIdCollector);
}
if (options.wantChannels) {