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

2010-06-12 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 

Renamed member variables. Removed unused member variable.
	* src/AbstractProxyRequestCommand.cc
	* src/FtpInitiateConnectionCommand.cc
	* src/FtpNegotiationCommand.cc
	* src/HttpConnection.cc
	* src/HttpConnection.h
	* src/HttpInitiateConnectionCommand.cc
pull/1/head
Tatsuhiro Tsujikawa 2010-06-12 09:44:10 +00:00
parent 8742959320
commit f8590aa5b9
7 changed files with 51 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2010-06-12 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Renamed member variables. Removed unused member variable.
* src/AbstractProxyRequestCommand.cc
* src/FtpInitiateConnectionCommand.cc
* src/FtpNegotiationCommand.cc
* src/HttpConnection.cc
* src/HttpConnection.h
* src/HttpInitiateConnectionCommand.cc
2010-06-12 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 2010-06-12 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Removed HandleRegistry Removed HandleRegistry

2
src/AbstractProxyRequestCommand.cc
View File

@ -64,7 +64,7 @@ AbstractProxyRequestCommand::AbstractProxyRequestCommand
: :
AbstractCommand(cuid, req, fileEntry, requestGroup, e, s), AbstractCommand(cuid, req, fileEntry, requestGroup, e, s),
_proxyRequest(proxyRequest), _proxyRequest(proxyRequest),
_httpConnection(new HttpConnection(cuid, s, getOption().get())) _httpConnection(new HttpConnection(cuid, s))
{ {
setTimeout(getOption()->getAsInt(PREF_CONNECT_TIMEOUT)); setTimeout(getOption()->getAsInt(PREF_CONNECT_TIMEOUT));
disableReadCheckSocket(); disableReadCheckSocket();

4
src/FtpInitiateConnectionCommand.cc
View File

@ -104,7 +104,7 @@ Command* FtpInitiateConnectionCommand::createNextCommand
// Use GET for FTP via HTTP proxy. // Use GET for FTP via HTTP proxy.
getRequest()->setMethod(Request::METHOD_GET); getRequest()->setMethod(Request::METHOD_GET);
SharedHandle<HttpConnection> hc SharedHandle<HttpConnection> hc
(new HttpConnection(getCuid(), getSocket(), getOption().get())); (new HttpConnection(getCuid(), getSocket()));
HttpRequestCommand* c = HttpRequestCommand* c =
new HttpRequestCommand(getCuid(), getRequest(), getFileEntry(), new HttpRequestCommand(getCuid(), getRequest(), getFileEntry(),
@ -136,7 +136,7 @@ Command* FtpInitiateConnectionCommand::createNextCommand
// Use GET for FTP via HTTP proxy. // Use GET for FTP via HTTP proxy.
getRequest()->setMethod(Request::METHOD_GET); getRequest()->setMethod(Request::METHOD_GET);
SharedHandle<HttpConnection> hc SharedHandle<HttpConnection> hc
(new HttpConnection(getCuid(), pooledSocket, getOption().get())); (new HttpConnection(getCuid(), pooledSocket));
HttpRequestCommand* c = HttpRequestCommand* c =
new HttpRequestCommand(getCuid(), getRequest(), getFileEntry(), new HttpRequestCommand(getCuid(), getRequest(), getFileEntry(),

2
src/FtpNegotiationCommand.cc
View File

@ -598,7 +598,7 @@ bool FtpNegotiationCommand::resolveProxy()
_dataSocket->establishConnection(_proxyAddr, proxyReq->getPort()); _dataSocket->establishConnection(_proxyAddr, proxyReq->getPort());
disableReadCheckSocket(); disableReadCheckSocket();
setWriteCheckSocket(_dataSocket); setWriteCheckSocket(_dataSocket);
_http.reset(new HttpConnection(getCuid(), _dataSocket, getOption().get())); _http.reset(new HttpConnection(getCuid(), _dataSocket));
_sequence = SEQ_SEND_TUNNEL_REQUEST; _sequence = SEQ_SEND_TUNNEL_REQUEST;
return false; return false;
} }

54
src/HttpConnection.cc
View File

@ -65,12 +65,10 @@ HttpRequestEntry::HttpRequestEntry
HttpRequestEntry::~HttpRequestEntry() {} HttpRequestEntry::~HttpRequestEntry() {}
HttpConnection::HttpConnection(cuid_t cuid, HttpConnection::HttpConnection(cuid_t cuid, const SocketHandle& socket):
const SocketHandle& socket, _cuid(cuid), _socket(socket),
const Option* op):
cuid(cuid), socket(socket),
_socketBuffer(socket), _socketBuffer(socket),
option(op), logger(LogFactory::getInstance()) _logger(LogFactory::getInstance())
{} {}
std::string HttpConnection::eraseConfidentialInfo(const std::string& request) std::string HttpConnection::eraseConfidentialInfo(const std::string& request)
@ -95,45 +93,45 @@ std::string HttpConnection::eraseConfidentialInfo(const std::string& request)
void HttpConnection::sendRequest(const SharedHandle<HttpRequest>& httpRequest) void HttpConnection::sendRequest(const SharedHandle<HttpRequest>& httpRequest)
{ {
std::string request = httpRequest->createRequest(); std::string request = httpRequest->createRequest();
if(logger->info()) { if(_logger->info()) {
logger->info(MSG_SENDING_REQUEST, _logger->info(MSG_SENDING_REQUEST,
util::itos(cuid).c_str(), util::itos(_cuid).c_str(),
eraseConfidentialInfo(request).c_str()); eraseConfidentialInfo(request).c_str());
} }
_socketBuffer.pushStr(request); _socketBuffer.pushStr(request);
_socketBuffer.send(); _socketBuffer.send();
SharedHandle<HttpRequestEntry> entry(new HttpRequestEntry(httpRequest)); SharedHandle<HttpRequestEntry> entry(new HttpRequestEntry(httpRequest));
outstandingHttpRequests.push_back(entry); _outstandingHttpRequests.push_back(entry);
} }
void HttpConnection::sendProxyRequest void HttpConnection::sendProxyRequest
(const SharedHandle<HttpRequest>& httpRequest) (const SharedHandle<HttpRequest>& httpRequest)
{ {
std::string request = httpRequest->createProxyRequest(); std::string request = httpRequest->createProxyRequest();
if(logger->info()) { if(_logger->info()) {
logger->info(MSG_SENDING_REQUEST, _logger->info(MSG_SENDING_REQUEST,
util::itos(cuid).c_str(), util::itos(_cuid).c_str(),
eraseConfidentialInfo(request).c_str()); eraseConfidentialInfo(request).c_str());
} }
_socketBuffer.pushStr(request); _socketBuffer.pushStr(request);
_socketBuffer.send(); _socketBuffer.send();
SharedHandle<HttpRequestEntry> entry(new HttpRequestEntry(httpRequest)); SharedHandle<HttpRequestEntry> entry(new HttpRequestEntry(httpRequest));
outstandingHttpRequests.push_back(entry); _outstandingHttpRequests.push_back(entry);
} }
SharedHandle<HttpResponse> HttpConnection::receiveResponse() SharedHandle<HttpResponse> HttpConnection::receiveResponse()
{ {
if(outstandingHttpRequests.empty()) { if(_outstandingHttpRequests.empty()) {
throw DL_ABORT_EX(EX_NO_HTTP_REQUEST_ENTRY_FOUND); throw DL_ABORT_EX(EX_NO_HTTP_REQUEST_ENTRY_FOUND);
} }
HttpRequestEntryHandle entry = outstandingHttpRequests.front(); HttpRequestEntryHandle entry = _outstandingHttpRequests.front();
HttpHeaderProcessorHandle proc = entry->getHttpHeaderProcessor(); HttpHeaderProcessorHandle proc = entry->getHttpHeaderProcessor();
unsigned char buf[512]; unsigned char buf[512];
size_t size = sizeof(buf); size_t size = sizeof(buf);
socket->peekData(buf, size); _socket->peekData(buf, size);
if(size == 0) { if(size == 0) {
if(socket->wantRead() || socket->wantWrite()) { if(_socket->wantRead() || _socket->wantWrite()) {
return SharedHandle<HttpResponse>(); return SharedHandle<HttpResponse>();
} else { } else {
throw DL_RETRY_EX(EX_INVALID_RESPONSE); throw DL_RETRY_EX(EX_INVALID_RESPONSE);
@ -141,31 +139,31 @@ SharedHandle<HttpResponse> HttpConnection::receiveResponse()
} }
proc->update(buf, size); proc->update(buf, size);
if(!proc->eoh()) { if(!proc->eoh()) {
socket->readData(buf, size); _socket->readData(buf, size);
return SharedHandle<HttpResponse>(); return SharedHandle<HttpResponse>();
} }
size_t putbackDataLength = proc->getPutBackDataLength(); size_t putbackDataLength = proc->getPutBackDataLength();
size -= putbackDataLength; size -= putbackDataLength;
socket->readData(buf, size); _socket->readData(buf, size);
if(logger->info()) { if(_logger->info()) {
logger->info(MSG_RECEIVE_RESPONSE, _logger->info(MSG_RECEIVE_RESPONSE,
util::itos(cuid).c_str(), proc->getHeaderString().c_str()); util::itos(_cuid).c_str(), proc->getHeaderString().c_str());
} }
SharedHandle<HttpHeader> httpHeader = proc->getHttpResponseHeader(); SharedHandle<HttpHeader> httpHeader = proc->getHttpResponseHeader();
SharedHandle<HttpResponse> httpResponse(new HttpResponse()); SharedHandle<HttpResponse> httpResponse(new HttpResponse());
httpResponse->setCuid(cuid); httpResponse->setCuid(_cuid);
httpResponse->setHttpHeader(httpHeader); httpResponse->setHttpHeader(httpHeader);
httpResponse->setHttpRequest(entry->getHttpRequest()); httpResponse->setHttpRequest(entry->getHttpRequest());
outstandingHttpRequests.pop_front(); _outstandingHttpRequests.pop_front();
return httpResponse; return httpResponse;
} }
bool HttpConnection::isIssued(const SharedHandle<Segment>& segment) const bool HttpConnection::isIssued(const SharedHandle<Segment>& segment) const
{ {
for(HttpRequestEntries::const_iterator itr = outstandingHttpRequests.begin(), for(HttpRequestEntries::const_iterator itr = _outstandingHttpRequests.begin(),
eoi = outstandingHttpRequests.end(); itr != eoi; ++itr) { eoi = _outstandingHttpRequests.end(); itr != eoi; ++itr) {
SharedHandle<HttpRequest> httpRequest = (*itr)->getHttpRequest(); SharedHandle<HttpRequest> httpRequest = (*itr)->getHttpRequest();
if(httpRequest->getSegment() == segment) { if(httpRequest->getSegment() == segment) {
return true; return true;
@ -176,10 +174,10 @@ bool HttpConnection::isIssued(const SharedHandle<Segment>& segment) const
SharedHandle<HttpRequest> HttpConnection::getFirstHttpRequest() const SharedHandle<HttpRequest> HttpConnection::getFirstHttpRequest() const
{ {
if(outstandingHttpRequests.empty()) { if(_outstandingHttpRequests.empty()) {
return SharedHandle<HttpRequest>(); return SharedHandle<HttpRequest>();
} else { } else {
return outstandingHttpRequests.front()->getHttpRequest(); return _outstandingHttpRequests.front()->getHttpRequest();
} }
} }

14
src/HttpConnection.h
View File

@ -79,19 +79,17 @@ typedef std::deque<HttpRequestEntryHandle> HttpRequestEntries;
class HttpConnection { class HttpConnection {
private: private:
cuid_t cuid; cuid_t _cuid;
SharedHandle<SocketCore> socket; SharedHandle<SocketCore> _socket;
SocketBuffer _socketBuffer; SocketBuffer _socketBuffer;
const Option* option; const Option* _option;
Logger* logger; Logger* _logger;
HttpRequestEntries outstandingHttpRequests; HttpRequestEntries _outstandingHttpRequests;
std::string eraseConfidentialInfo(const std::string& request); std::string eraseConfidentialInfo(const std::string& request);
public: public:
HttpConnection(cuid_t cuid, HttpConnection(cuid_t cuid, const SharedHandle<SocketCore>& socket);
const SharedHandle<SocketCore>& socket,
const Option* op);
/** /**
* Sends Http request. * Sends Http request.

6
src/HttpInitiateConnectionCommand.cc
View File

@ -98,7 +98,7 @@ Command* HttpInitiateConnectionCommand::createNextCommand
command = c; command = c;
} else if(proxyMethod == V_GET) { } else if(proxyMethod == V_GET) {
SharedHandle<HttpConnection> httpConnection SharedHandle<HttpConnection> httpConnection
(new HttpConnection(getCuid(), getSocket(), getOption().get())); (new HttpConnection(getCuid(), getSocket()));
HttpRequestCommand* c = new HttpRequestCommand(getCuid(), HttpRequestCommand* c = new HttpRequestCommand(getCuid(),
getRequest(), getRequest(),
getFileEntry(), getFileEntry(),
@ -115,7 +115,7 @@ Command* HttpInitiateConnectionCommand::createNextCommand
} }
} else { } else {
SharedHandle<HttpConnection> httpConnection SharedHandle<HttpConnection> httpConnection
(new HttpConnection(getCuid(), pooledSocket, getOption().get())); (new HttpConnection(getCuid(), pooledSocket));
HttpRequestCommand* c = new HttpRequestCommand(getCuid(), HttpRequestCommand* c = new HttpRequestCommand(getCuid(),
getRequest(), getRequest(),
getFileEntry(), getFileEntry(),
@ -143,7 +143,7 @@ Command* HttpInitiateConnectionCommand::createNextCommand
setSocket(pooledSocket); setSocket(pooledSocket);
} }
SharedHandle<HttpConnection> httpConnection SharedHandle<HttpConnection> httpConnection
(new HttpConnection(getCuid(), getSocket(), getOption().get())); (new HttpConnection(getCuid(), getSocket()));
HttpRequestCommand* c = HttpRequestCommand* c =
new HttpRequestCommand(getCuid(), getRequest(), getFileEntry(), new HttpRequestCommand(getCuid(), getRequest(), getFileEntry(),
getRequestGroup(), getRequestGroup(),