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.cpp

diff --git a/src/route/fib.cpp b/src/route/fib.cpp
index e5a4c43..f61f6f4 100644
--- a/src/route/fib.cpp
+++ b/src/route/fib.cpp
@@ -385,7 +385,7 @@
                                                              "Successful in name registration",
                                                              faceUri),
                                                    ndn::bind(&Fib::onRegistrationFailure,
-                                                             this, _1, _2,
+                                                             this, _1,
                                                              "Failed in name registration",
                                                              parameters,
                                                              faceUri, times));
@@ -426,7 +426,7 @@
                                                      ndn::bind(&Fib::onUnregistration, this, _1,
                                                                "Successful in unregistering name"),
                                                      ndn::bind(&Fib::onUnregistrationFailure,
-                                                               this, _1, _2,
+                                                               this, _1,
                                                                "Failed in unregistering name"));
   }
 }
@@ -442,7 +442,7 @@
   m_controller.start<ndn::nfd::StrategyChoiceSetCommand>(parameters,
                                                          bind(&Fib::onSetStrategySuccess, this, _1,
                                                               "Successfully set strategy choice"),
-                                                         bind(&Fib::onSetStrategyFailure, this, _1, _2,
+                                                         bind(&Fib::onSetStrategyFailure, this, _1,
                                                               parameters,
                                                               count,
                                                               "Failed to set strategy choice"));
@@ -467,13 +467,13 @@
 }
 
 void
-Fib::onRegistrationFailure(uint32_t code, const std::string& error,
+Fib::onRegistrationFailure(const ndn::nfd::ControlResponse& response,
                            const std::string& message,
                            const ndn::nfd::ControlParameters& parameters,
                            const std::string& faceUri,
                            uint8_t times)
 {
-  _LOG_DEBUG(message << ": " << error << " (code: " << code << ")");
+  _LOG_DEBUG(message << ": " << response.getText() << " (code: " << response.getCode() << ")");
   _LOG_DEBUG("Prefix: " << parameters.getName() << " failed for: " << times);
   if (times < 3) {
     _LOG_DEBUG("Trying to register again...");
@@ -488,10 +488,10 @@
 }
 
 void
-Fib::onUnregistrationFailure(uint32_t code, const std::string& error,
-                            const std::string& message)
+Fib::onUnregistrationFailure(const ndn::nfd::ControlResponse& response,
+                             const std::string& message)
 {
-  _LOG_DEBUG(message << ": " << error << " (code: " << code << ")");
+  _LOG_DEBUG(message << ": " << response.getText() << " (code: " << response.getCode() << ")");
 }
 
 void
@@ -503,10 +503,10 @@
 }
 
 void
-Fib::onSetStrategyFailure(uint32_t code, const std::string& error,
-                         const ndn::nfd::ControlParameters& parameters,
-                         uint32_t count,
-                         const std::string& message)
+Fib::onSetStrategyFailure(const ndn::nfd::ControlResponse& response,
+                          const ndn::nfd::ControlParameters& parameters,
+                          uint32_t count,
+                          const std::string& message)
 {
   _LOG_DEBUG(message << ": " << parameters.getStrategy() << " "
             << "for name: " << parameters.getName());