improve arch-unqualified dpkg-progress parsing

[apt.git] / methods / http.h

diff --git a/methods/http.h b/methods/http.h
index c73d4df5ca5252d159ce7fd9c03ddcbc25b80f64..b7341f5f8671c0f817a4a9db05b12ce949bc4be9 100644 (file)
--- a/methods/http.h
+++ b/methods/http.h
@@ -3,7 +3,7 @@
 // $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 Acquire Method - This is the HTTP aquire method for APT.
+   HTTP Acquire Method - This is the HTTP acquire method for APT.

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


@@ -11,15 +11,18 @@
 #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>
 #include <apt-pkg/strutl.h>
 
 #include <string>

+#include <sys/time.h>
+#include <iostream>
+
+#include "server.h"

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

+class FileFd;

 class HttpMethod;
 class Hashes;
 
 class HttpMethod;
 class Hashes;
 


@@ -33,7 +36,7 @@ class CircleBuf
    unsigned long long StrPos;
    unsigned long long MaxGet;
    struct timeval Start;
    unsigned long long StrPos;
    unsigned long long MaxGet;
    struct timeval Start;

-   
+

    static unsigned long long BwReadLimit;
    static unsigned long long BwTickReadData;
    static struct timeval BwReadTick;
    static unsigned long long BwReadLimit;
    static unsigned long long BwTickReadData;
    static struct timeval BwReadTick;


@@ -56,21 +59,22 @@ class CircleBuf
       return Sz;
    }
    void FillOut();
       return Sz;
    }
    void FillOut();

-   
+

    public:
    public:

-   

    Hashes *Hash;
    Hashes *Hash;

-   
+   // total amount of data that got written so far
+   unsigned long long TotalWriten;
+

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

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

    // Write data out
    bool Write(int Fd);
    bool WriteTillEl(std::string &Data,bool Single = false);
    // Write data out
    bool Write(int Fd);
    bool WriteTillEl(std::string &Data,bool Single = false);

-   
+

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

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


@@ -78,125 +82,61 @@ class CircleBuf
    bool ReadSpace() const {return Size - (InP - OutP) > 0;};
    bool WriteSpace() const {return InP - OutP > 0;};
 
    bool ReadSpace() const {return Size - (InP - OutP) > 0;};
    bool WriteSpace() const {return InP - OutP > 0;};
 

-   // Dump everything

    void Reset();
    void Reset();

+   // Dump everything

    void Stats();
 
    void Stats();
 

-   CircleBuf(unsigned long long Size);
+   CircleBuf(HttpMethod const * const Owner, unsigned long long Size);

    ~CircleBuf();
 };
 
    ~CircleBuf();
 };
 

-struct ServerState
+struct HttpServerState: public ServerState

 {
 {

-   // This is the last parsed Header Line
-   unsigned int Major;
-   unsigned int Minor;
-   unsigned int Result;
-   char Code[MAXLEN];
-   
-   // These are some statistics from the last parsed header lines
-   unsigned long long Size;
-   signed long long StartPos;
-   time_t Date;
-   bool HaveContent;
-   enum {Chunked,Stream,Closes} Encoding;
-   enum {Header, Data} State;
-   bool Persistent;
-   std::string Location;
-   
-   // This is a Persistent attribute of the server itself.
-   bool Pipeline;
-   
-   HttpMethod *Owner;
-   

    // This is the connection itself. Output is data FROM the server
    CircleBuf In;
    CircleBuf Out;
    int ServerFd;
    // This is the connection itself. Output is data FROM the server
    CircleBuf In;
    CircleBuf Out;
    int ServerFd;

-   URI ServerName;
-  
-   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; Size = 0; StartPos = 0;
-                 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 Close();
-   
-   ServerState(URI Srv,HttpMethod *Owner);
-   ~ServerState() {Close();};
+
+   protected:
+   virtual bool ReadHeaderLines(std::string &Data) APT_OVERRIDE;
+   virtual bool LoadNextResponse(bool const ToFile, FileFd * const File) APT_OVERRIDE;
+   virtual bool WriteResponse(std::string const &Data) APT_OVERRIDE;
+
+   public:
+   virtual void Reset(bool const Everything = true) APT_OVERRIDE;
+
+   virtual bool RunData(FileFd * const File) APT_OVERRIDE;
+   virtual bool RunDataToDevNull() APT_OVERRIDE;
+
+   virtual bool Open() APT_OVERRIDE;
+   virtual bool IsOpen() APT_OVERRIDE;
+   virtual bool Close() APT_OVERRIDE;
+   virtual bool InitHashes(HashStringList const &ExpectedHashes) APT_OVERRIDE;
+   virtual Hashes * GetHashes() APT_OVERRIDE;
+   virtual bool Die(FileFd * const File) APT_OVERRIDE;
+   virtual bool Flush(FileFd * const File) APT_OVERRIDE;
+   virtual bool Go(bool ToFile, FileFd * const File) APT_OVERRIDE;
+
+   HttpServerState(URI Srv, HttpMethod *Owner);
+   virtual ~HttpServerState() {Close();};

 };
 
 };
 

-class HttpMethod : public pkgAcqMethod
+class HttpMethod : public ServerMethod

 {
 {

-   void SendReq(FetchItem *Itm,CircleBuf &Out);
-   bool Go(bool ToFile,ServerState *Srv);
-   bool Flush(ServerState *Srv);
-   bool ServerDie(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(std::string Message);
-   
-   // In the event of a fatal signal this file will be closed and timestamped.
-   static std::string FailFile;
-   static int FailFd;
-   static time_t FailTime;
-   static void SigTerm(int);
+   public:
+   virtual void SendReq(FetchItem *Itm) APT_OVERRIDE;
+
+   virtual std::unique_ptr<ServerState> CreateServerState(URI const &uri) APT_OVERRIDE;
+   virtual void RotateDNS() APT_OVERRIDE;
+   virtual DealWithHeadersResult DealWithHeaders(FetchResult &Res) APT_OVERRIDE;

 
    protected:
 
    protected:

-   virtual bool Fetch(FetchItem *);
-   
-   std::string NextURI;

    std::string AutoDetectProxyCmd;
 
    public:
    std::string AutoDetectProxyCmd;
 
    public:

-   friend struct ServerState;
-
-   FileFd *File;
-   ServerState *Server;
-   
-   int Loop();
-   
-   HttpMethod() : pkgAcqMethod("1.2",Pipeline | SendConfig) 
-   {
-      File = 0;
-      Server = 0;
-   };
+   friend struct HttpServerState;
+
+   explicit HttpMethod(std::string &&pProg);

 };
 
 #endif
 };
 
 #endif