commit 0bcf9a361dcdad5ab594843a490bb213539d174e
author Vince Lehman <vslehman@memphis.edu> Wed Dec 10 11:24:45 2014 -0600
committer Vince Lehman <vslehman@memphis.edu> Thu Jan 15 10:07:39 2015 -0800
tree 7c71c23261f7f142b417f18c2da264f9087fdad6
parent f09e2633a074273da6c9ed47e8f76abcc588c95e

comm: Make SyncLogic responsible for update prefix

refs: #2289

Change-Id: I7687e36c88853bdf58de654b1ca280662a826b4b

src/communication/sync-logic-handler.cpp

diff --git a/src/communication/sync-logic-handler.cpp b/src/communication/sync-logic-handler.cpp
index 5e20795..5f87436 100644
--- a/src/communication/sync-logic-handler.cpp
+++ b/src/communication/sync-logic-handler.cpp
@@ -132,6 +132,20 @@
   }
 };
 
+SyncLogicHandler::SyncLogicHandler(ndn::Face& face,
+                                   Lsdb& lsdb, ConfParameter& conf,
+                                   SequencingManager& seqManager)
+  : m_validator(new ndn::ValidatorNull())
+  , m_syncFace(face)
+  , m_lsdb(lsdb)
+  , m_confParam(conf)
+  , m_sequencingManager(seqManager)
+{
+  m_updatePrefix = m_confParam.getLsaPrefix();
+  m_updatePrefix.append(m_confParam.getSiteName());
+  m_updatePrefix.append(m_confParam.getRouterName());
+}
+
 void
 SyncLogicHandler::createSyncSocket()
 {
@@ -247,10 +261,11 @@
 }
 
 void
-SyncLogicHandler::publishRoutingUpdate(SequencingManager& manager, const ndn::Name& updatePrefix)
+SyncLogicHandler::publishRoutingUpdate()
 {
-  manager.writeSeqNoToFile();
-  publishSyncUpdate(updatePrefix, manager.getCombinedSeqNo());
+  m_sequencingManager.writeSeqNoToFile();
+
+  publishSyncUpdate(m_updatePrefix, m_sequencingManager.getCombinedSeqNo());
 }
 
 void

src/communication/sync-logic-handler.hpp

diff --git a/src/communication/sync-logic-handler.hpp b/src/communication/sync-logic-handler.hpp
index 70fd07e..e602037 100644
--- a/src/communication/sync-logic-handler.hpp
+++ b/src/communication/sync-logic-handler.hpp
@@ -41,13 +41,7 @@
 class SyncLogicHandler
 {
 public:
-  SyncLogicHandler(ndn::Face& face, Lsdb& lsdb, ConfParameter& conf)
-    : m_validator(new ndn::ValidatorNull())
-    , m_syncFace(face)
-    , m_lsdb(lsdb)
-    , m_confParam(conf)
-  {
-  }
+  SyncLogicHandler(ndn::Face& face, Lsdb& lsdb, ConfParameter& conf, SequencingManager& seqManager);
 
   void
   createSyncSocket();
@@ -59,7 +53,7 @@
   onNsyncRemoval(const std::string& prefix);
 
   void
-  publishRoutingUpdate(SequencingManager& manager, const ndn::Name& updatePrefix);
+  publishRoutingUpdate();
 
   void
   setSyncPrefix(const std::string& sp)
@@ -89,6 +83,9 @@
 
   Lsdb& m_lsdb;
   ConfParameter& m_confParam;
+  const SequencingManager& m_sequencingManager;
+
+  ndn::Name m_updatePrefix;
 
   static const std::string NLSR_COMPONENT;
   static const std::string LSA_COMPONENT;