From 58269fea06b89b252f8c913ef3edcf76b1ce1c59 Mon Sep 17 00:00:00 2001 From: Arthur Britto Date: Tue, 1 May 2012 02:53:58 -0700 Subject: [PATCH 1/2] Fix config for integers. --- src/Config.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/Config.cpp b/src/Config.cpp index 65a290443..defaeed53 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -91,16 +91,20 @@ void Config::load() (void) sectionSingleB(secConfig, SECTION_VALIDATION_KEY, VALIDATION_KEY); (void) sectionSingleB(secConfig, SECTION_PEER_SSL_CIPHER_LIST, PEER_SSL_CIPHER_LIST); - (void) sectionSingleB(secConfig, SECTION_PEER_SCAN_INTERVAL_MIN, strTemp); + + if (sectionSingleB(secConfig, SECTION_PEER_SCAN_INTERVAL_MIN, strTemp)) PEER_SCAN_INTERVAL_MIN = MAX(60, boost::lexical_cast(strTemp)); - (void) sectionSingleB(secConfig, SECTION_PEER_START_MAX, strTemp); + + if (sectionSingleB(secConfig, SECTION_PEER_START_MAX, strTemp)) PEER_START_MAX = MIN(1, boost::lexical_cast(strTemp)); - (void) sectionSingleB(secConfig, SECTION_PEER_CONNECT_LOW_WATER, strTemp); + + if (sectionSingleB(secConfig, SECTION_PEER_CONNECT_LOW_WATER, strTemp)) PEER_CONNECT_LOW_WATER = MAX(1, boost::lexical_cast(strTemp)); - (void) sectionSingleB(secConfig, SECTION_NETWORK_QUORUM, strTemp); + if (sectionSingleB(secConfig, SECTION_NETWORK_QUORUM, strTemp)) NETWORK_QUORUM = MIN(0, boost::lexical_cast(strTemp)); - (void) sectionSingleB(secConfig, SECTION_BELIEF_QUORUM, strTemp); + + if (sectionSingleB(secConfig, SECTION_BELIEF_QUORUM, strTemp)) BELIEF_QUORUM = MIN(0, boost::lexical_cast(strTemp)); } } From 9ca903efae0528922424b3d216bd43756a3613fe Mon Sep 17 00:00:00 2001 From: Arthur Britto Date: Tue, 1 May 2012 13:24:35 -0700 Subject: [PATCH 2/2] Another Config fix. --- src/Config.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Config.cpp b/src/Config.cpp index defaeed53..d517eb177 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -91,12 +91,11 @@ void Config::load() (void) sectionSingleB(secConfig, SECTION_VALIDATION_KEY, VALIDATION_KEY); (void) sectionSingleB(secConfig, SECTION_PEER_SSL_CIPHER_LIST, PEER_SSL_CIPHER_LIST); - if (sectionSingleB(secConfig, SECTION_PEER_SCAN_INTERVAL_MIN, strTemp)) PEER_SCAN_INTERVAL_MIN = MAX(60, boost::lexical_cast(strTemp)); if (sectionSingleB(secConfig, SECTION_PEER_START_MAX, strTemp)) - PEER_START_MAX = MIN(1, boost::lexical_cast(strTemp)); + PEER_START_MAX = MAX(1, boost::lexical_cast(strTemp)); if (sectionSingleB(secConfig, SECTION_PEER_CONNECT_LOW_WATER, strTemp)) PEER_CONNECT_LOW_WATER = MAX(1, boost::lexical_cast(strTemp));