ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:jedmccaleb/NewCoin

Browse Source
This commit is contained in:
JoelKatz
2012-05-01 18:37:42 -07:00
parent 8f0ed4d2e9 9ca903efae
commit dc659e221e
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Config.cpp
View File

@@ -91,16 +91,19 @@ void Config::load()
(void) sectionSingleB(secConfig, SECTION_VALIDATION_KEY, VALIDATION_KEY); (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_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<int>(strTemp)); PEER_SCAN_INTERVAL_MIN = MAX(60, boost::lexical_cast<int>(strTemp));
(void) sectionSingleB(secConfig, SECTION_PEER_START_MAX, strTemp);
PEER_START_MAX = MIN(1, boost::lexical_cast<int>(strTemp)); if (sectionSingleB(secConfig, SECTION_PEER_START_MAX, strTemp))
(void) sectionSingleB(secConfig, SECTION_PEER_CONNECT_LOW_WATER, strTemp); PEER_START_MAX = MAX(1, boost::lexical_cast<int>(strTemp));
if (sectionSingleB(secConfig, SECTION_PEER_CONNECT_LOW_WATER, strTemp))
PEER_CONNECT_LOW_WATER = MAX(1, boost::lexical_cast<int>(strTemp)); PEER_CONNECT_LOW_WATER = MAX(1, boost::lexical_cast<int>(strTemp));
(void) sectionSingleB(secConfig, SECTION_NETWORK_QUORUM, strTemp); if (sectionSingleB(secConfig, SECTION_NETWORK_QUORUM, strTemp))
NETWORK_QUORUM = MIN(0, boost::lexical_cast<int>(strTemp)); NETWORK_QUORUM = MIN(0, boost::lexical_cast<int>(strTemp));
(void) sectionSingleB(secConfig, SECTION_BELIEF_QUORUM, strTemp);
if (sectionSingleB(secConfig, SECTION_BELIEF_QUORUM, strTemp))
BELIEF_QUORUM = MIN(0, boost::lexical_cast<int>(strTemp)); BELIEF_QUORUM = MIN(0, boost::lexical_cast<int>(strTemp));
} }
} }