From c9cb46577614273cd8e0d7f64e61ede47b38d93e Mon Sep 17 00:00:00 2001 From: jed Date: Wed, 14 Nov 2012 16:28:33 -0800 Subject: [PATCH 1/3] . --- newcoin.vcxproj | 1 - newcoin.vcxproj.filters | 3 --- test/config.js | 3 ++- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/newcoin.vcxproj b/newcoin.vcxproj index 32ee35c9e4..92e02d4a5e 100644 --- a/newcoin.vcxproj +++ b/newcoin.vcxproj @@ -145,7 +145,6 @@ - diff --git a/newcoin.vcxproj.filters b/newcoin.vcxproj.filters index 0380497b01..c33506595e 100644 --- a/newcoin.vcxproj.filters +++ b/newcoin.vcxproj.filters @@ -198,9 +198,6 @@ Source Files - - Source Files - Source Files diff --git a/test/config.js b/test/config.js index 42ce8bea47..425478cef2 100644 --- a/test/config.js +++ b/test/config.js @@ -14,12 +14,13 @@ exports.servers = { // A local test server. "alpha" : { 'trusted' : true, + 'no_server' : true, // "peer_ip" : "0.0.0.0", // "peer_port" : 51235, 'rpc_ip' : "0.0.0.0", 'rpc_port' : 5005, 'websocket_ip' : "127.0.0.1", - 'websocket_port' : 6005, + 'websocket_port' : 5006, // 'validation_seed' : "shhDFVsmS2GSu5vUyZSPXYfj1r79h", // 'validators' : "n9L8LZZCwsdXzKUN9zoVxs4YznYXZ9hEhsQZY7aVpxtFaSceiyDZ beta" } From 2c6b001b25ff71b01bd4dc814601bad41cc6a08c Mon Sep 17 00:00:00 2001 From: jed Date: Wed, 21 Nov 2012 10:34:07 -0800 Subject: [PATCH 2/3] . --- src/cpp/ripple/Config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cpp/ripple/Config.h b/src/cpp/ripple/Config.h index 2caf47abfa..53d91f6921 100644 --- a/src/cpp/ripple/Config.h +++ b/src/cpp/ripple/Config.h @@ -21,7 +21,7 @@ #define CONFIG_FILE_NAME SYSTEM_NAME "d.cfg" // rippled.cfg -#define DEFAULT_VALIDATORS_SITE "redstem.com" +#define DEFAULT_VALIDATORS_SITE "" #define VALIDATORS_FILE_NAME "validators.txt" const int SYSTEM_PEER_PORT = 6561; From 20f0ca6689be9921c75dc2b7451d41d142e7d8a9 Mon Sep 17 00:00:00 2001 From: jed Date: Wed, 21 Nov 2012 10:54:07 -0800 Subject: [PATCH 3/3] windows --- newcoin.vcxproj | 1 + newcoin.vcxproj.filters | 3 +++ src/cpp/ripple/UniqueNodeList.cpp | 19 +++++++++++-------- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/newcoin.vcxproj b/newcoin.vcxproj index 1891a5d7a3..6a20b4ec24 100644 --- a/newcoin.vcxproj +++ b/newcoin.vcxproj @@ -124,6 +124,7 @@ + diff --git a/newcoin.vcxproj.filters b/newcoin.vcxproj.filters index 064de313cd..8b4cedd1e3 100644 --- a/newcoin.vcxproj.filters +++ b/newcoin.vcxproj.filters @@ -342,6 +342,9 @@ Source Files + + Source Files + diff --git a/src/cpp/ripple/UniqueNodeList.cpp b/src/cpp/ripple/UniqueNodeList.cpp index 9b9c55a5d1..df37f6d4df 100644 --- a/src/cpp/ripple/UniqueNodeList.cpp +++ b/src/cpp/ripple/UniqueNodeList.cpp @@ -1547,14 +1547,17 @@ void UniqueNodeList::validatorsResponse(const boost::system::error_code& err, st void UniqueNodeList::nodeNetwork() { - HttpsClient::httpsGet( - theApp->getIOService(), - theConfig.VALIDATORS_SITE, - 443, - VALIDATORS_FILE_PATH, - VALIDATORS_FILE_BYTES_MAX, - boost::posix_time::seconds(VALIDATORS_FETCH_SECONDS), - boost::bind(&UniqueNodeList::validatorsResponse, this, _1, _2)); + if(!theConfig.VALIDATORS_SITE.empty()) + { + HttpsClient::httpsGet( + theApp->getIOService(), + theConfig.VALIDATORS_SITE, + 443, + VALIDATORS_FILE_PATH, + VALIDATORS_FILE_BYTES_MAX, + boost::posix_time::seconds(VALIDATORS_FETCH_SECONDS), + boost::bind(&UniqueNodeList::validatorsResponse, this, _1, _2)); + } } void UniqueNodeList::nodeBootstrap()