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

diff --git a/src/nlsr.cpp b/src/nlsr.cpp
index 7bc77e2..d5c0038 100644
--- a/src/nlsr.cpp
+++ b/src/nlsr.cpp
@@ -324,9 +324,9 @@
 }
 
 void
-Nlsr::onDestroyFaceFailure(int32_t code, const std::string& error)
+Nlsr::onDestroyFaceFailure(const ndn::nfd::ControlResponse& response)
 {
-  std::cerr << error << " (code: " << code << ")";
+  std::cerr << response.getText() << " (code: " << response.getCode() << ")";
   throw Error("Error: Face destruction failed");
 }
 
@@ -338,7 +338,7 @@
        it != adjacents.end(); it++) {
     m_fib.destroyFace((*it).getConnectingFaceUri(),
                       std::bind(&Nlsr::onDestroyFaceSuccess, this, _1),
-                      std::bind(&Nlsr::onDestroyFaceFailure, this, _1, _2));
+                      std::bind(&Nlsr::onDestroyFaceFailure, this, _1));
   }
 }