commit 51d242a2816907d4a36788d97e93129e72269890
author Steve DiBenedetto <dibenede@cs.colostate.edu> Mon Mar 31 13:46:43 2014 -0600
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Mar 31 18:18:47 2014 -0700
tree affd47c6c80a1ccc692c73c38ecda8fd852d93ae
parent 98e29f473165d9a641c4e6b08931d572d0fdc034

mgmt: refactor management modules to use ControlCommand

Change-Id: Icf5e10f2f2d0b95c85fd871e6484c3ed58ed6c46

daemon/mgmt/fib-manager.cpp

diff --git a/daemon/mgmt/fib-manager.cpp b/daemon/mgmt/fib-manager.cpp
index b1b869b..0bf4f34 100644
--- a/daemon/mgmt/fib-manager.cpp
+++ b/daemon/mgmt/fib-manager.cpp
@@ -122,9 +122,7 @@
   if (signedVerbProcessor != m_signedVerbDispatch.end())
     {
       ControlParameters parameters;
-      if (!extractParameters(parameterComponent, parameters) ||
-          !parameters.hasName() ||
-          !parameters.hasFaceId())
+      if (!extractParameters(parameterComponent, parameters) || !parameters.hasFaceId())
         {
           NFD_LOG_INFO("command result: malformed verb: " << verb);
           sendResponse(command, 400, "Malformed command");
@@ -148,15 +146,17 @@
     }
 }
 
-
-
 void
 FibManager::addNextHop(ControlParameters& parameters,
                        ControlResponse& response)
 {
-  if (!parameters.hasCost())
+  ndn::nfd::FibAddNextHopCommand command;
+
+  if (!validateParameters(command, parameters))
     {
-      parameters.setCost(0);
+      NFD_LOG_INFO("add-nexthop result: FAIL reason: malformed");
+      setResponse(response, 400, "Malformed command");
+      return;
     }
 
   const Name& prefix = parameters.getName();
@@ -179,6 +179,7 @@
                    << " faceid: " << faceId
                    << " cost: " << cost);
 
+      NFD_LOG_INFO("add-nexthop result: SUCCESS");
       setResponse(response, 200, "Success", parameters.wireEncode());
     }
   else
@@ -192,6 +193,14 @@
 FibManager::removeNextHop(ControlParameters& parameters,
                           ControlResponse& response)
 {
+  ndn::nfd::FibRemoveNextHopCommand command;
+  if (!validateParameters(command, parameters))
+    {
+      NFD_LOG_INFO("remove-nexthop result: FAIL reason: malformed");
+      setResponse(response, 400, "Malformed command");
+      return;
+    }
+
   NFD_LOG_DEBUG("remove-nexthop prefix: " << parameters.getName()
                 << " faceid: " << parameters.getFaceId());
 
@@ -211,6 +220,8 @@
             }
         }
     }
+
+  NFD_LOG_INFO("remove-nexthop result: SUCCESS");
   setResponse(response, 200, "Success", parameters.wireEncode());
 }