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

Removed socket readability check from checkIfConnectionEstablished()

pull/28/head
Tatsuhiro Tsujikawa 2012-10-15 23:27:51 +09:00
parent 841395f332
commit 4a4fec2c8c
1 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/AbstractCommand.cc
View File

@ -833,32 +833,30 @@ bool AbstractCommand::checkIfConnectionEstablished
const std::string& connectedAddr, const std::string& connectedAddr,
uint16_t connectedPort) uint16_t connectedPort)
{ {
if(socket->isReadable(0)) { std::string error = socket->getSocketError();
std::string error = socket->getSocketError(); if(!error.empty()) {
if(!error.empty()) { // See also InitiateConnectionCommand::executeInternal()
// See also InitiateConnectionCommand::executeInternal() e_->markBadIPAddress(connectedHostname, connectedAddr, connectedPort);
e_->markBadIPAddress(connectedHostname, connectedAddr, connectedPort); if(!e_->findCachedIPAddress(connectedHostname, connectedPort).empty()) {
if(!e_->findCachedIPAddress(connectedHostname, connectedPort).empty()) { A2_LOG_INFO(fmt(MSG_CONNECT_FAILED_AND_RETRY,
A2_LOG_INFO(fmt(MSG_CONNECT_FAILED_AND_RETRY, getCuid(),
getCuid(), connectedAddr.c_str(), connectedPort));
connectedAddr.c_str(), connectedPort)); Command* command =
Command* command = InitiateConnectionCommandFactory::createInitiateConnectionCommand
InitiateConnectionCommandFactory::createInitiateConnectionCommand (getCuid(), req_, fileEntry_, requestGroup_, e_);
(getCuid(), req_, fileEntry_, requestGroup_, e_); e_->setNoWait(true);
e_->setNoWait(true); e_->addCommand(command);
e_->addCommand(command); return false;
return false;
}
e_->removeCachedIPAddress(connectedHostname, connectedPort);
// Don't set error if proxy server is used and its method is GET.
if(resolveProxyMethod(req_->getProtocol()) != V_GET ||
!isProxyRequest(req_->getProtocol(), getOption())) {
e_->getRequestGroupMan()->getOrCreateServerStat
(req_->getHost(), req_->getProtocol())->setError();
}
throw DL_RETRY_EX
(fmt(MSG_ESTABLISHING_CONNECTION_FAILED, error.c_str()));
} }
e_->removeCachedIPAddress(connectedHostname, connectedPort);
// Don't set error if proxy server is used and its method is GET.
if(resolveProxyMethod(req_->getProtocol()) != V_GET ||
!isProxyRequest(req_->getProtocol(), getOption())) {
e_->getRequestGroupMan()->getOrCreateServerStat
(req_->getHost(), req_->getProtocol())->setError();
}
throw DL_RETRY_EX
(fmt(MSG_ESTABLISHING_CONNECTION_FAILED, error.c_str()));
} }
return true; return true;
} }