api: Major API change. OnInterest/OnData callbacks now use just references, not shared pointers
If shared pointer is necessary, it can be obtained using
.shared_from_this() on Interest or Data object.
This commit also corrects all internal uses of expressInterest/setIntersetFilter.
Change-Id: I20207a5789fd189902f2c6e3827260b6b27a2514
diff --git a/src/management/nfd-controller.hpp b/src/management/nfd-controller.hpp
index d5400c6..aa788a9 100644
--- a/src/management/nfd-controller.hpp
+++ b/src/management/nfd-controller.hpp
@@ -7,18 +7,12 @@
#ifndef NDN_MANAGEMENT_NFD_CONTROL_HPP
#define NDN_MANAGEMENT_NFD_CONTROL_HPP
-#include "../common.hpp"
#include "controller.hpp"
-#include "../name.hpp"
-#include "../interest.hpp"
-#include "../data.hpp"
#include "../security/key-chain.hpp"
namespace ndn {
-class Name;
-
namespace nfd {
class FibManagementOptions;
@@ -31,7 +25,7 @@
/**
* @brief Construct ndnd::Control object
*/
- Controller(Node& face);
+ Controller(Face& face);
virtual void
selfRegisterPrefix(const Name& prefixToRegister,
@@ -54,17 +48,17 @@
const SuccessCallback& onSuccess);
// void
- // processFaceActionResponse(const shared_ptr<Data>& data,
+ // processFaceActionResponse(Data& data,
// const FaceOperationSucceedCallback& onSuccess,
// const FailCallback& onFail);
void
- processFibCommandResponse(const shared_ptr<Data>& data,
+ processFibCommandResponse(Data& data,
const FibCommandSucceedCallback& onSuccess,
const FailCallback& onFail);
private:
- Node& m_face;
+ Face& m_face;
KeyChain m_keyChain;
uint64_t m_faceId; // internal face ID (needed for prefix de-registration)
};