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/HttpDownloadCommand.h | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'src/HttpDownloadCommand.h') diff --git a/src/HttpDownloadCommand.h b/src/HttpDownloadCommand.h index ecb2e398..0b6edb63 100644 --- a/src/HttpDownloadCommand.h +++ b/src/HttpDownloadCommand.h @@ -36,27 +36,14 @@ #define _D_HTTP_DOWNLOAD_COMMAND_H_ #include "DownloadCommand.h" -#include "DownloadEngine.h" -#include "Socket.h" -#include "Request.h" -#include "common.h" -#include "TransferEncoding.h" -#include -#include -using namespace std; - -class HttpDownloadCommand:public DownloadCommand { -private: - map transferEncodings; +class HttpDownloadCommand : public DownloadCommand { protected: - virtual bool prepareForNextSegment(const Segment& currentSegment); + virtual bool prepareForNextSegment(); public: HttpDownloadCommand(int cuid, const RequestHandle req, DownloadEngine* e, const SocketHandle& s); - ~HttpDownloadCommand(); - - TransferEncoding* getTransferEncoding(const string& transferEncoding); + virtual ~HttpDownloadCommand(); }; #endif // _D_HTTP_DOWNLOAD_COMMAND_H_ -- cgit