use FaceUri and NetworkMonitor from ndn-cxx/net
This commit also contains a quick fix in LpReliability to avoid
ndn::lp::Packet::wireEncode(EncodingEstimator&).
refs #3940, #4156
Change-Id: Ice8e3649be21dd023ed1f6562c185f9e6721e45e
diff --git a/tools/ndn-autoconfig/base.hpp b/tools/ndn-autoconfig/base.hpp
index a293d0b..5c9d4cf 100644
--- a/tools/ndn-autoconfig/base.hpp
+++ b/tools/ndn-autoconfig/base.hpp
@@ -31,8 +31,8 @@
#include <ndn-cxx/face.hpp>
#include <ndn-cxx/mgmt/nfd/controller.hpp>
#include <ndn-cxx/mgmt/nfd/face-status.hpp>
+#include <ndn-cxx/net/face-uri.hpp>
#include <ndn-cxx/security/key-chain.hpp>
-#include <ndn-cxx/util/face-uri.hpp>
namespace ndn {
namespace tools {
@@ -40,7 +40,6 @@
using ndn::nfd::ControlParameters;
using ndn::nfd::ControlResponse;
-using ndn::util::FaceUri;
/**
* @brief Base class for discovery stages
diff --git a/tools/ndn-autoconfig/main.cpp b/tools/ndn-autoconfig/main.cpp
index fc3a6fc..db45610 100644
--- a/tools/ndn-autoconfig/main.cpp
+++ b/tools/ndn-autoconfig/main.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2014-2016, Regents of the University of California,
+ * Copyright (c) 2014-2017, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -30,7 +30,7 @@
#include "ndn-fch-discovery.hpp"
#include "guess-from-identity-name.hpp"
-#include <ndn-cxx/util/network-monitor.hpp>
+#include <ndn-cxx/net/network-monitor.hpp>
#include <ndn-cxx/util/scheduler.hpp>
#include <ndn-cxx/util/scheduler-scoped-event-id.hpp>
@@ -93,7 +93,7 @@
})
{
if (m_isDaemonMode) {
- m_networkMonitor.reset(new ndn::util::NetworkMonitor(m_io));
+ m_networkMonitor.reset(new net::NetworkMonitor(m_io));
m_networkMonitor->onNetworkStateChanged.connect([this] {
// delay stages, so if multiple events are triggered in short sequence,
// only one auto-detection procedure is triggered
@@ -154,7 +154,7 @@
boost::asio::io_service m_io;
Face m_face;
KeyChain m_keyChain;
- unique_ptr<util::NetworkMonitor> m_networkMonitor;
+ unique_ptr<net::NetworkMonitor> m_networkMonitor;
util::Scheduler m_scheduler;
util::scheduler::ScopedEventId m_startStagesEvent;
bool m_isDaemonMode;