commit a2228c6e1f4942e50336d83e359f8b536e94073e
author alvy <muktadir.rahman.c@gmail.com> Tue Dec 09 10:25:11 2014 -0600
committer Vince Lehman <vslehman@memphis.edu> Thu Dec 18 08:06:22 2014 -0800
tree efd284389aa864e6ee9efb3950ac0b452020a7ef
parent 93d9ec37eabd7a9866cc3e249452ef8464234577

src: Make conf keys with default values optional

refs: #1949

Change-Id: Ia9ba8707d27f2db96264f0480ffc72fd44a75099

src/conf-parameter.hpp

diff --git a/src/conf-parameter.hpp b/src/conf-parameter.hpp
index e25c4d3..4edf33e 100644
--- a/src/conf-parameter.hpp
+++ b/src/conf-parameter.hpp
@@ -83,13 +83,15 @@
 
 enum {
   MAX_FACES_PER_PREFIX_MIN = 0,
+  MAX_FACES_PER_PREFIX_DEFAULT = 0,
   MAX_FACES_PER_PREFIX_MAX = 60
 };
 
 enum {
   HYPERBOLIC_STATE_OFF = 0,
   HYPERBOLIC_STATE_ON = 1,
-  HYPERBOLIC_STATE_DRY_RUN = 2
+  HYPERBOLIC_STATE_DRY_RUN = 2,
+  HYPERBOLIC_STATE_DEFAULT = 0
 };
 
 class ConfParameter
@@ -189,7 +191,6 @@
   setLsaRefreshTime(int32_t lrt)
   {
     m_lsaRefreshTime = lrt;
-    m_routerDeadInterval = 2 * m_lsaRefreshTime;
   }
 
   int32_t
@@ -247,12 +248,12 @@
   }
 
   void
-  setRouterDeadInterval(int64_t rdt)
+  setRouterDeadInterval(int32_t rdt)
   {
     m_routerDeadInterval = rdt;
   }
 
-  int64_t
+  int32_t
   getRouterDeadInterval() const
   {
     return m_routerDeadInterval;
@@ -422,13 +423,12 @@
   uint32_t m_routingCalcInterval;
 
   ndn::time::seconds m_lsaInterestLifetime;
-  int64_t  m_routerDeadInterval;
+  int32_t  m_routerDeadInterval;
   std::string m_logLevel;
 
   uint32_t m_interestRetryNumber;
   int32_t  m_interestResendTime;
 
-
   int32_t  m_infoInterestInterval;
 
   int32_t m_hyperbolicState;