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/security/validator.hpp b/src/security/validator.hpp
index 1d74aa2..5a1062d 100644
--- a/src/security/validator.hpp
+++ b/src/security/validator.hpp
@@ -39,7 +39,7 @@
* @param onValidationFailed If the Data validation fails, this calls onValidationFailed(data).
*/
void
- validate (const shared_ptr<const Data> &data, const OnDataValidated &onValidated, const OnDataValidationFailed &onValidationFailed)
+ validate (const Data& data, const OnDataValidated &onValidated, const OnDataValidationFailed &onValidationFailed)
{ validate (data, onValidated, onValidationFailed, 0); }
/**
@@ -50,7 +50,7 @@
* @param onValidationFailed If the Interest validation fails, this calls onValidationFailed(interest).
*/
void
- validate (const shared_ptr<const Interest> &interest, const OnInterestValidated &onValidated, const OnInterestValidationFailed &onValidationFailed)
+ validate (const Interest& interest, const OnInterestValidated &onValidated, const OnInterestValidationFailed &onValidationFailed)
{ validate (interest, onValidated, onValidationFailed, 0); }
/*****************************************
@@ -95,7 +95,7 @@
* @param nextSteps On return, contains the next validation step.
*/
virtual void
- checkPolicy (const shared_ptr<const Data> &data,
+ checkPolicy (const Data& data,
int stepCount,
const OnDataValidated &onValidated,
const OnDataValidationFailed &onValidationFailed,
@@ -114,7 +114,7 @@
* @return the indication of next validation step, null if there is no further step.
*/
virtual void
- checkPolicy (const shared_ptr<const Interest> &interest,
+ checkPolicy (const Interest& interest,
int stepCount,
const OnInterestValidated &onValidated,
const OnInterestValidationFailed &onValidationFailed,
@@ -125,25 +125,25 @@
/// @brief Process the received certificate.
void
- onData (const shared_ptr<const Interest> &interest,
- const shared_ptr<const Data> &data,
- shared_ptr<ValidationRequest> nextStep);
+ onData (const Interest& interest,
+ Data& data,
+ const shared_ptr<ValidationRequest>& nextStep);
/// @brief Re-express the interest if it times out.
void
- onTimeout (const shared_ptr<const Interest> &interest,
+ onTimeout (const Interest& interest,
int retry,
const OnFailure &onFailure,
- shared_ptr<ValidationRequest> nextStep);
+ const shared_ptr<ValidationRequest>& nextStep);
void
- validate (const shared_ptr<const Data> &data,
+ validate (const Data& data,
const OnDataValidated &onValidated,
const OnDataValidationFailed &onValidationFailed,
int stepCount);
void
- validate (const shared_ptr<const Interest> &interest,
+ validate (const Interest& interest,
const OnInterestValidated &onValidated,
const OnInterestValidationFailed &onValidationFailed,
int stepCount);