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/nlsr-runner.cpp

diff --git a/src/nlsr-runner.cpp b/src/nlsr-runner.cpp
index 57066e9..b5ff594 100644
--- a/src/nlsr-runner.cpp
+++ b/src/nlsr-runner.cpp
@@ -41,15 +41,7 @@
     BOOST_THROW_EXCEPTION(ConfFileError("Error in configuration file processing"));
   }
 
-  // Because URI canonization needs to occur before initialization,
-  // we have to pass initialize as the finally() in neighbor canonization.
-  m_nlsr.canonizeNeighborUris(m_nlsr.getAdjacencyList().getAdjList().begin(),
-                              [this] (std::list<Adjacent>::iterator iterator) {
-                                m_nlsr.canonizeContinuation(iterator, [this] { m_nlsr.initialize(); });
-                              },
-                              [this] {
-                                m_nlsr.initialize();
-                              });
+  m_nlsr.initialize();
 
   try {
     m_nlsr.startEventLoop();