commit a3295741d6c21b95146145000e7b002cb1e7e062
author Junxiao Shi <git@mail1.yoursunny.com> Fri May 16 22:40:10 2014 -0700
committer Junxiao Shi <git@mail1.yoursunny.com> Fri May 16 22:40:10 2014 -0700
tree cb3102eb9ff9310190c7438f430fccc0243966ba
parent da006f5a0567b6c34e9f30df6f82ce635071d1ee

rib: fix FibAddNextHopCommand parameters

refs #1618

Change-Id: I6f8003bee785f0eaaadbf4fa3c5c8281a2cf48da

rib/rib-manager.cpp

diff --git a/rib/rib-manager.cpp b/rib/rib-manager.cpp
index f485c18..a84d7f6 100644
--- a/rib/rib-manager.cpp
+++ b/rib/rib-manager.cpp
@@ -70,34 +70,32 @@
 }
 
 void
+RibManager::startListening(const Name& commandPrefix, const ndn::OnInterest& onRequest)
+{
+  NFD_LOG_INFO("Listening on: " << commandPrefix);
+
+  m_nfdController.start<ndn::nfd::FibAddNextHopCommand>(
+    ControlParameters()
+      .setName(commandPrefix)
+      .setFaceId(0),
+    bind(&RibManager::onNrdCommandPrefixAddNextHopSuccess, this, cref(commandPrefix)),
+    bind(&RibManager::onNrdCommandPrefixAddNextHopError, this, cref(commandPrefix), _2));
+
+  m_face.setInterestFilter(commandPrefix, onRequest);
+}
+
+void
 RibManager::registerWithNfd()
 {
   //check whether the components of localhop and localhost prefixes are same
   BOOST_ASSERT(COMMAND_PREFIX.size() == REMOTE_COMMAND_PREFIX.size());
 
-  NFD_LOG_INFO("Setting interest filter on: " << COMMAND_PREFIX);
+  this->startListening(COMMAND_PREFIX, bind(&RibManager::onLocalhostRequest, this, _2));
 
-  m_nfdController.start<ndn::nfd::FibAddNextHopCommand>(
-    ControlParameters()
-      .setName(COMMAND_PREFIX),
-    bind(&RibManager::onNrdCommandPrefixAddNextHopSuccess, this, cref(COMMAND_PREFIX)),
-    bind(&RibManager::onNrdCommandPrefixAddNextHopError, this, cref(COMMAND_PREFIX), _2));
-
-  m_face.setInterestFilter(COMMAND_PREFIX, bind(&RibManager::onLocalhostRequest, this, _2));
-
-  if (m_isLocalhopEnabled)
-    {
-      NFD_LOG_INFO("Setting interest filter on: " << REMOTE_COMMAND_PREFIX);
-
-      m_nfdController.start<ndn::nfd::FibAddNextHopCommand>(
-        ControlParameters()
-          .setName(COMMAND_PREFIX),
-        bind(&RibManager::onNrdCommandPrefixAddNextHopSuccess, this, cref(REMOTE_COMMAND_PREFIX)),
-        bind(&RibManager::onNrdCommandPrefixAddNextHopError, this, cref(REMOTE_COMMAND_PREFIX), _2));
-
-      m_face.setInterestFilter(REMOTE_COMMAND_PREFIX,
-                               bind(&RibManager::onLocalhopRequest, this, _2));
-    }
+  if (m_isLocalhopEnabled) {
+    this->startListening(REMOTE_COMMAND_PREFIX,
+                         bind(&RibManager::onLocalhopRequest, this, _2));
+  }
 
   NFD_LOG_INFO("Start monitoring face create/destroy events");
   m_faceMonitor.addSubscriber(bind(&RibManager::onNotification, this, _1));

rib/rib-manager.hpp

diff --git a/rib/rib-manager.hpp b/rib/rib-manager.hpp
index 1407fb2..bcd43d7 100644
--- a/rib/rib-manager.hpp
+++ b/rib/rib-manager.hpp
@@ -74,6 +74,9 @@
            const std::string& filename);
 
   void
+  startListening(const Name& commandPrefix, const ndn::OnInterest& onRequest);
+
+  void
   onLocalhopRequest(const Interest& request);
 
   void