commit 6fce07859ddebe9473ca7c679cef215f5273d70a
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Jun 18 16:59:54 2014 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Jun 20 10:00:35 2014 -0700
tree e9691bf12464b7b3503da1e494a3e8155d3b60c7
parent dc01700b45bb6b103d7cb22740f3b61213e0e520

tools: Set broadcast strategy for HUB discovery prefix

Change-Id: Iaaf680e73be302b4068410e5c00260f3798b47fe
Refs: #1595

tools/ndn-autoconfig.cpp

diff --git a/tools/ndn-autoconfig.cpp b/tools/ndn-autoconfig.cpp
index a3c8041..f73ef94 100644
--- a/tools/ndn-autoconfig.cpp
+++ b/tools/ndn-autoconfig.cpp
@@ -47,6 +47,8 @@
 namespace ndn {
 namespace tools {
 
+static const Name LOCALHOP_HUB_DISCOVERY_PREFIX = "/localhop/ndn-autoconf/hub";
+
 void
 usage(const char* programName)
 {
@@ -121,12 +123,12 @@
 
     m_face.expressInterest(interest,
                            bind(&NdnAutoconfig::fetchSegments, this, _2, buffer,
-                                &NdnAutoconfig::discoverHubStage1_registerLocalhubNdnAutoconfHub),
+                                &NdnAutoconfig::discoverHubStage1_registerHubDiscoveryPrefix),
                            bind(&NdnAutoconfig::discoverHubStage2, this, "Timeout"));
   }
 
   void
-  discoverHubStage1_registerLocalhubNdnAutoconfHub(const shared_ptr<OBufferStream>& buffer)
+  discoverHubStage1_registerHubDiscoveryPrefix(const shared_ptr<OBufferStream>& buffer)
   {
     ConstBufferPtr buf = buffer->buf();
     std::vector<uint64_t> multicastFaces;
@@ -170,7 +172,7 @@
 
       nfd::ControlParameters parameters;
       parameters
-        .setName("/localhop/ndn-autoconf/hub")
+        .setName(LOCALHOP_HUB_DISCOVERY_PREFIX)
         .setCost(1);
 
       nRegistrations->first = multicastFaces.size();
@@ -195,13 +197,13 @@
     nRegistrations->second++;
 
     if (nRegistrations->first == nRegistrations->second) {
-      discoverHubStage1_requestHubData();
+      discoverHubStage1_setStrategy(controller);
     }
   }
 
   void
   discoverHubStage1_onRegisterFailure(uint32_t code, const std::string& error,
-                                      const shared_ptr<nfd::Controller> controller,
+                                      const shared_ptr<nfd::Controller>& controller,
                                       const shared_ptr<std::pair<size_t, size_t> >& nRegistrations)
   {
     std::cerr << "ERROR: " << error << " (code: " << code << ")" << std::endl;
@@ -209,18 +211,48 @@
 
     if (nRegistrations->first == nRegistrations->second) {
       if (nRegistrations->first > 0) {
-        discoverHubStage1_requestHubData();
+        discoverHubStage1_setStrategy(controller);
       } else {
-        discoverHubStage2("Failed to register /localhop/ndn-autoconf/hub for all multicast faces");
+        discoverHubStage2("Failed to register " + LOCALHOP_HUB_DISCOVERY_PREFIX.toUri() +
+                          " for all multicast faces");
       }
     }
   }
 
+  void
+  discoverHubStage1_setStrategy(const shared_ptr<nfd::Controller>& controller)
+  {
+    nfd::ControlParameters parameters;
+    parameters
+      .setName(LOCALHOP_HUB_DISCOVERY_PREFIX)
+      .setStrategy("/localhost/nfd/strategy/broadcast");
+
+    controller->start<nfd::StrategyChoiceSetCommand>(parameters,
+      bind(&NdnAutoconfig::discoverHubStage1_onSetStrategySuccess,
+           this, controller),
+      bind(&NdnAutoconfig::discoverHubStage1_onSetStrategyFailure,
+           this, _2, controller));
+  }
+
+  void
+  discoverHubStage1_onSetStrategySuccess(const shared_ptr<nfd::Controller>& controller)
+  {
+    discoverHubStage1_requestHubData();
+  }
+
+  void
+  discoverHubStage1_onSetStrategyFailure(const std::string& error,
+                                         const shared_ptr<nfd::Controller>& controller)
+  {
+    discoverHubStage2("Failed to set broadcast strategy for " +
+                      LOCALHOP_HUB_DISCOVERY_PREFIX.toUri() + " namespace (" + error + ")");
+  }
+
   // Start to look for a hub (NDN hub discovery first stage)
   void
   discoverHubStage1_requestHubData()
   {
-    Interest interest(Name("/localhop/ndn-autoconf/hub"));
+    Interest interest(LOCALHOP_HUB_DISCOVERY_PREFIX);
     interest.setInterestLifetime(time::milliseconds(4000)); // 4 seconds
     interest.setMustBeFresh(true);