Finalize switch to v2 security
Change-Id: I1da06c817a7b3455fda1033ee530cde3221f02b7
Refs: #4091
diff --git a/src/handles/write-handle.hpp b/src/handles/write-handle.hpp
index 1e7a007..c6622d9 100644
--- a/src/handles/write-handle.hpp
+++ b/src/handles/write-handle.hpp
@@ -1,5 +1,5 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/**
+/*
* Copyright (c) 2014-2017, Regents of the University of California.
*
* This file is part of NDN repo-ng (Next generation of NDN repository).
@@ -107,10 +107,10 @@
onInterest(const Name& prefix, const Interest& interest);
void
- onValidated(const std::shared_ptr<const Interest>& interest, const Name& prefix);
+ onValidated(const Interest& interest, const Name& prefix);
void
- onValidationFailed(const std::shared_ptr<const Interest>& interest, const std::string& reason);
+ onValidationFailed(const Interest& interest, const ValidationError& error);
private: // single data fetching
/**
@@ -120,8 +120,7 @@
onData(const Interest& interest, const Data& data, ProcessId processId);
void
- onDataValidated(const Interest& interest, const std::shared_ptr<const Data>& data,
- ProcessId processId);
+ onDataValidated(const Interest& interest, const Data& data, ProcessId processId);
/**
* @brief handle when fetching one data timeout
@@ -140,8 +139,7 @@
onSegmentData(const Interest& interest, const Data& data, ProcessId processId);
void
- onSegmentDataValidated(const Interest& interest, const std::shared_ptr<const Data>& data,
- ProcessId processId);
+ onSegmentDataValidated(const Interest& interest, const Data& data, ProcessId processId);
/**
* @brief Timeout when fetching segmented data. Data can be fetched RETRY_TIMEOUT times.
@@ -175,7 +173,7 @@
* @brief failure of validation for both one or segmented data
*/
void
- onDataValidationFailed(const std::shared_ptr<const Data>& data, const std::string& reason);
+ onDataValidationFailed(const Data& data, const ValidationError& error);
/**
* @brief extends noEndTime of process if not noEndTimeout, set StatusCode 405
@@ -194,11 +192,10 @@
onCheckInterest(const Name& prefix, const Interest& interest);
void
- onCheckValidated(const std::shared_ptr<const Interest>& interest, const Name& prefix);
+ onCheckValidated(const Interest& interest, const Name& prefix);
void
- onCheckValidationFailed(const std::shared_ptr<const Interest>& interest,
- const std::string& reason);
+ onCheckValidationFailed(const Interest& interest, const ValidationError& error);
private:
void