commit d7de2d45b2a7c5458a740ebb2a785c994e307349
author Davide Pesavento <davidepesa@gmail.com> Thu Aug 01 20:55:50 2019 -0400
committer Alexander Afanasyev <aa@cs.fiu.edu> Tue Aug 13 10:51:44 2019 -0400
tree 06801f67a08523d73f08800e100810004a67d408
parent 4db56c8e3f8607c9ff47d81e52f14a4fae011075

logic: initialize m_syncReset before using it

This commit also disables sending the reset interest upon
initialization of the Logic to preserve the previous behavior, where a
meaningless interest was sent out as a result of a bug.

Change-Id: Iec35d7745a0be06e768d4ae5f6afb8d867e590fc

src/logic.cpp

diff --git a/src/logic.cpp b/src/logic.cpp
index fa6680d..12b6feb 100644
--- a/src/logic.cpp
+++ b/src/logic.cpp
@@ -112,10 +112,11 @@
              const name::Component& session)
   : m_face(face)
   , m_syncPrefix(syncPrefix)
+  , m_syncReset(Name(syncPrefix).append("reset"))
   , m_defaultUserPrefix(defaultUserPrefix)
   , m_interestTable(m_face.getIoService())
   , m_isInReset(false)
-  , m_needPeriodReset(resetTimer > time::steady_clock::Duration::zero())
+  , m_needPeriodReset(resetTimer > time::nanoseconds::zero())
   , m_onUpdate(onUpdate)
   , m_scheduler(m_face.getIoService())
   , m_rng(ndn::random::getRandomNumberEngine())
@@ -131,11 +132,7 @@
   , m_instanceId(s_instanceCounter++)
 {
   _LOG_DEBUG_ID(">> Logic::Logic");
-
-  addUserNode(m_defaultUserPrefix, defaultSigningId, session);
-
-  m_syncReset = m_syncPrefix;
-  m_syncReset.append("reset");
+  addUserNode(m_defaultUserPrefix, defaultSigningId, session, false);
 
   _LOG_DEBUG_ID("Listen to: " << m_syncPrefix);
   m_syncRegisteredPrefix = m_face.setInterestFilter(
@@ -182,7 +179,7 @@
 }
 
 void
-Logic::addUserNode(const Name& userPrefix, const Name& signingId, const name::Component& session)
+Logic::addUserNode(const Name& userPrefix, const Name& signingId, const name::Component& session, bool shouldSendReset)
 {
   if (userPrefix == EMPTY_NAME)
     return;
@@ -197,11 +194,11 @@
       sessionName.append(session);
     }
     else {
-      sessionName.appendNumber(ndn::time::toUnixTimestamp(ndn::time::system_clock::now()).count());
+      sessionName.appendNumber(time::toUnixTimestamp(time::system_clock::now()).count());
     }
     m_nodeList[userPrefix].sessionName = sessionName;
     m_nodeList[userPrefix].seqNo = 0;
-    reset(false);
+    reset(!shouldSendReset);
   }
 }
 
@@ -586,7 +583,7 @@
     _LOG_DEBUG_ID("Need Period Reset");
     _LOG_DEBUG_ID("ResetTimer: " << m_resetTimer);
 
-    m_resetInterestId = m_scheduler.schedule(m_resetTimer + ndn::time::milliseconds(m_reexpressionJitter(m_rng)),
+    m_resetInterestId = m_scheduler.schedule(m_resetTimer + time::milliseconds(m_reexpressionJitter(m_rng)),
                                              [this] { sendResetInterest(); });
   }
 
@@ -620,7 +617,7 @@
 #endif
 
   m_reexpressingInterestId = m_scheduler.schedule(m_syncInterestLifetime / 2 +
-                                                  ndn::time::milliseconds(m_reexpressionJitter(m_rng)),
+                                                  time::milliseconds(m_reexpressionJitter(m_rng)),
                                                   [this] { sendSyncInterest(); });
 
   Interest interest(interestName);