calculate only expected hashes in methods

[apt.git] / methods / server.h

diff --git a/methods/server.h b/methods/server.h
index 5299b3954f62d44c4ee8a1825fdd00194be9fef2..45622dd34c6557df0170459a284eda60814f43ea 100644 (file)
--- a/methods/server.h
+++ b/methods/server.h
@@ -34,7 +34,8 @@ struct ServerState
    char Code[360];
 
    // These are some statistics from the last parsed header lines
    char Code[360];
 
    // These are some statistics from the last parsed header lines

-   unsigned long long Size;
+   unsigned long long Size; // size of the usable content (aka: the file)
+   unsigned long long JunkSize; // size of junk content (aka: server error pages)

    unsigned long long StartPos;
    time_t Date;
    bool HaveContent;
    unsigned long long StartPos;
    time_t Date;
    bool HaveContent;


@@ -49,6 +50,8 @@ struct ServerState
    URI Proxy;
    unsigned long TimeOut;
 
    URI Proxy;
    unsigned long TimeOut;
 

+   unsigned long long MaximumSize;
+

    protected:
    ServerMethod *Owner;
 
    protected:
    ServerMethod *Owner;
 


@@ -68,12 +71,12 @@ struct ServerState
       RUN_HEADERS_PARSE_ERROR
    };
    /** \brief Get the headers before the data */
       RUN_HEADERS_PARSE_ERROR
    };
    /** \brief Get the headers before the data */

-   RunHeadersResult RunHeaders(FileFd * const File);
+   RunHeadersResult RunHeaders(FileFd * const File, const std::string &Uri);

 
    bool Comp(URI Other) const {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;};
 
    bool Comp(URI Other) const {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;};

-   virtual void Reset() {Major = 0; Minor = 0; Result = 0; Code[0] = '\0'; Size = 0;
+   virtual void Reset() {Major = 0; Minor = 0; Result = 0; Code[0] = '\0'; Size = 0; JunkSize = 0;

                 StartPos = 0; Encoding = Closes; time(&Date); HaveContent = false;
                 StartPos = 0; Encoding = Closes; time(&Date); HaveContent = false;

-                State = Header; Persistent = false; Pipeline = true;};
+                State = Header; Persistent = false; Pipeline = true; MaximumSize = 0;};

    virtual bool WriteResponse(std::string const &Data) = 0;
 
    /** \brief Transfer the data from the socket */
    virtual bool WriteResponse(std::string const &Data) = 0;
 
    /** \brief Transfer the data from the socket */


@@ -82,7 +85,7 @@ struct ServerState
    virtual bool Open() = 0;
    virtual bool IsOpen() = 0;
    virtual bool Close() = 0;
    virtual bool Open() = 0;
    virtual bool IsOpen() = 0;
    virtual bool Close() = 0;

-   virtual bool InitHashes(FileFd &File) = 0;
+   virtual bool InitHashes(FileFd &File, HashStringList const &ExpectedHashes) = 0;

    virtual Hashes * GetHashes() = 0;
    virtual bool Die(FileFd &File) = 0;
    virtual bool Flush(FileFd * const File) = 0;
    virtual Hashes * GetHashes() = 0;
    virtual bool Die(FileFd &File) = 0;
    virtual bool Flush(FileFd * const File) = 0;


@@ -104,6 +107,10 @@ class ServerMethod : public pkgAcqMethod
    unsigned long PipelineDepth;
    bool AllowRedirect;
 
    unsigned long PipelineDepth;
    bool AllowRedirect;
 

+   // Find the biggest item in the fetch queue for the checking of the maximum
+   // size
+   unsigned long long FindMaximumObjectSizeInQueue() const APT_PURE;
+

    public:
    bool Debug;
 
    public:
    bool Debug;