github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

Catch exception from Socket::getPeerInfo() when pooling connection 

Socket::getPeerInfo() may fail if its TCP connection has already
disconnected. In this case, we log this error. The success or failure
of pooling connection should not affect the later execution of the
program.
pull/28/head
Tatsuhiro Tsujikawa 2012-09-02 17:35:50 +09:00
parent 9840955798
commit 2a51949132
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/DownloadEngine.cc
View File

@ -347,6 +347,22 @@ void DownloadEngine::poolSocket
poolSocket(createSockPoolKey(ipaddr, port, A2STR::NIL,proxyhost,proxyport),e);
}
namespace {
bool getPeerInfo(std::pair<std::string, uint16_t>& res,
const SharedHandle<SocketCore>& socket)
{
try {
socket->getPeerInfo(res);
return true;
} catch(RecoverableException& e) {
// socket->getPeerInfo() can fail if the socket has been
// disconnected.
A2_LOG_INFO_EX("Getting peer info failed. Pooling socket canceled.", e);
return false;
}
}
} // namespace
void DownloadEngine::poolSocket(const SharedHandle<Request>& request,
const SharedHandle<Request>& proxyRequest,
const SharedHandle<SocketCore>& socket,
@ -354,9 +370,10 @@ void DownloadEngine::poolSocket(const SharedHandle<Request>& request,
{
if(!proxyRequest) {
std::pair<std::string, uint16_t> peerInfo;
socket->getPeerInfo(peerInfo);
poolSocket(peerInfo.first, peerInfo.second,
A2STR::NIL, 0, socket, timeout);
if(getPeerInfo(peerInfo, socket)) {
poolSocket(peerInfo.first, peerInfo.second,
A2STR::NIL, 0, socket, timeout);
}
} else {
// If proxy is defined, then pool socket with its hostname.
poolSocket(request->getHost(), request->getPort(),
@ -375,9 +392,10 @@ void DownloadEngine::poolSocket
{
if(!proxyRequest) {
std::pair<std::string, uint16_t> peerInfo;
socket->getPeerInfo(peerInfo);
poolSocket(peerInfo.first, peerInfo.second, username,
A2STR::NIL, 0, socket, options, timeout);
if(getPeerInfo(peerInfo, socket)) {
poolSocket(peerInfo.first, peerInfo.second, username,
A2STR::NIL, 0, socket, options, timeout);
}
} else {
// If proxy is defined, then pool socket with its hostname.
poolSocket(request->getHost(), request->getPort(), username,