mgmt: NfdManagerBase::makeAuthorization uses CommandAuthenticator
This commit also eliminates Forwarder in Mgmt/TestFaceManager/CreateFace test suite
and uses FaceTable directly.
refs #2063
Change-Id: I596e8c2a12dad64ee75082f384955f30d574f53e
diff --git a/daemon/nfd.hpp b/daemon/nfd.hpp
index d8fd12e..f98d3b6 100644
--- a/daemon/nfd.hpp
+++ b/daemon/nfd.hpp
@@ -42,11 +42,11 @@
namespace nfd {
class Forwarder;
+class CommandAuthenticator;
class FibManager;
class FaceManager;
class StrategyChoiceManager;
class ForwarderStatusManager;
-class CommandValidator;
namespace face {
class Face;
@@ -107,19 +107,18 @@
unique_ptr<Forwarder> m_forwarder;
- ndn::KeyChain& m_keyChain;
- shared_ptr<face::Face> m_internalFace;
- shared_ptr<ndn::Face> m_internalClientFace;
- unique_ptr<CommandValidator> m_validator;
-
- unique_ptr<ndn::mgmt::Dispatcher> m_dispatcher;
- unique_ptr<FibManager> m_fibManager;
- unique_ptr<FaceManager> m_faceManager;
- unique_ptr<StrategyChoiceManager> m_strategyChoiceManager;
+ ndn::KeyChain& m_keyChain;
+ shared_ptr<face::Face> m_internalFace;
+ shared_ptr<ndn::Face> m_internalClientFace;
+ unique_ptr<ndn::mgmt::Dispatcher> m_dispatcher;
+ shared_ptr<CommandAuthenticator> m_authenticator;
unique_ptr<ForwarderStatusManager> m_forwarderStatusManager;
+ unique_ptr<FaceManager> m_faceManager;
+ unique_ptr<FibManager> m_fibManager;
+ unique_ptr<StrategyChoiceManager> m_strategyChoiceManager;
unique_ptr<ndn::util::NetworkMonitor> m_networkMonitor;
- scheduler::ScopedEventId m_reloadConfigEvent;
+ scheduler::ScopedEventId m_reloadConfigEvent;
};
} // namespace nfd