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 crash on bad resolve. Fix peer shutdown logic. Fix peer tracking logic.

Browse Source
This commit is contained in:
JoelKatz
2012-01-19 18:38:31 -08:00
parent 7049d036d9
commit b93613e835
4 changed files with 51 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
ConnectionPool.cpp
View File

@@ -53,7 +53,7 @@ bool ConnectionPool::addToMap(const uint160& hanko, Peer::pointer peer)
return peerMap.insert(std::make_pair(hanko, peer)).second;
}
bool ConnectionPool::delFromMap(const uint160& hanko, Peer::pointer peer)
bool ConnectionPool::delFromMap(const uint160& hanko)
{
boost::mutex::scoped_lock sl(peerLock);
std::map<uint160, Peer::pointer>::iterator it=peerMap.find(hanko);
@@ -84,20 +84,27 @@ std::map<uint160, Peer::pointer> ConnectionPool::getAllConnected()
bool ConnectionPool::connectTo(const std::string& host, const std::string& port)
{
boost::asio::ip::tcp::resolver res(theApp->getIOService());
boost::asio::ip::tcp::resolver::query query(host.c_str(), port.c_str());
boost::asio::ip::tcp::resolver::iterator it(res.resolve(query)), end;
Peer::pointer peer(Peer::create(theApp->getIOService()));
boost::system::error_code error = boost::asio::error::host_not_found;
while (error && (it!=end))
try
{
peer->getSocket().close();
peer->getSocket().connect(*it++, error);
boost::asio::ip::tcp::resolver res(theApp->getIOService());
boost::asio::ip::tcp::resolver::query query(host.c_str(), port.c_str());
boost::asio::ip::tcp::resolver::iterator it(res.resolve(query)), end;
Peer::pointer peer(Peer::create(theApp->getIOService()));
boost::system::error_code error = boost::asio::error::host_not_found;
while (error && (it!=end))
{
peer->getSocket().close();
peer->getSocket().connect(*it++, error);
}
if(error) return false;
boost::mutex::scoped_lock sl(peerLock);
mPeers.push_back(peer);
peer->connected(boost::system::error_code());
}
catch (...)
{
return false;
}
if(error) return false;
boost::mutex::scoped_lock sl(peerLock);
mPeers.push_back(peer);
peer->connected(boost::system::error_code());
return true;
}