ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into autoclient

Browse Source 
Conflicts:
	src/cpp/ripple/AutoSocket.h
This commit is contained in:
Arthur Britto
2013-02-01 19:01:10 -08:00
parent c834ce4e06 7e6e164513
commit 628a1bdd5f
53 changed files with 1726 additions and 748 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/cpp/ripple/UniqueNodeList.h
View File

@@ -88,7 +88,7 @@ private:
std::vector<int> viReferrals;
} scoreNode;
std::set<RippleAddress> sClusterNodes;
std::map<RippleAddress, std::string> sClusterNodes;
typedef boost::unordered_map<std::string,int> strIndex;
typedef std::pair<std::string,int> ipPort;
@@ -155,6 +155,7 @@ public:
bool nodeInUNL(const RippleAddress& naNodePublic);
bool nodeInCluster(const RippleAddress& naNodePublic);
bool nodeInCluster(const RippleAddress& naNodePublic, std::string& name);
void nodeBootstrap();
bool nodeLoad(boost::filesystem::path pConfig);