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/daemon/nfd.cpp b/daemon/nfd.cpp
index 2f2861d..8c58034 100644
--- a/daemon/nfd.cpp
+++ b/daemon/nfd.cpp
@@ -46,13 +46,13 @@
static const std::string INTERNAL_CONFIG = "internal://nfd.conf";
-static inline ndn::util::NetworkMonitor*
+static inline ndn::net::NetworkMonitor*
makeNetworkMonitor()
{
try {
- return new ndn::util::NetworkMonitor(getGlobalIoService());
+ return new ndn::net::NetworkMonitor(getGlobalIoService());
}
- catch (const ndn::util::NetworkMonitor::Error& e) {
+ catch (const ndn::net::NetworkMonitor::Error& e) {
NFD_LOG_WARN(e.what());
return nullptr;
}