From 11907c175d9e3e6f4069df79dade320b6f93cd7f Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Thu, 15 Mar 2007 15:07:18 +0000 Subject: 2007-03-15 Tatsuhiro Tsujikawa To handle Segment as SegmentHandle: * src/AbstractCommand.cc (execute): Rewritten. * src/SegmentMan.h: Segment -> SegmentHandle Introducded HttpResponse class, HttpRequest class to improve code extensiveness and make it clear: * src/HttpDownloadCommand.cc: transfer encoders are now managed by HttpResponse class. * src/HttpRequest.h, src/HttpRequest.cc: New class. * src/HttpResponse.h, src/HttpResponse.cc: New class. * src/HttpConnection.cc: Contruction of http request were moved to HttpRequest class. * src/HttpResponseCommand.h, src/HttpResponseCommand.cc: Refactored. * src/HttpRequestCommand.cc (executeInternal): Rewritten. * src/HttpAuthConfig.h: New class. * src/Range.h: New class. To make FtpTunnel{Request, Response}Command and HttpProxy{Request, Response}Command derived from AbstractProxy{Request, Response}Command: * src/FtpTunnelResponseCommand.h, src/FtpTunnelResponseCommand.cc: Derived from AbstractProxyRequestCommand class. * src/FtpTunnelRequestCommand.h, src/FtpTunnelRequestCommand.cc: Derived from AbstractProxyResponseCommand class. * src/HttpProxyRequestCommand.h, src/HttpProxyRequestCommand.cc: Derived from AbstractProxyRequestCommand class. * src/HttpProxyResponseCommand.h, src/HttpProxyResponseCommand.cc: Derived from AbstractProxyResponseCommand class. * src/AbstractProxyRequestCommand.h, src/AbstractProxyRequestCommand.cc : New class. * src/AbstractProxyResponseCommand.h, src/AbstractProxyResponseCommand.cc: New class. To add netrc support: * src/Netrc.h, src/Netrc.cc: New class. * src/Util.h, src/Util.cc (split): New function. * src/HttpHeader.cc (getRange): Fixed so that it inspects "Content-Range" header instead of "Range" header. * src/HttpHeader.h (getStatus): Removed. (setStatus): Removed. * src/Segment.h (getPositionToWrite): New function. --- src/DownloadCommand.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/DownloadCommand.h') diff --git a/src/DownloadCommand.h b/src/DownloadCommand.h index 66179336..7654e579 100644 --- a/src/DownloadCommand.h +++ b/src/DownloadCommand.h @@ -44,23 +44,25 @@ using namespace std; class DownloadCommand : public AbstractCommand { private: - long long int lastSize; int32_t maxDownloadSpeedLimit; int32_t startupIdleTime; int32_t lowestDownloadSpeedLimit; PeerStatHandle peerStat; protected: - bool executeInternal(Segment& segment); + TransferEncodingHandle transferDecoder; - virtual bool prepareForNextSegment(const Segment& currentSegment); + virtual bool executeInternal(); + + virtual bool prepareForNextSegment(); public: DownloadCommand(int cuid, const RequestHandle req, DownloadEngine* e, const SocketHandle& s); virtual ~DownloadCommand(); - virtual TransferEncoding* getTransferEncoding(const string& transferEncoding) = 0; - - string transferEncoding; + void setTransferDecoder(const TransferEncodingHandle& transferDecoder) + { + this->transferDecoder = transferDecoder; + } void setMaxDownloadSpeedLimit(int32_t maxDownloadSpeedLimit) { this->maxDownloadSpeedLimit = maxDownloadSpeedLimit; -- cgit