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/ndnd-controller.hpp b/src/management/ndnd-controller.hpp
index 319f995..a689d28 100644
--- a/src/management/ndnd-controller.hpp
+++ b/src/management/ndnd-controller.hpp
@@ -7,17 +7,9 @@
#ifndef NDN_MANAGEMENT_NDND_CONTROLLER_HPP
#define NDN_MANAGEMENT_NDND_CONTROLLER_HPP
-#include "../common.hpp"
#include "controller.hpp"
-#include "../name.hpp"
-#include "../interest.hpp"
-#include "../data.hpp"
-
namespace ndn {
-
-class Node;
-
namespace ndnd {
class FaceInstance;
@@ -37,7 +29,7 @@
/**
* @brief Construct ndnd::Control object
*/
- Controller(Node& face);
+ Controller(Face& face);
virtual void
selfRegisterPrefix(const Name& prefixToRegister,
@@ -62,26 +54,24 @@
private:
void
- onNdnidFetched(const shared_ptr<const Interest>& interest,
- const shared_ptr<Data>& data);
-
+ onNdnidFetched(const Interest& interest, Data& data);
void
recordSelfRegisteredFaceId(const ForwardingEntry& entry,
const SuccessCallback& onSuccess);
void
- processFaceActionResponse(const shared_ptr<Data>& data,
+ processFaceActionResponse(Data& data,
const FaceOperationSucceedCallback& onSuccess,
const FailCallback& onFail);
void
- processPrefixActionResponse(const shared_ptr<Data>& data,
+ processPrefixActionResponse(Data& data,
const PrefixOperationSucceedCallback& onSuccess,
const FailCallback& onFail);
private:
- Node& m_face;
+ Face& m_face;
Block m_ndndId;
int64_t m_faceId; // internal face ID (needed for prefix de-registration)