commit d2610dca557ffae403529a3352ecbe455454509c
author Davide Pesavento <davidepesa@gmail.com> Fri Jan 03 13:20:06 2025 -0500
committer Davide Pesavento <davidepesa@gmail.com> Fri Jan 03 13:21:02 2025 -0500
tree e0c28b0d41ede180cd05cafe49061dd0552df9a0
parent 384327dc0cc498f679c7c7deafacb2a1338b52f4

mgmt: adapt to API changes in ndn-cxx ControlCommand and Dispatcher

Change-Id: Iabedb5d6bbe34883c21015c8d74f68e9ba2a7f58

src/route/fib.cpp

diff --git a/src/route/fib.cpp b/src/route/fib.cpp
index d47d880..7f3f076 100644
--- a/src/route/fib.cpp
+++ b/src/route/fib.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2014-2023,  The University of Memphis,
+ * Copyright (c) 2014-2025,  The University of Memphis,
  *                           Regents of the University of California
  *
  * This file is part of NLSR (Named-data Link State Routing).
@@ -24,6 +24,8 @@
 #include "logger.hpp"
 #include "nexthop-list.hpp"
 
+#include <ndn-cxx/mgmt/nfd/control-command.hpp>
+
 #include <algorithm>
 #include <cmath>
 #include <map>
@@ -198,8 +200,7 @@
     NLSR_LOG_DEBUG("Registering prefix: " << faceParameters.getName() << " faceUri: " << faceUri);
     m_controller.start<ndn::nfd::RibRegisterCommand>(faceParameters,
       std::bind(&Fib::onRegistrationSuccess, this, _1, faceUri),
-      std::bind(&Fib::onRegistrationFailure, this, _1,
-                faceParameters, faceUri, times));
+      std::bind(&Fib::onRegistrationFailure, this, _1, faceParameters, faceUri, times));
   }
   else {
     NLSR_LOG_WARN("Error: No Face Id for face uri: " << faceUri);
@@ -264,8 +265,8 @@
                        " Face Id: " << commandSuccessResult.getFaceId());
       },
       [] (const ndn::nfd::ControlResponse& response) {
-        NLSR_LOG_DEBUG("Failed in unregistering name" << ": " << response.getText() <<
-                 " (code: " << response.getCode() << ")");
+        NLSR_LOG_DEBUG("Failed in unregistering name: " << response.getText() <<
+                       " (code " << response.getCode() << ")");
       });
   }
 }
@@ -279,9 +280,8 @@
     .setStrategy(strategy);
 
   m_controller.start<ndn::nfd::StrategyChoiceSetCommand>(parameters,
-                                                         std::bind(&Fib::onSetStrategySuccess, this, _1),
-                                                         std::bind(&Fib::onSetStrategyFailure, this, _1,
-                                                                   parameters, count));
+    std::bind(&Fib::onSetStrategySuccess, this, _1),
+    std::bind(&Fib::onSetStrategyFailure, this, _1, parameters, count));
 }
 
 void
@@ -292,7 +292,7 @@
 }
 
 void
-Fib::onSetStrategyFailure(const ndn::nfd::ControlResponse& response,
+Fib::onSetStrategyFailure(const ndn::nfd::ControlResponse&,
                           const ndn::nfd::ControlParameters& parameters,
                           uint32_t count)
 {