commit 50df6b798188a40bfd1552e6fdaba39a43c566b2
author Vince Lehman <vslehman@memphis.edu> Tue Mar 03 12:06:40 2015 -0600
committer Vince Lehman <vslehman@memphis.edu> Tue Mar 03 12:13:46 2015 -0600
tree 2b289d0d09dc225ede106d0cbd8f888a5e81cace
parent 7a56d1c7c1871bba8dd2abfdbdf6e71761a331d6

src: Fix first event-interval scheduling

refs: #2615, #2593

Change-Id: I17da4d9acb83299a5666159fb988c1a97220eda8

src/nlsr.cpp

diff --git a/src/nlsr.cpp b/src/nlsr.cpp
index 07eb43e..eb06be0 100644
--- a/src/nlsr.cpp
+++ b/src/nlsr.cpp
@@ -140,16 +140,17 @@
   _LOG_DEBUG("Default NLSR identity: " << m_defaultIdentity);
   setInfoInterestFilter();
   setLsaInterestFilter();
+
+  // Set event intervals
+  setFirstHelloInterval(m_confParam.getFirstHelloInterval());
+  m_nlsrLsdb.setAdjLsaBuildInterval(m_confParam.getAdjLsaBuildInterval());
+  m_routingTable.setRoutingCalcInterval(m_confParam.getRoutingCalcInterval());
+
   m_nlsrLsdb.buildAndInstallOwnNameLsa();
   m_nlsrLsdb.buildAndInstallOwnCoordinateLsa();
 
   registerKeyPrefix();
 
-  // Set event intervals
-  setFirstHelloInterval(m_confParam.getFirstHelloInterval());
-  m_helloProtocol.setAdjLsaBuildInterval(m_confParam.getAdjLsaBuildInterval());
-  m_routingTable.setRoutingCalcInterval(m_confParam.getRoutingCalcInterval());
-
   m_helloProtocol.scheduleInterest(m_firstHelloInterval);
 
   // Need to set direct neighbors' costs to 0 for hyperbolic routing