* cmdline/apt-get.cc:

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

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

-// $Id: acquire-method.h,v 1.14 2001/02/20 07:03:17 jgg Exp $
+// $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


@@ -10,16 +10,21 @@
    
    ##################################################################### */
                                                                        /*}}}*/
    
    ##################################################################### */
                                                                        /*}}}*/

+
+/** \addtogroup acquire
+ *  @{
+ *
+ *  \file acquire-method.h
+ */
+

 #ifndef PKGLIB_ACQUIRE_METHOD_H
 #define PKGLIB_ACQUIRE_METHOD_H
 
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/strutl.h>
 
 #ifndef PKGLIB_ACQUIRE_METHOD_H
 #define PKGLIB_ACQUIRE_METHOD_H
 
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/strutl.h>
 

-#ifdef __GNUG__
-#pragma interface "apt-pkg/acquire-method.h"
-#endif 

 
 

+class Hashes;

 class pkgAcqMethod
 {
    protected:
 class pkgAcqMethod
 {
    protected:


@@ -37,11 +42,16 @@ class pkgAcqMethod
    struct FetchResult
    {
       string MD5Sum;
    struct FetchResult
    {
       string MD5Sum;

+      string SHA1Sum;
+      string SHA256Sum;
+      vector<string> GPGVOutput;

       time_t LastModified;
       bool IMSHit;
       string Filename;
       unsigned long Size;
       time_t LastModified;
       bool IMSHit;
       string Filename;
       unsigned long Size;

-      unsigned long ResumePoint;      
+      unsigned long ResumePoint;
+      
+      void TakeHashes(Hashes &Hash);

       FetchResult();
    };
 
       FetchResult();
    };
 


@@ -49,7 +59,9 @@ class pkgAcqMethod
    vector<string> Messages;
    FetchItem *Queue;
    FetchItem *QueueBack;
    vector<string> Messages;
    FetchItem *Queue;
    FetchItem *QueueBack;

-   string FailExtra;
+   string FailReason;
+   string UsedMirror;
+   string IP;

    
    // Handlers for messages
    virtual bool Configuration(string Message);
    
    // Handlers for messages
    virtual bool Configuration(string Message);


@@ -58,14 +70,14 @@ class pkgAcqMethod
    // Outgoing messages
    void Fail(bool Transient = false);
    inline void Fail(const char *Why, bool Transient = false) {Fail(string(Why),Transient);};
    // Outgoing messages
    void Fail(bool Transient = false);
    inline void Fail(const char *Why, bool Transient = false) {Fail(string(Why),Transient);};

-   void Fail(string Why, bool Transient = false);
-   void URIStart(FetchResult &Res);
-   void URIDone(FetchResult &Res,FetchResult *Alt = 0);
+   virtual void Fail(string Why, bool Transient = false);
+   virtual void URIStart(FetchResult &Res);
+   virtual void URIDone(FetchResult &Res,FetchResult *Alt = 0);
+

    bool MediaFail(string Required,string Drive);
    virtual void Exit() {};
 
    public:
    bool MediaFail(string Required,string Drive);
    virtual void Exit() {};
 
    public:

-

    enum CnfFlags {SingleInstance = (1<<0),
                   Pipeline = (1<<1), SendConfig = (1<<2),
                   LocalOnly = (1<<3), NeedsCleanup = (1<<4), 
    enum CnfFlags {SingleInstance = (1<<0),
                   Pipeline = (1<<1), SendConfig = (1<<2),
                   LocalOnly = (1<<3), NeedsCleanup = (1<<4), 


@@ -75,10 +87,13 @@ class pkgAcqMethod
    void Status(const char *Format,...);
    
    int Run(bool Single = false);
    void Status(const char *Format,...);
    
    int Run(bool Single = false);

-   inline void SetFailExtraMsg(string Msg) {FailExtra = Msg;};
+   inline void SetFailReason(string Msg) {FailReason = Msg;};
+   inline void SetIP(string aIP) {IP = aIP;};

    
    pkgAcqMethod(const char *Ver,unsigned long Flags = 0);
    virtual ~pkgAcqMethod() {};
 };
 
    
    pkgAcqMethod(const char *Ver,unsigned long Flags = 0);
    virtual ~pkgAcqMethod() {};
 };
 

+/** @} */
+

 #endif
 #endif