merged from the debian-sid branch

[apt.git] / methods / http.h

diff --git a/methods/http.h b/methods/http.h
index bac94e177d2822b4455e8f4361d84e6e219acbfd..7a3ccda5407bc32ddb368ae2cb962fd6492577ec 100644 (file)
--- a/methods/http.h
+++ b/methods/http.h
@@ -11,41 +11,42 @@
 #ifndef APT_HTTP_H
 #define APT_HTTP_H
 
 #ifndef APT_HTTP_H
 #define APT_HTTP_H
 

-#define MAXLEN 360
-
+#include <apt-pkg/strutl.h>

 
 

+#include <string>

 
 using std::cout;
 using std::endl;
 
 class HttpMethod;
 
 using std::cout;
 using std::endl;
 
 class HttpMethod;

+class Hashes;

 
 class CircleBuf
 {
    unsigned char *Buf;
 
 class CircleBuf
 {
    unsigned char *Buf;

-   unsigned long Size;
-   unsigned long InP;
-   unsigned long OutP;
-   string OutQueue;
-   unsigned long StrPos;
-   unsigned long MaxGet;
+   unsigned long long Size;
+   unsigned long long InP;
+   unsigned long long OutP;
+   std::string OutQueue;
+   unsigned long long StrPos;
+   unsigned long long MaxGet;

    struct timeval Start;
    
    struct timeval Start;
    

-   static unsigned long BwReadLimit;
-   static unsigned long BwTickReadData;
+   static unsigned long long BwReadLimit;
+   static unsigned long long BwTickReadData;

    static struct timeval BwReadTick;
    static const unsigned int BW_HZ;
 
    static struct timeval BwReadTick;
    static const unsigned int BW_HZ;
 

-   unsigned long LeftRead()
+   unsigned long long LeftRead() const

    {
    {

-      unsigned long Sz = Size - (InP - OutP);
+      unsigned long long Sz = Size - (InP - OutP);

       if (Sz > Size - (InP%Size))
         Sz = Size - (InP%Size);
       return Sz;
    }
       if (Sz > Size - (InP%Size))
         Sz = Size - (InP%Size);
       return Sz;
    }

-   unsigned long LeftWrite()
+   unsigned long long LeftWrite() const

    {
    {

-      unsigned long Sz = InP - OutP;
+      unsigned long long Sz = InP - OutP;

       if (InP > MaxGet)
         Sz = MaxGet - OutP;
       if (Sz > Size - (OutP%Size))
       if (InP > MaxGet)
         Sz = MaxGet - OutP;
       if (Sz > Size - (OutP%Size))


@@ -60,27 +61,27 @@ class CircleBuf
    
    // Read data in
    bool Read(int Fd);
    
    // Read data in
    bool Read(int Fd);

-   bool Read(string Data);
+   bool Read(std::string Data);

    
    // Write data out
    bool Write(int Fd);
    
    // Write data out
    bool Write(int Fd);

-   bool WriteTillEl(string &Data,bool Single = false);
+   bool WriteTillEl(std::string &Data,bool Single = false);

    
    // Control the write limit
    
    // Control the write limit

-   void Limit(long Max) {if (Max == -1) MaxGet = 0-1; else MaxGet = OutP + Max;}   
-   bool IsLimit() {return MaxGet == OutP;};
-   void Print() {cout << MaxGet << ',' << OutP << endl;};
+   void Limit(long long Max) {if (Max == -1) MaxGet = 0-1; else MaxGet = OutP + Max;}   
+   bool IsLimit() const {return MaxGet == OutP;};
+   void Print() const {cout << MaxGet << ',' << OutP << endl;};

 
    // Test for free space in the buffer
 
    // Test for free space in the buffer

-   bool ReadSpace() {return Size - (InP - OutP) > 0;};
-   bool WriteSpace() {return InP - OutP > 0;};
+   bool ReadSpace() const {return Size - (InP - OutP) > 0;};
+   bool WriteSpace() const {return InP - OutP > 0;};

 
    // Dump everything
    void Reset();
    void Stats();
 
 
    // Dump everything
    void Reset();
    void Stats();
 

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

 };
 
 struct ServerState
 };
 
 struct ServerState


@@ -89,17 +90,17 @@ struct ServerState
    unsigned int Major;
    unsigned int Minor;
    unsigned int Result;
    unsigned int Major;
    unsigned int Minor;
    unsigned int Result;

-   char Code[MAXLEN];
+   char Code[360];

    
    // These are some statistics from the last parsed header lines
    
    // These are some statistics from the last parsed header lines

-   unsigned long Size;
-   signed long StartPos;
+   unsigned long long Size;
+   signed long long StartPos;

    time_t Date;
    bool HaveContent;
    enum {Chunked,Stream,Closes} Encoding;
    enum {Header, Data} State;
    bool Persistent;
    time_t Date;
    bool HaveContent;
    enum {Chunked,Stream,Closes} Encoding;
    enum {Header, Data} State;
    bool Persistent;

-   string Location;
+   std::string Location;

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


@@ -112,12 +113,25 @@ struct ServerState
    int ServerFd;
    URI ServerName;
   
    int ServerFd;
    URI ServerName;
   

-   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; 
-                 Pipeline = true;};
-   int RunHeaders();
+   bool HeaderLine(std::string Line);
+   bool Comp(URI Other) const {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;};
+   void Reset() {Major = 0; Minor = 0; Result = 0; Code[0] = '\0'; Size = 0;
+                StartPos = 0; Encoding = Closes; time(&Date); HaveContent = false;
+                State = Header; Persistent = false; 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();


@@ -133,13 +147,32 @@ 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);
+
+   /** \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();
 
    bool AutoDetectProxy();
 

-   virtual bool Configuration(string Message);
+   virtual bool Configuration(std::string Message);

    
    // In the event of a fatal signal this file will be closed and timestamped.
    
    // In the event of a fatal signal this file will be closed and timestamped.

-   static string FailFile;
+   static std::string FailFile;

    static int FailFd;
    static time_t FailTime;
    static void SigTerm(int);
    static int FailFd;
    static time_t FailTime;
    static void SigTerm(int);


@@ -147,11 +180,11 @@ class HttpMethod : public pkgAcqMethod
    protected:
    virtual bool Fetch(FetchItem *);
    
    protected:
    virtual bool Fetch(FetchItem *);
    

-   string NextURI;
-   string AutoDetectProxyCmd;
-   
+   std::string NextURI;
+   std::string AutoDetectProxyCmd;
+

    public:
    public:

-   friend class ServerState;
+   friend struct ServerState;

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