commit 7e3f6d75c8485cb722616fb86329e55ea1bb0c99
author Ashlesh Gawande <agawande@memphis.edu> Fri Jan 25 13:13:43 2019 -0600
committer Ashlesh Gawande <agawande@memphis.edu> Fri Feb 01 11:54:48 2019 -0600
tree f3cfb225cb4431896126297235ec0599ab67ed8c
parent e3c741da9a68c5014288f9cb1efe92200f7d6bca

src: move and simplify canonize functionality to ConfFileProcessor

refs: #4817

Change-Id: I0a7f448f50994906d0403bcb97a3973dc1a25917

src/conf-file-processor.cpp

diff --git a/src/conf-file-processor.cpp b/src/conf-file-processor.cpp
index c893e39..18108b7 100644
--- a/src/conf-file-processor.cpp
+++ b/src/conf-file-processor.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2014-2018,  The University of Memphis,
+ * Copyright (c) 2014-2019,  The University of Memphis,
  *                           Regents of the University of California,
  *                           Arizona Board of Regents.
  *
@@ -458,7 +458,24 @@
 
         ndn::FaceUri faceUri;
         if (! faceUri.parse(uriString)) {
-          std::cerr << "parsing failed!" << std::endl;
+          std::cerr << "Parsing failed!" << std::endl;
+          return false;
+        }
+
+        bool failedToCanonize = false;
+        faceUri.canonize([&faceUri] (ndn::FaceUri canonicalUri) {
+                           faceUri = canonicalUri;
+                         },
+                         [&faceUri, &failedToCanonize] (const std::string& reason) {
+                           failedToCanonize = true;
+                           std::cerr << "Could not canonize URI: " << faceUri
+                                     << "because: " << reason << std::endl;
+                         },
+                         m_io,
+                         TIME_ALLOWED_FOR_CANONIZATION);
+        m_io.run();
+
+        if (failedToCanonize) {
           return false;
         }