rib+tools: Make use of ndn::nfd::FaceMonitor from the ndn-cxx library
NFD still uses its own NotificationStream, as ApiFace needs to be
changed to use library's version of the class.
Change-Id: Ifc5727a555528a1aa48ccf7379fcbb61a33049d7
diff --git a/rib/rib-manager.hpp b/rib/rib-manager.hpp
index c31256e..d08ab50 100644
--- a/rib/rib-manager.hpp
+++ b/rib/rib-manager.hpp
@@ -27,11 +27,11 @@
#define NFD_RIB_RIB_MANAGER_HPP
#include "rib.hpp"
-#include "face-monitor.hpp"
#include "core/config-file.hpp"
#include "rib-status-publisher.hpp"
#include <ndn-cxx/security/validator-config.hpp>
+#include <ndn-cxx/management/nfd-face-monitor.hpp>
#include <ndn-cxx/management/nfd-controller.hpp>
#include <ndn-cxx/management/nfd-control-command.hpp>
#include <ndn-cxx/management/nfd-control-response.hpp>
@@ -44,6 +44,8 @@
using ndn::nfd::ControlResponse;
using ndn::nfd::ControlParameters;
+using ndn::nfd::FaceEventNotification;
+
class RibManager : noncopyable
{
public:
@@ -221,7 +223,7 @@
ndn::KeyChain m_keyChain;
ndn::ValidatorConfig m_localhostValidator;
ndn::ValidatorConfig m_localhopValidator;
- FaceMonitor m_faceMonitor;
+ ndn::nfd::FaceMonitor m_faceMonitor;
bool m_isLocalhopEnabled;
RibStatusPublisher m_ribStatusPublisher;