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

Simply getPeersJson and display connection source.

Browse Source
This commit is contained in:
Arthur Britto
2012-06-14 19:06:09 -07:00
parent a7e4523b64
commit 0b60693c7a
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ConnectionPool.cpp
View File

@@ -248,16 +248,12 @@ bool ConnectionPool::connectTo(const std::string& strIp, int iPort)
Json::Value ConnectionPool::getPeersJson() Json::Value ConnectionPool::getPeersJson()
{ {
Json::Value ret(Json::arrayValue); Json::Value ret(Json::arrayValue);
std::vector<Peer::pointer> vppPeers = getPeerVector();
boost::mutex::scoped_lock sl(mPeerLock); BOOST_FOREACH(Peer::pointer peer, vppPeers)
BOOST_FOREACH(naPeer pair, mConnectedMap)
{ {
Peer::pointer peer = pair.second; ret.append(peer->getJson());
if (!peer)
std::cerr << "CP::GPH null peer" << std::endl;
else ret.append(peer->getJson());
} }
return ret; return ret;
@@ -285,7 +281,9 @@ bool ConnectionPool::peerConnected(Peer::pointer peer, const NewcoinAddress& na)
{ {
bool bSuccess; bool bSuccess;
std::cerr << "ConnectionPool::peerConnected: " << na.humanNodePublic() << std::endl; std::cerr << "ConnectionPool::peerConnected: " << na.humanNodePublic()
<< " " << peer->getIP() << " " << peer->getPort()
<< std::endl;
assert(!!peer); assert(!!peer);
if (na == theApp->getWallet().getNodePublic()) if (na == theApp->getWallet().getNodePublic())
{ {

9
src/Peer.h
View File

@@ -14,9 +14,9 @@
enum PeerPunish enum PeerPunish
{ {
PP_INVALID_REQUEST = 1, // The peer sent a request that makes no sense PP_INVALID_REQUEST = 1, // The peer sent a request that makes no sense
PP_UNKNOWN_REQUEST = 2, // The peer sent a request that might be garbage PP_UNKNOWN_REQUEST = 2, // The peer sent a request that might be garbage
PP_UNWANTED_DATA = 3, // The peer sent us data we didn't want/need PP_UNWANTED_DATA = 3, // The peer sent us data we didn't want/need
}; };
typedef std::pair<std::string,int> ipPort; typedef std::pair<std::string,int> ipPort;
@@ -56,10 +56,7 @@ protected:
Peer(boost::asio::io_service& io_service, boost::asio::ssl::context& ctx); Peer(boost::asio::io_service& io_service, boost::asio::ssl::context& ctx);
void handle_write(const boost::system::error_code& error, size_t bytes_transferred); void handle_write(const boost::system::error_code& error, size_t bytes_transferred);
//void handle_read(const boost::system::error_code& error, size_t bytes_transferred);
void handle_read_header(const boost::system::error_code& error); void handle_read_header(const boost::system::error_code& error);
void handle_read_body(const boost::system::error_code& error); void handle_read_body(const boost::system::error_code& error);
void processReadBuffer(); void processReadBuffer();