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

This commit is contained in:
JoelKatz
2012-03-11 17:24:21 -07:00
7 changed files with 36 additions and 0 deletions

View File

@@ -540,6 +540,16 @@ void Peer::punishPeer(PeerPunish)
{
}
Json::Value Peer::getJson() {
Json::Value ret(Json::objectValue);
ret["ip"] = mSocket.remote_endpoint().address().to_string();
ret["port"] = mSocket.remote_endpoint().port();
ret["hanko"] = mHanko.ToString();
return ret;
}
#if 0
/*