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/sequencing-manager.cpp

diff --git a/src/sequencing-manager.cpp b/src/sequencing-manager.cpp
index ac2bb54..9f52b71 100644
--- a/src/sequencing-manager.cpp
+++ b/src/sequencing-manager.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2014-2018,  The University of Memphis,
+ * Copyright (c) 2014-2019,  The University of Memphis,
  *                           Regents of the University of California,
  *                           Arizona Board of Regents.
  *
@@ -34,6 +34,16 @@
 
 INIT_LOGGER(SequencingManager);
 
+SequencingManager::SequencingManager(std::string filePath, int hypState)
+  : m_nameLsaSeq(0)
+  , m_adjLsaSeq(0)
+  , m_corLsaSeq(0)
+  , m_hyperbolicState(hypState)
+{
+  setSeqFileDirectory(filePath);
+  initiateSeqNoFromFile();
+}
+
 void
 SequencingManager::writeSeqNoToFile() const
 {
@@ -48,7 +58,7 @@
 }
 
 void
-SequencingManager::initiateSeqNoFromFile(int hypState)
+SequencingManager::initiateSeqNoFromFile()
 {
   NLSR_LOG_DEBUG("Seq File Name: " << m_seqFileNameWithPath);
   std::ifstream inputFile(m_seqFileNameWithPath.c_str());
@@ -87,7 +97,7 @@
     m_nameLsaSeq += 10;
 
     // Increment the adjacency LSA seq. no. if link-state or dry HR is enabled
-    if (hypState != HYPERBOLIC_STATE_ON) {
+    if (m_hyperbolicState != HYPERBOLIC_STATE_ON) {
       if (m_corLsaSeq != 0) {
         NLSR_LOG_WARN("This router was previously configured for hyperbolic"
                    << " routing without clearing the seq. no. file.");
@@ -97,7 +107,7 @@
     }
 
     // Similarly, increment the coordinate LSA seq. no only if link-state is disabled.
-    if (hypState != HYPERBOLIC_STATE_OFF) {
+    if (m_hyperbolicState != HYPERBOLIC_STATE_OFF) {
       if (m_adjLsaSeq != 0) {
         NLSR_LOG_WARN("This router was previously configured for link-state"
                   << " routing without clearing the seq. no. file.");
@@ -110,7 +120,7 @@
 }
 
 void
-SequencingManager::setSeqFileDirectory(std::string filePath)
+SequencingManager::setSeqFileDirectory(const std::string& filePath)
 {
   m_seqFileNameWithPath = filePath;