commit 41b563bfcffb56c64b147026d193deff67ccd55e
author Alexander Afanasyev <aa@cs.fiu.edu> Sun Feb 17 14:16:32 2019 -0500
committer Alexander Afanasyev <aa@cs.fiu.edu> Sat May 30 21:00:59 2020 -0400
tree 1ee92b4bfdb8d12cf392b5dfcdfa382b0495c638
parent ed2c468634803070450b1e02ec46599143928996

[ndnSIM] Hack rib::Service so it can be used in ndnSIM directly

Change-Id: Iefc1e294d376d85c61530fd828f93871cd2e4b17

daemon/rib/service.hpp

diff --git a/daemon/rib/service.hpp b/daemon/rib/service.hpp
index ca5f57b..21f7d77 100644
--- a/daemon/rib/service.hpp
+++ b/daemon/rib/service.hpp
@@ -52,26 +52,7 @@
 class Service : noncopyable
 {
 public:
-  /**
-   * \brief create NFD-RIB service
-   * \param configFile absolute or relative path of configuration file
-   * \param keyChain the KeyChain
-   * \throw std::logic_error Instance of rib::Service has been already constructed
-   * \throw std::logic_error Instance of rib::Service is not constructed on RIB thread
-   */
-  Service(const std::string& configFile, ndn::KeyChain& keyChain);
-
-  /**
-   * \brief create NFD-RIB service
-   * \param configSection parsed configuration section
-   * \param keyChain the KeyChain
-   * \note This constructor overload is more appropriate for integrated environments,
-   *       such as NS-3 or android. Error messages related to configuration file
-   *       will use "internal://nfd.conf" as configuration filename.
-   * \throw std::logic_error Instance of rib::Service has been already constructed
-   * \throw std::logic_error Instance of rib::Service is not constructed on RIB thread
-   */
-  Service(const ConfigSection& configSection, ndn::KeyChain& keyChain);
+  Service(const ConfigSection& configSection, ndn::Face& face, ndn::KeyChain& keyChain);
 
   /**
    * \brief Destructor
@@ -94,7 +75,7 @@
 
 private:
   template<typename ConfigParseFunc>
-  Service(ndn::KeyChain& keyChain, shared_ptr<ndn::Transport> localNfdTransport,
+  Service(ndn::KeyChain& keyChain, ndn::Face& face,
           const ConfigParseFunc& configParse);
 
   void
@@ -107,10 +88,9 @@
   applyConfig(const ConfigSection& section, const std::string& filename);
 
 private:
-  static Service* s_instance;
-
   ndn::KeyChain& m_keyChain;
-  ndn::Face m_face;
+  ndn::Face& m_face;
+  ndn::util::Scheduler m_scheduler;
   ndn::nfd::Controller m_nfdController;
 
   Rib m_rib;