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' of github.com:jedmccaleb/NewCoin

Browse Source 
Conflicts:
	src/RPCServer.cpp
This commit is contained in:
jed
2012-06-24 22:56:18 -07:00
parent 5ea05a4710 55f370c6bc
commit b0a65050e0
10 changed files with 412 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Peer.cpp
View File

@@ -1164,7 +1164,7 @@ Json::Value Peer::getJson()
{
Json::Value ret(Json::objectValue);
ret["this"] = ADDRESS(this);
//ret["this"] = ADDRESS(this);
ret["public_key"] = mNodePublic.ToString();
ret["ip"] = mIpPortConnect.first;
ret["port"] = mIpPortConnect.second;
@@ -1178,12 +1178,12 @@ Json::Value Peer::getJson()
if (mHello.has_protoversionminor() && mHello.has_protoversionmajor())
ret["protocol"] = boost::lexical_cast<std::string>(mHello.protoversionmajor()) + "." +
boost::lexical_cast<std::string>(mHello.protoversionminor());
/*
if (!mIpPort.first.empty())
{
ret["verified_ip"] = mIpPort.first;
ret["verified_port"] = mIpPort.second;
}
}*/
return ret;
}