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

Make debug easier.

Browse Source
This commit is contained in:
JoelKatz
2012-05-08 14:32:58 -07:00
parent 0968e0229b
commit 7570122722
2 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/Peer.cpp
View File

@@ -38,7 +38,7 @@ void Peer::handle_write(const boost::system::error_code& error, size_t bytes_tra
if(error)
{
detach();
detach("hw");
return;
}
@@ -53,8 +53,11 @@ void Peer::handle_write(const boost::system::error_code& error, size_t bytes_tra
}
}
void Peer::detach()
void Peer::detach(const char *rsn)
{
#ifdef DEBUG
std::cerr << "DETACHING PEER: " << rsn << std::endl;
#endif
boost::system::error_code ecCancel;
(void) mVerifyTimer.cancel();
@@ -90,7 +93,7 @@ void Peer::handleVerifyTimer(const boost::system::error_code& ecResult)
else
{
std::cerr << "Peer failed to verify in time." << std::endl;
detach();
detach("hvt");
}
}
@@ -114,7 +117,7 @@ void Peer::connect(const std::string strIp, int iPort)
if (err || itrEndpoint == boost::asio::ip::tcp::resolver::iterator())
{
std::cerr << "Peer::connect: Bad IP" << std::endl;
detach();
detach("c");
return;
}
else
@@ -125,7 +128,7 @@ void Peer::connect(const std::string strIp, int iPort)
if (err)
{
std::cerr << "Peer::connect: Failed to set timer." << std::endl;
detach();
detach("c2");
return;
}
}
@@ -154,7 +157,7 @@ void Peer::handleStart(const boost::system::error_code& error)
if (error)
{
std::cerr << "Peer::handleStart: failed:" << error << std::endl;
detach();
detach("hs");
}
else
{
@@ -169,7 +172,7 @@ void Peer::handleConnect(const boost::system::error_code& error, boost::asio::ip
if (error)
{
std::cerr << "Connect peer: failed:" << error << std::endl;
detach();
detach("hc");
}
else
{
@@ -198,13 +201,13 @@ void Peer::connected(const boost::system::error_code& error)
if (error)
{
std::cerr << "Remote peer: accept error: " << strIp << " " << iPort << " : " << error << std::endl;
detach();
detach("ctd");
}
else if (!theApp->getConnectionPool().peerRegister(shared_from_this(), strIp, iPort))
{
std::cerr << "Remote peer: rejecting: " << strIp << " " << iPort << std::endl;
// XXX Reject with a rejection message: already connected
detach();
detach("ctd2");
}
else
{
@@ -277,14 +280,14 @@ void Peer::handle_read_header(const boost::system::error_code& error)
// WRITEME: Compare to maximum message length, abort if too large
if(msg_len>(32*1024*1024))
{
detach();
detach("hrh");
return;
}
start_read_body(msg_len);
}
else
{
detach();
detach("hrh2");
std::cerr << "Peer::handle_read_header: Error: " << error << std::endl; //else BOOST_LOG_TRIVIAL(info) << "Error: " << error;
}
}
@@ -298,7 +301,7 @@ void Peer::handle_read_body(const boost::system::error_code& error)
}
else
{
detach();
detach("hrb");
std::cerr << "Peer::handle_read_body: Error: " << error << std::endl; //else BOOST_LOG_TRIVIAL(info) << "Error: " << error;
}
}
@@ -315,7 +318,7 @@ void Peer::processReadBuffer()
if (mIpPort.first.empty() == (type == newcoin::mtHELLO))
{
std::cerr << "Wrong message type: " << type << std::endl;
detach();
detach("prb1");
}
else
{
@@ -551,7 +554,7 @@ void Peer::recvHello(newcoin::TMHello& packet)
if (bDetach)
{
mNodePublic.clear();
detach();
detach("recvh");
}
}

2
src/Peer.h
View File

@@ -104,7 +104,7 @@ public:
void connect(const std::string strIp, int iPort);
void connected(const boost::system::error_code& error);
void detach();
void detach(const char *);
bool samePeer(Peer::pointer p) { return samePeer(*p); }
bool samePeer(const Peer& p) { return this == &p; }