lots of cppcheck fixes

[apt.git] / methods / http.h

diff --git a/methods/http.h b/methods/http.h
index dec5cd80f3105788d01512bcda625ada112a8736..6302807c5e743fcfa2a764eaf462906596ec1f0d 100644 (file)
--- a/methods/http.h
+++ b/methods/http.h
@@ -13,7 +13,7 @@
 
 #define MAXLEN 360
 
 
 #define MAXLEN 360
 

-
+#include <apt-pkg/hashes.h>

 
 using std::cout;
 using std::endl;
 
 using std::cout;
 using std::endl;


@@ -36,14 +36,14 @@ class CircleBuf
    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 LeftRead() const

    {
       unsigned long Sz = Size - (InP - OutP);
       if (Sz > Size - (InP%Size))
         Sz = Size - (InP%Size);
       return Sz;
    }
    {
       unsigned long Sz = Size - (InP - OutP);
       if (Sz > Size - (InP%Size))
         Sz = Size - (InP%Size);
       return Sz;
    }

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

    {
       unsigned long Sz = InP - OutP;
       if (InP > MaxGet)
    {
       unsigned long Sz = InP - OutP;
       if (InP > MaxGet)


@@ -68,12 +68,12 @@ class CircleBuf
    
    // Control the write limit
    void Limit(long Max) {if (Max == -1) MaxGet = 0-1; else MaxGet = OutP + Max;}   
    
    // 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;};
+   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();
 
    // Dump everything
    void Reset();


@@ -99,6 +99,7 @@ struct ServerState
    enum {Chunked,Stream,Closes} Encoding;
    enum {Header, Data} State;
    bool Persistent;
    enum {Chunked,Stream,Closes} Encoding;
    enum {Header, Data} State;
    bool Persistent;

+   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,11 +113,23 @@ struct ServerState
    URI ServerName;
   
    bool HeaderLine(string Line);
    URI ServerName;
   
    bool HeaderLine(string Line);

-   bool Comp(URI Other) {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;};
+   bool Comp(URI Other) const {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;};
    void Reset() {Major = 0; Minor = 0; Result = 0; Size = 0; StartPos = 0;
                  Encoding = Closes; time(&Date); ServerFd = -1; 
                  Pipeline = true;};

-   int RunHeaders();
+
+   /** \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();


@@ -132,7 +145,27 @@ 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();

 
    virtual bool Configuration(string Message);
    
 
    virtual bool Configuration(string Message);
    


@@ -145,8 +178,11 @@ class HttpMethod : public pkgAcqMethod
    protected:
    virtual bool Fetch(FetchItem *);
    
    protected:
    virtual bool Fetch(FetchItem *);
    

+   string NextURI;
+   string AutoDetectProxyCmd;
+

    public:
    public:

-   friend class ServerState;
+   friend struct ServerState;

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