support long keyid and fingerprint in gpgv's GOODSIG

[apt.git] / apt-pkg / acquire-method.h

diff --git a/apt-pkg/acquire-method.h b/apt-pkg/acquire-method.h
index 2dd9ad685877682058b8a1f1527f5459f3484835..cab2bda4044dbc2de176226881b8b9d9c8753bc6 100644 (file)
--- a/apt-pkg/acquire-method.h
+++ b/apt-pkg/acquire-method.h
@@ -1,6 +1,5 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: acquire-method.h,v 1.15.2.1 2003/12/24 23:09:17 mdz Exp $

 /* ######################################################################
 
    Acquire Method - Method helper class + functions
 /* ######################################################################
 
    Acquire Method - Method helper class + functions


@@ -20,7 +19,11 @@
 #ifndef PKGLIB_ACQUIRE_METHOD_H
 #define PKGLIB_ACQUIRE_METHOD_H
 
 #ifndef PKGLIB_ACQUIRE_METHOD_H
 #define PKGLIB_ACQUIRE_METHOD_H
 

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

 #include <stdarg.h>
 #include <stdarg.h>

+#include <time.h>

 
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>


@@ -30,7 +33,6 @@
 #include <apt-pkg/strutl.h>
 #endif
 
 #include <apt-pkg/strutl.h>
 #endif
 

-class Hashes;

 class pkgAcqMethod
 {
    protected:
 class pkgAcqMethod
 {
    protected:


@@ -41,17 +43,25 @@ class pkgAcqMethod
 
       std::string Uri;
       std::string DestFile;
 
       std::string Uri;
       std::string DestFile;

+      int DestFileFd;

       time_t LastModified;
       bool IndexFile;
       bool FailIgnore;
       time_t LastModified;
       bool IndexFile;
       bool FailIgnore;

+      HashStringList ExpectedHashes;
+      // a maximum size we will download, this can be the exact filesize
+      // for when we know it or a arbitrary limit when we don't know the
+      // filesize (like a InRelease file)
+      unsigned long long MaximumSize;
+
+      FetchItem();
+      virtual ~FetchItem();
+      private:
+      void * const d;

    };
    
    struct FetchResult
    {
    };
    
    struct FetchResult
    {

-      std::string MD5Sum;
-      std::string SHA1Sum;
-      std::string SHA256Sum;
-      std::string SHA512Sum;
+      HashStringList Hashes;

       std::vector<std::string> GPGVOutput;
       time_t LastModified;
       bool IMSHit;
       std::vector<std::string> GPGVOutput;
       time_t LastModified;
       bool IMSHit;


@@ -59,8 +69,11 @@ class pkgAcqMethod
       unsigned long long Size;
       unsigned long long ResumePoint;
       
       unsigned long long Size;
       unsigned long long ResumePoint;
       

-      void TakeHashes(Hashes &Hash);
+      void TakeHashes(class Hashes &Hash);

       FetchResult();
       FetchResult();

+      virtual ~FetchResult();
+      private:
+      void * const d;

    };
 
    // State
    };
 
    // State


@@ -70,11 +83,12 @@ class pkgAcqMethod
    std::string FailReason;
    std::string UsedMirror;
    std::string IP;
    std::string FailReason;
    std::string UsedMirror;
    std::string IP;

-   
+

    // Handlers for messages
    virtual bool Configuration(std::string Message);
    virtual bool Fetch(FetchItem * /*Item*/) {return true;};
    // Handlers for messages
    virtual bool Configuration(std::string Message);
    virtual bool Fetch(FetchItem * /*Item*/) {return true;};

-   
+   virtual bool URIAcquire(std::string const &/*Message*/, FetchItem *Itm) { return Fetch(Itm); };
+

    // Outgoing messages
    void Fail(bool Transient = false);
    inline void Fail(const char *Why, bool Transient = false) {Fail(std::string(Why),Transient);};
    // Outgoing messages
    void Fail(bool Transient = false);
    inline void Fail(const char *Why, bool Transient = false) {Fail(std::string(Why),Transient);};


@@ -103,7 +117,10 @@ class pkgAcqMethod
    inline void SetIP(std::string aIP) {IP = aIP;};
    
    pkgAcqMethod(const char *Ver,unsigned long Flags = 0);
    inline void SetIP(std::string aIP) {IP = aIP;};
    
    pkgAcqMethod(const char *Ver,unsigned long Flags = 0);

-   virtual ~pkgAcqMethod() {};
+   virtual ~pkgAcqMethod();
+   void DropPrivsOrDie();
+   private:
+   APT_HIDDEN void Dequeue();

 };
 
 /** @} */
 };
 
 /** @} */