commit 31d1d4b331be8b075b7f9e7da2178038b481895a
author akmhoque <akmhoque@gmail.com> Mon May 05 22:08:14 2014 -0500
committer akmhoque <akmhoque@gmail.com> Mon May 12 11:08:57 2014 -0500
tree e0271e2328a81c67abfcb2c6bbeeb5a0f00435bd
parent fdbddb114eae5b88d2a6c8bac6a321efc25fa013

src: Replace Tokenizer with the methods of ndn::Name

Purpose of this commit is to replace Tokenizer in all
places except conf-file-processor.*pp with the methods
of ndn::Name. One static method in class NameHelper
is added. Tokenizer will be removed finally when
configuration file parsing commit is complete.

Refs: 1533

Change-Id: I14a67655eb963c5cc5b045c3c9f7d516e405ff19

src/nlsr.hpp

diff --git a/src/nlsr.hpp b/src/nlsr.hpp
index 0e59adc..6bf45bd 100644
--- a/src/nlsr.hpp
+++ b/src/nlsr.hpp
@@ -11,15 +11,13 @@
 #include "conf-parameter.hpp"
 #include "adjacency-list.hpp"
 #include "name-prefix-list.hpp"
-#include "communication/interest-manager.hpp"
-#include "communication/data-manager.hpp"
 #include "lsdb.hpp"
 #include "sequencing-manager.hpp"
 #include "route/routing-table.hpp"
 #include "route/name-prefix-table.hpp"
 #include "route/fib.hpp"
-// #include "security/key-manager.hpp"
 #include "communication/sync-logic-handler.hpp"
+#include "hello-protocol.hpp"
 
 
 namespace nlsr {
@@ -42,28 +40,29 @@
     , m_confParam()
     , m_adjacencyList()
     , m_namePrefixList()
-    , m_interestManager(*this)
-    , m_dataManager(*this)
     , m_sequencingManager()
-    // , m_km()
     , m_isDaemonProcess(false)
     , m_configFileName("nlsr.conf")
-    , m_nlsrLsdb()
+    , m_nlsrLsdb(*this)
     , m_adjBuildCount(0)
     , m_isBuildAdjLsaSheduled(false)
     , m_isRouteCalculationScheduled(false)
     , m_isRoutingTableCalculating(false)
     , m_routingTable()
-    , m_namePrefixTable()
-    , m_fib(m_nlsrFace)
+    , m_fib(*this, m_nlsrFace)
+    , m_namePrefixTable(*this)
     , m_syncLogicHandler(m_nlsrFace.getIoService())
+    , m_helloProtocol(*this)
   {}
 
   void
   registrationFailed(const ndn::Name& name);
 
   void
-  setInterestFilter(const std::string& name);
+  setInfoInterestFilter();
+
+  void
+  setLsaInterestFilter();
 
   void
   startEventLoop();
@@ -125,25 +124,6 @@
     return m_nlsrFace;
   }
 
-  // KeyManager&
-  // getKeyManager()
-  // {
-  //   return m_km;
-  // }
-
-
-  InterestManager&
-  getInterestManager()
-  {
-    return m_interestManager;
-  }
-
-  DataManager&
-  getDataManager()
-  {
-    return m_dataManager;
-  }
-
   SequencingManager&
   getSequencingManager()
   {
@@ -256,10 +236,7 @@
   ConfParameter m_confParam;
   AdjacencyList m_adjacencyList;
   NamePrefixList m_namePrefixList;
-  InterestManager m_interestManager;
-  DataManager m_dataManager;
   SequencingManager m_sequencingManager;
-  // KeyManager m_km;
   bool m_isDaemonProcess;
   std::string m_configFileName;
   Lsdb m_nlsrLsdb;
@@ -268,10 +245,11 @@
   bool m_isRouteCalculationScheduled;
   bool m_isRoutingTableCalculating;
   RoutingTable m_routingTable;
-  NamePrefixTable m_namePrefixTable;
   Fib m_fib;
+  NamePrefixTable m_namePrefixTable;
   SyncLogicHandler m_syncLogicHandler;
   int32_t m_apiPort;
+  HelloProtocol m_helloProtocol;
 };
 
 } //namespace nlsr