commit 63bd0348b313aa57451e5914ec07d47bf576f545
author Junxiao Shi <git@mail1.yoursunny.com> Wed Aug 17 16:57:14 2016 +0000
committer Junxiao Shi <git@mail1.yoursunny.com> Wed Aug 17 16:57:14 2016 +0000
tree 2fa0f3d57490fe15f0838b900116bd7f608b9969
parent b9d43d06ccc22c10eef4fbb2bb5d3528ac3a5859

adapt to Controller::CommandFailCallback with ControlResponse

refs #3739

Change-Id: I193fb11fd96bd91808fc6e3af22a8da2511246e2

src/route/fib.hpp

diff --git a/src/route/fib.hpp b/src/route/fib.hpp
index 050e0fb..2e61096 100644
--- a/src/route/fib.hpp
+++ b/src/route/fib.hpp
@@ -35,8 +35,8 @@
 
 namespace nlsr {
 
-typedef ndn::function<void(const ndn::nfd::ControlParameters&)> CommandSucceedCallback;
-typedef ndn::function<void(uint32_t/*code*/,const std::string&/*reason*/)> CommandFailCallback;
+typedef ndn::nfd::Controller::CommandSucceedCallback CommandSucceedCallback;
+typedef ndn::nfd::Controller::CommandFailCallback CommandFailCallback;
 
 class AdjacencyList;
 class ConfParameter;
@@ -163,22 +163,22 @@
                    const std::string& message);
 
   void
-  onRegistrationFailure(uint32_t code, const std::string& error,
+  onRegistrationFailure(const ndn::nfd::ControlResponse& response,
                         const std::string& message,
                         const ndn::nfd::ControlParameters& parameters,
                         const std::string& faceUri,
                         uint8_t times);
 
   void
-  onUnregistrationFailure(uint32_t code, const std::string& error,
-                        const std::string& message);
+  onUnregistrationFailure(const ndn::nfd::ControlResponse& response,
+                          const std::string& message);
 
   void
   onSetStrategySuccess(const ndn::nfd::ControlParameters& commandSuccessResult,
                        const std::string& message);
 
   void
-  onSetStrategyFailure(uint32_t code, const std::string& error,
+  onSetStrategyFailure(const ndn::nfd::ControlResponse& response,
                        const ndn::nfd::ControlParameters& parameters,
                        uint32_t count,
                        const std::string& message);