SunnyQjm/NFD
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mgmt+tools: add missing includes

Browse Source 
Change-Id: I53aeaa6b223b616c170697662d02a028cea67400
This commit is contained in:
Davide Pesavento committed 2023-03-16 13:31:12 -04:00
1 parent d6ea0b1e0e
commit 4064127b97
26 files changed
+84 -49
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

core/common.hpp
+5 -5
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2014-2022, Regents of the University of California,
* Copyright (c) 2014-2023, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -78,8 +78,6 @@ namespace nfd {
using std::size_t;
using boost::noncopyable;
using std::shared_ptr;
using std::unique_ptr;
using std::weak_ptr;
@@ -90,12 +88,13 @@ using std::static_pointer_cast;
using std::dynamic_pointer_cast;
using std::const_pointer_cast;
using std::to_string;
using namespace std::string_literals;
using namespace std::string_view_literals;
using ndn::span;
using ndn::to_string;
using boost::noncopyable;
using ndn::span;
using ndn::Block;
using ndn::Data;
using ndn::FaceUri;
@@ -116,6 +115,7 @@ namespace scheduler = ndn::scheduler;
namespace signal = ndn::util::signal;
namespace time = ndn::time;
using namespace ndn::time_literals;
using ndn::operator""_block;
} // namespace nfd
daemon/mgmt/rib-manager.cpp
+2 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2014-2022, Regents of the University of California,
* Copyright (c) 2014-2023, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -31,8 +31,8 @@
#include "table/fib.hpp"
#include <ndn-cxx/lp/tags.hpp>
#include <ndn-cxx/mgmt/nfd/face-status.hpp>
#include <ndn-cxx/mgmt/nfd/rib-entry.hpp>
#include <ndn-cxx/mgmt/nfd/status-dataset.hpp>
#include <ndn-cxx/security/certificate-fetcher-direct-fetch.hpp>
namespace nfd {
daemon/mgmt/rib-manager.hpp
+2 -1
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2014-2022, Regents of the University of California,
* Copyright (c) 2014-2023, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -32,6 +32,7 @@
#include <ndn-cxx/mgmt/nfd/controller.hpp>
#include <ndn-cxx/mgmt/nfd/face-event-notification.hpp>
#include <ndn-cxx/mgmt/nfd/face-monitor.hpp>
#include <ndn-cxx/mgmt/nfd/face-status.hpp>
#include <ndn-cxx/security/validator-config.hpp>
#include <ndn-cxx/util/scheduler.hpp>
tests/daemon/mgmt/fib-manager.t.cpp
+2 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2014-2022, Regents of the University of California,
* Copyright (c) 2014-2023, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -178,7 +178,7 @@ BOOST_AUTO_TEST_CASE(NameTooLong)
receiveInterest(req);
ControlResponse expected(414, "FIB entry prefix cannot exceed " +
ndn::to_string(Fib::getMaxDepth()) + " components");
std::to_string(Fib::getMaxDepth()) + " components");
BOOST_CHECK_EQUAL(checkResponse(0, req.getName(), expected), CheckResponseResult::OK);
BOOST_CHECK_EQUAL(checkNextHop(prefix), CheckNextHopResult::NO_FIB_ENTRY);
tools/ndn-autoconfig/multicast-discovery.cpp
+2 -1
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2014-2022, Regents of the University of California,
* Copyright (c) 2014-2023, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -28,6 +28,7 @@
#include <boost/lexical_cast.hpp>
#include <ndn-cxx/encoding/tlv-nfd.hpp>
#include <ndn-cxx/mgmt/nfd/status-dataset.hpp>
namespace ndn::autoconfig {
tools/nfd-autoreg.cpp
+2 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2014-2022, Regents of the University of California,
* Copyright (c) 2014-2023, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -29,7 +29,7 @@
#include <ndn-cxx/face.hpp>
#include <ndn-cxx/mgmt/nfd/controller.hpp>
#include <ndn-cxx/mgmt/nfd/face-monitor.hpp>
#include <ndn-cxx/mgmt/nfd/face-status.hpp>
#include <ndn-cxx/mgmt/nfd/status-dataset.hpp>
#include <ndn-cxx/net/face-uri.hpp>
#include <ndn-cxx/security/key-chain.hpp>
tools/nfdc/channel-module.cpp
+3 -1
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2014-2022, Regents of the University of California,
* Copyright (c) 2014-2023, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -26,6 +26,8 @@
#include "channel-module.hpp"
#include "format-helpers.hpp"
#include <ndn-cxx/mgmt/nfd/status-dataset.hpp>
namespace nfd::tools::nfdc {
void
tools/nfdc/channel-module.hpp
+4 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2014-2022, Regents of the University of California,
* Copyright (c) 2014-2023, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -28,6 +28,8 @@
#include "module.hpp"
#include <ndn-cxx/mgmt/nfd/channel-status.hpp>
namespace nfd::tools::nfdc {
using ndn::nfd::ChannelStatus;
@@ -35,7 +37,7 @@ using ndn::nfd::ChannelStatus;
/** \brief Provides access to NFD channel dataset.
* \sa https://redmine.named-data.net/projects/nfd/wiki/FaceMgmt#Channel-Dataset
*/
class ChannelModule : public Module, noncopyable
class ChannelModule : public Module, boost::noncopyable
{
public:
void
tools/nfdc/cs-module.cpp
+2 -1
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2014-2022, Regents of the University of California,
* Copyright (c) 2014-2023, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -26,6 +26,7 @@
#include "cs-module.hpp"
#include "format-helpers.hpp"
#include <ndn-cxx/mgmt/nfd/status-dataset.hpp>
#include <ndn-cxx/util/indented-stream.hpp>
namespace nfd::tools::nfdc {
tools/nfdc/cs-module.hpp
+5 -3
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2014-2022, Regents of the University of California,
* Copyright (c) 2014-2023, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -26,8 +26,10 @@
#ifndef NFD_TOOLS_NFDC_CS_MODULE_HPP
#define NFD_TOOLS_NFDC_CS_MODULE_HPP
#include "command-parser.hpp"
#include "module.hpp"
#include "command-parser.hpp"
#include <ndn-cxx/mgmt/nfd/cs-info.hpp>
namespace nfd::tools::nfdc {
@@ -36,7 +38,7 @@ using ndn::nfd::CsInfo;
/** \brief Provides access to NFD CS management.
* \sa https://redmine.named-data.net/projects/nfd/wiki/CsMgmt
*/
class CsModule : public Module, noncopyable
class CsModule : public Module, boost::noncopyable
{
public:
/** \brief Register 'cs config' command.
tools/nfdc/execute-command.hpp
+1 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2014-2022, Regents of the University of California,
* Copyright (c) 2014-2023, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -34,7 +34,6 @@
#include <ndn-cxx/mgmt/nfd/control-command.hpp>
#include <ndn-cxx/mgmt/nfd/control-parameters.hpp>
#include <ndn-cxx/mgmt/nfd/control-response.hpp>
#include <ndn-cxx/mgmt/nfd/status-dataset.hpp>
#include <ndn-cxx/security/key-chain.hpp>
namespace nfd::tools::nfdc {
tools/nfdc/face-helpers.cpp
+2 -1
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2014-2022, Regents of the University of California,
* Copyright (c) 2014-2023, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -26,6 +26,7 @@
#include "face-helpers.hpp"
#include "format-helpers.hpp"
#include <ndn-cxx/mgmt/nfd/status-dataset.hpp>
#include <ndn-cxx/util/logger.hpp>
namespace nfd::tools::nfdc {
tools/nfdc/face-helpers.hpp
+3
View File
@@ -28,6 +28,9 @@
#include "execute-command.hpp"
#include <ndn-cxx/mgmt/nfd/face-query-filter.hpp>
#include <ndn-cxx/mgmt/nfd/face-status.hpp>
namespace nfd::tools::nfdc {
using ndn::nfd::FaceQueryFilter;
tools/nfdc/face-module.cpp
+3 -1
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2014-2022, Regents of the University of California,
* Copyright (c) 2014-2023, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -26,6 +26,8 @@
#include "face-module.hpp"
#include "face-helpers.hpp"
#include <ndn-cxx/mgmt/nfd/status-dataset.hpp>
#include <boost/lexical_cast/try_lexical_convert.hpp>
namespace nfd::tools::nfdc {
tools/nfdc/face-module.hpp
+4 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2014-2022, Regents of the University of California,
* Copyright (c) 2014-2023, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -30,6 +30,8 @@
#include "command-parser.hpp"
#include "format-helpers.hpp"
#include <ndn-cxx/mgmt/nfd/face-status.hpp>
namespace nfd::tools::nfdc {
using ndn::nfd::FaceStatus;
@@ -37,7 +39,7 @@ using ndn::nfd::FaceStatus;
/** \brief Provides access to NFD face management.
* \sa https://redmine.named-data.net/projects/nfd/wiki/FaceMgmt
*/
class FaceModule : public Module, noncopyable
class FaceModule : public Module, boost::noncopyable
{
public:
/** \brief Register 'face list', 'face show', 'face create', 'face destroy' commands.
tools/nfdc/fib-module.cpp
+3 -1
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2014-2022, Regents of the University of California,
* Copyright (c) 2014-2023, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -26,6 +26,8 @@
#include "fib-module.hpp"
#include "format-helpers.hpp"
#include <ndn-cxx/mgmt/nfd/status-dataset.hpp>
namespace nfd::tools::nfdc {
void
tools/nfdc/fib-module.hpp
+4 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2014-2022, Regents of the University of California,
* Copyright (c) 2014-2023, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -28,6 +28,8 @@
#include "module.hpp"
#include <ndn-cxx/mgmt/nfd/fib-entry.hpp>
namespace nfd::tools::nfdc {
using ndn::nfd::FibEntry;
@@ -36,7 +38,7 @@ using ndn::nfd::NextHopRecord;
/** \brief Provides access to NFD FIB management.
* \sa https://redmine.named-data.net/projects/nfd/wiki/FibMgmt
*/
class FibModule : public Module, noncopyable
class FibModule : public Module, boost::noncopyable
{
public:
void
tools/nfdc/forwarder-general-module.cpp
+2 -1
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2014-2022, Regents of the University of California,
* Copyright (c) 2014-2023, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -26,6 +26,7 @@
#include "forwarder-general-module.hpp"
#include "format-helpers.hpp"
#include <ndn-cxx/mgmt/nfd/status-dataset.hpp>
#include <ndn-cxx/util/indented-stream.hpp>
namespace nfd::tools::nfdc {
tools/nfdc/forwarder-general-module.hpp
+4 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2014-2022, Regents of the University of California,
* Copyright (c) 2014-2023, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -28,6 +28,8 @@
#include "module.hpp"
#include <ndn-cxx/mgmt/nfd/forwarder-status.hpp>
namespace nfd::tools::nfdc {
using ndn::nfd::ForwarderStatus;
@@ -35,7 +37,7 @@ using ndn::nfd::ForwarderStatus;
/** \brief Provides access to NFD forwarder general status.
* \sa https://redmine.named-data.net/projects/nfd/wiki/ForwarderStatus
*/
class ForwarderGeneralModule : public Module, noncopyable
class ForwarderGeneralModule : public Module, boost::noncopyable
{
public:
void
tools/nfdc/module.hpp
+6 -4
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2014-2022, Regents of the University of California,
* Copyright (c) 2014-2023, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -26,17 +26,19 @@
#ifndef NFD_TOOLS_NFDC_MODULE_HPP
#define NFD_TOOLS_NFDC_MODULE_HPP
#include "core/common.hpp"
#include <ndn-cxx/mgmt/nfd/command-options.hpp>
#include <ndn-cxx/mgmt/nfd/controller.hpp>
#include <ostream>
namespace nfd::tools::nfdc {
using ndn::nfd::CommandOptions;
using ndn::nfd::Controller;
/** \brief Provides access to an NFD management module.
* \note This type is an interface. It should not have member fields.
/**
* \brief Provides access to an NFD management module.
* \note This type is an interface. It should not have any member fields.
*/
class Module
{
tools/nfdc/rib-module.cpp
+3 -1
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2014-2022, Regents of the University of California,
* Copyright (c) 2014-2023, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -28,6 +28,8 @@
#include "face-helpers.hpp"
#include "format-helpers.hpp"
#include <ndn-cxx/mgmt/nfd/status-dataset.hpp>
namespace nfd::tools::nfdc {
void
tools/nfdc/rib-module.hpp
+4 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2014-2022, Regents of the University of California,
* Copyright (c) 2014-2023, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -29,6 +29,8 @@
#include "module.hpp"
#include "command-parser.hpp"
#include <ndn-cxx/mgmt/nfd/rib-entry.hpp>
namespace nfd::tools::nfdc {
using ndn::nfd::RibEntry;
@@ -37,7 +39,7 @@ using ndn::nfd::Route;
/** \brief Provides access to NFD RIB management.
* \sa https://redmine.named-data.net/projects/nfd/wiki/RibMgmt
*/
class RibModule : public Module, noncopyable
class RibModule : public Module, boost::noncopyable
{
public:
/** \brief Register 'route list', 'route show', 'route add', 'route remove' commands.
tools/nfdc/status-report.hpp
+5 -3
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2014-2022, Regents of the University of California,
* Copyright (c) 2014-2023, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -26,6 +26,7 @@
#ifndef NFD_TOOLS_NFDC_STATUS_REPORT_HPP
#define NFD_TOOLS_NFDC_STATUS_REPORT_HPP
#include "core/common.hpp"
#include "module.hpp"
#include <ndn-cxx/face.hpp>
@@ -46,9 +47,10 @@ enum class ReportFormat {
std::ostream&
operator<<(std::ostream& os, ReportFormat fmt);
/** \brief Collects and prints NFD status report.
/**
* \brief Collects and prints NFD status report.
*/
class StatusReport : noncopyable
class StatusReport : boost::noncopyable
{
public:
#ifdef NFD_WITH_TESTS
tools/nfdc/strategy-choice-module.cpp
+3 -1
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2014-2022, Regents of the University of California,
* Copyright (c) 2014-2023, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -26,6 +26,8 @@
#include "strategy-choice-module.hpp"
#include "format-helpers.hpp"
#include <ndn-cxx/mgmt/nfd/status-dataset.hpp>
namespace nfd::tools::nfdc {
void
tools/nfdc/strategy-choice-module.hpp
+4 -2
View File
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
* Copyright (c) 2014-2022, Regents of the University of California,
* Copyright (c) 2014-2023, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -29,6 +29,8 @@
#include "module.hpp"
#include "command-parser.hpp"
#include <ndn-cxx/mgmt/nfd/strategy-choice.hpp>
namespace nfd::tools::nfdc {
using ndn::nfd::StrategyChoice;
@@ -36,7 +38,7 @@ using ndn::nfd::StrategyChoice;
/** \brief Provides access to NFD Strategy Choice management.
* \sa https://redmine.named-data.net/projects/nfd/wiki/StrategyChoice
*/
class StrategyChoiceModule : public Module, noncopyable
class StrategyChoiceModule : public Module, boost::noncopyable
{
public:
/** \brief Register 'strategy list', 'strategy show', 'strategy set', 'strategy unset' commands.
wscript
+4 -4
View File
@@ -32,8 +32,8 @@ GIT_TAG_PREFIX = 'NFD-'
def options(opt):
opt.load(['compiler_cxx', 'gnu_dirs'])
opt.load(['default-compiler-flags',
'coverage', 'pch', 'sanitizers', 'boost',
opt.load(['default-compiler-flags', 'pch',
'coverage', 'sanitizers', 'boost',
'dependency-checker', 'unix-socket', 'websocket',
'doxygen', 'sphinx_build'],
tooldir=['.waf-tools'])
@@ -82,8 +82,8 @@ int main()
def configure(conf):
conf.load(['compiler_cxx', 'gnu_dirs',
'default-compiler-flags', 'boost',
'pch', 'dependency-checker', 'websocket',
'default-compiler-flags', 'pch',
'boost', 'dependency-checker', 'websocket',
'doxygen', 'sphinx_build'])
conf.env.WITH_TESTS = conf.options.with_tests