commit 54a43f06e1eaf7e9691bdcbfc8e7241ec9e3c01e
author Laqin Fan <lfan1@memphis.edu> Wed Mar 08 12:31:30 2017 -0600
committer Nick Gordon <nmgordon@memphis.edu> Fri Aug 04 12:46:50 2017 -0700
tree ced2068e38c56f4b2abfda6a5573c4416580023c
parent 820bb66350b1559b789ede184d4fb9432e0f166b

update: Refactor to use ndn-cxx dispatcher for prefix update/readvertise

refs: #3728

Change-Id: I3186433ed460850753f033a1d03fe27fd1fe889c

src/conf-file-processor.cpp

diff --git a/src/conf-file-processor.cpp b/src/conf-file-processor.cpp
index 9facbd5..c80f439 100644
--- a/src/conf-file-processor.cpp
+++ b/src/conf-file-processor.cpp
@@ -503,10 +503,8 @@
         std::string uriString = CommandAttriTree.get<std::string>("face-uri");
 
         ndn::util::FaceUri faceUri;
-        try {
-          faceUri = ndn::util::FaceUri(uriString);
-        } catch (const ndn::util::FaceUri::Error& e) {
-          std::cerr << "Malformed face-uri <" << uriString << "> for " << name << std::endl;
+        if (! faceUri.parse(uriString)) {
+          std::cerr << "parsing failed!" << std::endl;
           return false;
         }
 
@@ -554,11 +552,10 @@
   }
 
   try {
-    /* Radius and angle(s) are mandatory configuration parameters in hyperbolic section.
-     * Even if router can have hyperbolic routing calculation off but other router
-     * in the network may use hyperbolic routing calculation for FIB generation.
-     * So each router need to advertise its hyperbolic coordinates in the network
-     */
+    // Radius and angle(s) are mandatory configuration parameters in hyperbolic section.
+    // Even if router can have hyperbolic routing calculation off but other router
+    // in the network may use hyperbolic routing calculation for FIB generation.
+    // So each router need to advertise its hyperbolic coordinates in the network
     double radius = section.get<double>("radius");
     std::string angleString = section.get<std::string>("angle");
 
@@ -567,11 +564,9 @@
 
     double angle;
 
-    while (ss >> angle)
-    {
+    while (ss >> angle) {
       angles.push_back(angle);
-      if (ss.peek() == ',' || ss.peek() == ' ')
-      {
+      if (ss.peek() == ',' || ss.peek() == ' ') {
         ss.ignore();
       }
     }
@@ -663,7 +658,6 @@
 
   it++;
   if (it != section.end() && it->first == "prefix-update-validator") {
-    m_nlsr.getPrefixUpdateProcessor().enable();
     m_nlsr.getPrefixUpdateProcessor().loadValidator(it->second, m_confFileName);
 
     it++;