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

Fix a race condition.

Browse Source
This commit is contained in:
Arthur Britto
2012-04-29 17:28:50 -07:00
parent 024f14efa4
commit fe60a78882
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Peer.cpp
View File

@@ -151,8 +151,8 @@ void Peer::handleStart(const boost::system::error_code& error)
} }
else else
{ {
sendHello(); // Must compute mCookieHash before receiving a hello.
start_read_header(); start_read_header();
sendHello();
} }
} }
@@ -161,12 +161,12 @@ void Peer::handleConnect(const boost::system::error_code& error, boost::asio::ip
{ {
if (error) if (error)
{ {
std::cerr << "Socket Connect failed:" << error << std::endl; std::cerr << "Connect peer: failed:" << error << std::endl;
detach(); detach();
} }
else else
{ {
std::cerr << "Socket Connected." << std::endl; std::cerr << "Connect peer: success." << std::endl;
mSocketSsl.lowest_layer().set_option(boost::asio::ip::tcp::no_delay(true)); mSocketSsl.lowest_layer().set_option(boost::asio::ip::tcp::no_delay(true));
mSocketSsl.set_verify_mode(boost::asio::ssl::verify_none); mSocketSsl.set_verify_mode(boost::asio::ssl::verify_none);
@@ -186,16 +186,14 @@ void Peer::connected(const boost::system::error_code& error)
if (iPort == SYSTEM_PEER_PORT) if (iPort == SYSTEM_PEER_PORT)
iPort = -1; iPort = -1;
std::cerr << "Remote peer: accept: " << strIp << " " << iPort << std::endl;
if (error) if (error)
{ {
std::cerr << "Remote peer: accept error: " << error << std::endl; std::cerr << "Remote peer: accept error: " << strIp << " " << iPort << " : " << error << std::endl;
detach(); detach();
} }
else if (!theApp->getConnectionPool().peerRegister(shared_from_this(), strIp, iPort)) else if (!theApp->getConnectionPool().peerRegister(shared_from_this(), strIp, iPort))
{ {
std::cerr << "Remote peer: rejecting." << std::endl; std::cerr << "Remote peer: rejecting: " << strIp << " " << iPort << std::endl;
// XXX Reject with a rejection message: already connected // XXX Reject with a rejection message: already connected
detach(); detach();
} }
@@ -203,7 +201,7 @@ void Peer::connected(const boost::system::error_code& error)
{ {
// Not redundant ip and port, add to connection list. // Not redundant ip and port, add to connection list.
std::cerr << "Remote peer: accepted." << std::endl; std::cerr << "Remote peer: accepted: " << strIp << " " << iPort << std::endl;
//BOOST_LOG_TRIVIAL(info) << "Connected to Peer."; //BOOST_LOG_TRIVIAL(info) << "Connected to Peer.";
mIpPort = make_pair(strIp, iPort); mIpPort = make_pair(strIp, iPort);
@@ -304,9 +302,9 @@ void Peer::processReadBuffer()
std::cerr << "PRB(" << type << "), len=" << (mReadbuf.size()-HEADER_SIZE) << std::endl; std::cerr << "PRB(" << type << "), len=" << (mReadbuf.size()-HEADER_SIZE) << std::endl;
#endif #endif
// If not connected, only accept mtHELLO. Otherwise, don't accept mtHELLO.
if (mIpPort.first.empty() == (type == newcoin::mtHELLO)) if (mIpPort.first.empty() == (type == newcoin::mtHELLO))
{ {
// If not connectted, only accept mtHELLO. Otherwise, don't accept mtHELLO.
std::cerr << "Wrong message type: " << type << std::endl; std::cerr << "Wrong message type: " << type << std::endl;
detach(); detach();
} }