face: face refactoring completion
* delete old Face
* rename LpFace as Face
* eliminate LpFaceWrapper and use new Face
refs #3172
Change-Id: I08c3a5dfb4cc1b9834b30cccd9ab634535d0608c
diff --git a/daemon/mgmt/face-manager.hpp b/daemon/mgmt/face-manager.hpp
index 8e90a73..c2f43bb 100644
--- a/daemon/mgmt/face-manager.hpp
+++ b/daemon/mgmt/face-manager.hpp
@@ -29,18 +29,14 @@
#include "manager-base.hpp"
#include <ndn-cxx/management/nfd-face-status.hpp>
#include <ndn-cxx/management/nfd-face-query-filter.hpp>
+#include "face/face.hpp"
namespace nfd {
-class Face;
class FaceTable;
class NetworkInterfaceInfo;
class ProtocolFactory;
-namespace face {
-class LpFace;
-} // namespace face
-
/**
* @brief implement the Face Management of NFD Management Protocol.
* @sa http://redmine.named-data.net/projects/nfd/wiki/FaceMgmt
@@ -89,16 +85,10 @@
afterCreateFaceFailure(const std::string& reason,
const ndn::mgmt::CommandContinuation& done);
- struct ExtractLocalControlParametersResult
- {
- bool isValid;
- face::LpFace* lpFace;
- };
-
- ExtractLocalControlParametersResult
- extractLocalControlParameters(const Interest& request,
- const ControlParameters& parameters,
- const ndn::mgmt::CommandContinuation& done);
+ Face*
+ findFaceForLocalControl(const Interest& request,
+ const ControlParameters& parameters,
+ const ndn::mgmt::CommandContinuation& done);
PUBLIC_WITH_TESTS_ELSE_PRIVATE: // StatusDataset
void