commit 85998a1dc942974a7d4bf3e9f642c5a22dffb6f8
author Ashlesh Gawande <agawande@memphis.edu> Thu Dec 07 22:22:13 2017 -0600
committer Ashlesh Gawande <agawande@memphis.edu> Fri Feb 01 14:23:55 2019 -0600
tree f64308b63f55ea0ba7ac9a5495653b94cf31a4db
parent 7e3f6d75c8485cb722616fb86329e55ea1bb0c99

src: decouple classes from Nlsr object

refs: #1952, #2803, #3960, #4288

Change-Id: Ibe3ac3820f11e8107ee4b13e510d53c27467a6cb

src/nlsr-runner.cpp

diff --git a/src/nlsr-runner.cpp b/src/nlsr-runner.cpp
index b5ff594..41c0f8c 100644
--- a/src/nlsr-runner.cpp
+++ b/src/nlsr-runner.cpp
@@ -20,31 +20,23 @@
  **/
 
 #include "nlsr-runner.hpp"
-#include "conf-file-processor.hpp"
 
 namespace nlsr {
 
-NlsrRunner::NlsrRunner(const std::string& configFileName)
-  : m_scheduler(m_ioService)
-  , m_face(m_ioService)
-  , m_nlsr(m_ioService, m_scheduler, m_face, m_keyChain)
+NlsrRunner::NlsrRunner(ndn::Face& face, ConfParameter& confParam)
+  : m_face(face)
+  , m_confParam(confParam)
+  , m_nlsr(m_face, m_keyChain, m_confParam)
 {
-  m_nlsr.setConfFileName(configFileName);
 }
 
 void
 NlsrRunner::run()
 {
-  ConfFileProcessor configProcessor(m_nlsr, m_nlsr.getConfFileName());
-
-  if (!configProcessor.processConfFile()) {
-    BOOST_THROW_EXCEPTION(ConfFileError("Error in configuration file processing"));
-  }
-
   m_nlsr.initialize();
 
   try {
-    m_nlsr.startEventLoop();
+    m_face.processEvents();
   }
   catch (...) {
     m_nlsr.getFib().clean();