commit 60d06d87706178add5e76f288add6065cab9b2b4
author Minsheng Zhang <jimmyzms5@gmail.com> Tue Feb 10 14:09:01 2015 -0700
committer mzhang4 <jimmyzms5@gmail.com> Fri Feb 20 16:49:15 2015 -0600
tree 38bb72914a571c6a9800cfc70ba24204cb556a59
parent 0d6d036e4f0a504c856453788808794c122adfaf

tools: change prefix of routable-prefixes packet to under /localhop/nfd

refs #2512

Change-Id: Ib399e61b3d7b84f7993a5b887ff6b5b7c3e93a45

tools/ndn-autoconfig-server.cpp

diff --git a/tools/ndn-autoconfig-server.cpp b/tools/ndn-autoconfig-server.cpp
index 1a01061..fa4b2e7 100644
--- a/tools/ndn-autoconfig-server.cpp
+++ b/tools/ndn-autoconfig-server.cpp
@@ -28,9 +28,8 @@
 
 namespace ndn {
 
-const static Name AUTOCONFIG_PREFIX          = "/localhop/ndn-autoconf";
 const static Name LOCALHOP_HUB               = "/localhop/ndn-autoconf/hub";
-const static Name LOCALHOP_ROUTABLE_PREFIXES = "/localhop/ndn-autoconf/routable-prefixes";
+const static Name LOCALHOP_ROUTABLE_PREFIXES = "/localhop/nfd/rib/routable-prefixes";
 
 static void
 usage(const char* programName)
@@ -110,8 +109,12 @@
 
     // pre-create routable prefix Data
     if (!routablePrefixes.empty()) {
-      m_routablePrefixesData = make_shared<Data>(Name(LOCALHOP_ROUTABLE_PREFIXES).appendVersion());
+      Name routablePrefixesDataName(LOCALHOP_ROUTABLE_PREFIXES);
+      routablePrefixesDataName.appendVersion();
+      routablePrefixesDataName.appendSegment(0);
+      m_routablePrefixesData = make_shared<Data>(routablePrefixesDataName);
       m_routablePrefixesData->setContent(routablePrefixes.wireEncode());
+      m_routablePrefixesData->setFinalBlockId(routablePrefixesDataName.get(-1));
       m_routablePrefixesData->setFreshnessPeriod(time::seconds(5)); // 5s
       m_keyChain.sign(*m_routablePrefixesData);
     }
@@ -138,26 +141,19 @@
   }
 
   void
-  afterPrefixRegistered()
-  {
-    BOOST_ASSERT(AUTOCONFIG_PREFIX.isPrefixOf(LOCALHOP_HUB));
-    m_face.setInterestFilter(LOCALHOP_HUB,
-                             bind(&NdnAutoconfigServer::onHubInterest, this, _1, _2));
-
-    if (static_cast<bool>(m_routablePrefixesData)) {
-      BOOST_ASSERT(AUTOCONFIG_PREFIX.isPrefixOf(LOCALHOP_ROUTABLE_PREFIXES));
-      m_face.setInterestFilter(LOCALHOP_ROUTABLE_PREFIXES,
-                               bind(&NdnAutoconfigServer::onRoutablePrefixesInterest,
-                                    this, _1, _2));
-    }
-  }
-
-  void
   run()
   {
-    m_face.registerPrefix(AUTOCONFIG_PREFIX,
-                          bind(&NdnAutoconfigServer::afterPrefixRegistered, this),
-                          bind(&NdnAutoconfigServer::onRegisterFailed, this, _1, _2));
+    m_face.setInterestFilter(LOCALHOP_HUB,
+                             bind(&NdnAutoconfigServer::onHubInterest, this, _1, _2),
+                             RegisterPrefixSuccessCallback(),
+                             bind(&NdnAutoconfigServer::onRegisterFailed, this, _1, _2));
+
+    if (static_cast<bool>(m_routablePrefixesData)) {
+      m_face.setInterestFilter(LOCALHOP_ROUTABLE_PREFIXES,
+                               bind(&NdnAutoconfigServer::onRoutablePrefixesInterest, this, _1, _2),
+                               RegisterPrefixSuccessCallback(),
+                               bind(&NdnAutoconfigServer::onRegisterFailed, this, _1, _2));
+    }
 
     m_face.processEvents();
   }