* apt-pkg/deb/dpkgpm.cc:

[apt.git] / methods / http.h

diff --git a/methods/http.h b/methods/http.h
index 1a22c5ae527be2e7fc7df6e914dd72e02a862eed..0bc019e771af46fd9997f52582692ab26d6c5b72 100644 (file)
--- a/methods/http.h
+++ b/methods/http.h
@@ -1,8 +1,9 @@
 // -*- mode: cpp; mode: fold -*-
 // -*- mode: cpp; mode: fold -*-

-// Description                                                         /*{{{*/// $Id: http.h,v 1.5 1998/12/05 04:19:06 jgg Exp $
+// Description                                                         /*{{{*/// $Id: http.h,v 1.12 2002/04/18 05:09:38 jgg Exp $
+// $Id: http.h,v 1.12 2002/04/18 05:09:38 jgg Exp $

 /* ######################################################################
 
 /* ######################################################################
 

-   HTTP Aquire Method - This is the HTTP aquire method for APT.
+   HTTP Acquire Method - This is the HTTP aquire method for APT.

 
    ##################################################################### */
                                                                        /*}}}*/
 
    ##################################################################### */
                                                                        /*}}}*/


@@ -12,6 +13,11 @@
 
 #define MAXLEN 360
 
 
 #define MAXLEN 360
 

+#include <apt-pkg/hashes.h>
+
+using std::cout;
+using std::endl;
+

 class HttpMethod;
 
 class CircleBuf
 class HttpMethod;
 
 class CircleBuf


@@ -25,6 +31,11 @@ class CircleBuf
    unsigned long MaxGet;
    struct timeval Start;
    
    unsigned long MaxGet;
    struct timeval Start;
    

+   static unsigned long BwReadLimit;
+   static unsigned long BwTickReadData;
+   static struct timeval BwReadTick;
+   static const unsigned int BW_HZ;
+

    unsigned long LeftRead()
    {
       unsigned long Sz = Size - (InP - OutP);
    unsigned long LeftRead()
    {
       unsigned long Sz = Size - (InP - OutP);


@@ -45,7 +56,7 @@ class CircleBuf
    
    public:
    
    
    public:
    

-   MD5Summation *MD5;
+   Hashes *Hash;

    
    // Read data in
    bool Read(int Fd);
    
    // Read data in
    bool Read(int Fd);


@@ -69,7 +80,7 @@ class CircleBuf
    void Stats();
 
    CircleBuf(unsigned long Size);
    void Stats();
 
    CircleBuf(unsigned long Size);

-   ~CircleBuf() {delete [] Buf;};
+   ~CircleBuf() {delete [] Buf; delete Hash;};

 };
 
 struct ServerState
 };
 
 struct ServerState


@@ -87,6 +98,11 @@ struct ServerState
    bool HaveContent;
    enum {Chunked,Stream,Closes} Encoding;
    enum {Header, Data} State;
    bool HaveContent;
    enum {Chunked,Stream,Closes} Encoding;
    enum {Header, Data} State;

+   bool Persistent;
+   string Location;
+   
+   // This is a Persistent attribute of the server itself.
+   bool Pipeline;

    
    HttpMethod *Owner;
    
    
    HttpMethod *Owner;
    


@@ -99,8 +115,21 @@ struct ServerState
    bool HeaderLine(string Line);
    bool Comp(URI Other) {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;};
    void Reset() {Major = 0; Minor = 0; Result = 0; Size = 0; StartPos = 0;
    bool HeaderLine(string Line);
    bool Comp(URI Other) {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;};
    void Reset() {Major = 0; Minor = 0; Result = 0; Size = 0; StartPos = 0;

-                 Encoding = Closes; time(&Date); ServerFd = -1;};
-   int RunHeaders();
+                 Encoding = Closes; time(&Date); ServerFd = -1; 
+                 Pipeline = true;};
+
+   /** \brief Result of the header acquire */
+   enum RunHeadersResult {
+      /** \brief Header ok */
+      RUN_HEADERS_OK,
+      /** \brief IO error while retrieving */
+      RUN_HEADERS_IO_ERROR,
+      /** \brief Parse error after retrieving */
+      RUN_HEADERS_PARSE_ERROR,
+   };
+   /** \brief Get the headers before the data */
+   RunHeadersResult RunHeaders();
+   /** \brief Transfer the data from the socket */

    bool RunData();
    
    bool Open();
    bool RunData();
    
    bool Open();


@@ -116,18 +145,44 @@ class HttpMethod : public pkgAcqMethod
    bool Go(bool ToFile,ServerState *Srv);
    bool Flush(ServerState *Srv);
    bool ServerDie(ServerState *Srv);
    bool Go(bool ToFile,ServerState *Srv);
    bool Flush(ServerState *Srv);
    bool ServerDie(ServerState *Srv);

-   int DealWithHeaders(FetchResult &Res,ServerState *Srv);

 
 

-   bool Fetch(FetchItem *);
+   /** \brief Result of the header parsing */
+   enum DealWithHeadersResult { 
+      /** \brief The file is open and ready */
+      FILE_IS_OPEN,
+      /** \brief We got a IMS hit, the file has not changed */
+      IMS_HIT,
+      /** \brief The server reported a unrecoverable error */
+      ERROR_UNRECOVERABLE,
+      /** \brief The server reported a error with a error content page */
+      ERROR_WITH_CONTENT_PAGE,
+      /** \brief A error on the client side */
+      ERROR_NOT_FROM_SERVER,
+      /** \brief A redirect or retry request */
+      TRY_AGAIN_OR_REDIRECT 
+   };
+   /** \brief Handle the retrieved header data */
+   DealWithHeadersResult DealWithHeaders(FetchResult &Res,ServerState *Srv);
+
+   /** \brief Try to AutoDetect the proxy */
+   bool AutoDetectProxy();
+
+   virtual bool Configuration(string Message);

    
    // In the event of a fatal signal this file will be closed and timestamped.
    static string FailFile;
    static int FailFd;
    static time_t FailTime;
    static void SigTerm(int);
    
    // In the event of a fatal signal this file will be closed and timestamped.
    static string FailFile;
    static int FailFd;
    static time_t FailTime;
    static void SigTerm(int);

+
+   protected:
+   virtual bool Fetch(FetchItem *);

    
    

+   string NextURI;
+   string AutoDetectProxyCmd;
+

    public:
    public:

-   friend ServerState;
+   friend class ServerState;

 
    FileFd *File;
    ServerState *Server;
 
    FileFd *File;
    ServerState *Server;


@@ -141,6 +196,4 @@ class HttpMethod : public pkgAcqMethod
    };
 };
 
    };
 };
 

-URI Proxy;
-

 #endif
 #endif