policy: Fix the new policy implementation to handle downgrades correctly

[apt.git] / methods / https.h

diff --git a/methods/https.h b/methods/https.h
index 2c33d95ee10db3d6e0e1590b1e3cf7c1483639ad..57fc292ee2d68ac498c1e486c98eec2ee666709d 100644 (file)
--- a/methods/https.h
+++ b/methods/https.h
@@ -3,46 +3,96 @@
 // $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.

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

-#ifndef APT_HTTP_H
-#define APT_HTTP_H
+#ifndef APT_HTTPS_H
+#define APT_HTTPS_H

 
 

-#define MAXLEN 360
+#include <apt-pkg/acquire-method.h>

 
 

-#include <iostream>

 #include <curl/curl.h>
 #include <curl/curl.h>

+#include <iostream>
+#include <stddef.h>
+#include <string>
+
+#include "server.h"

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

+class Hashes;

 class HttpsMethod;
 class HttpsMethod;

+class FileFd;
+
+class HttpsServerState : public ServerState
+{
+   Hashes * Hash;
+
+   protected:
+   virtual bool ReadHeaderLines(std::string &/*Data*/) { return false; }
+   virtual bool LoadNextResponse(bool const /*ToFile*/, FileFd * const /*File*/) { return false; }
+
+   public:
+   virtual bool WriteResponse(std::string const &/*Data*/) { return false; }
+
+   /** \brief Transfer the data from the socket */
+   virtual bool RunData(FileFd * const /*File*/) { return false; }

 
 

+   virtual bool Open() { return false; }
+   virtual bool IsOpen() { return false; }
+   virtual bool Close() { return false; }
+   virtual bool InitHashes(HashStringList const &ExpectedHashes);
+   virtual Hashes * GetHashes();
+   virtual bool Die(FileFd &/*File*/) { return false; }
+   virtual bool Flush(FileFd * const /*File*/) { return false; }
+   virtual bool Go(bool /*ToFile*/, FileFd * const /*File*/) { return false; }

 
 

-class HttpsMethod : public pkgAcqMethod
+   HttpsServerState(URI Srv, HttpsMethod *Owner);
+   virtual ~HttpsServerState() {Close();};
+};
+
+class HttpsMethod : public ServerMethod

 {
 {

+   // minimum speed in bytes/se that triggers download timeout handling
+   static const int DL_MIN_SPEED = 10;

 
    virtual bool Fetch(FetchItem *);
 
    virtual bool Fetch(FetchItem *);

+
+   static size_t parse_header(void *buffer, size_t size, size_t nmemb, void *userp);

    static size_t write_data(void *buffer, size_t size, size_t nmemb, void *userp);
    static size_t write_data(void *buffer, size_t size, size_t nmemb, void *userp);

-   static int progress_callback(void *clientp, double dltotal, double dlnow, 
-                               double ultotal, double ulnow);
+   static int progress_callback(void *clientp, double dltotal, double dlnow,
+                                double ultotal, double ulnow);

    void SetupProxy();
    CURL *curl;
    void SetupProxy();
    CURL *curl;

-   FetchResult Res;
+   ServerState *Server;
+
+   // Used by ServerMethods unused by https
+   virtual void SendReq(FetchItem *) { exit(42); }
+   virtual void RotateDNS() { exit(42); }

 
    public:
    FileFd *File;
 
    public:
    FileFd *File;

-      
-   HttpsMethod() : pkgAcqMethod("1.2",Pipeline | SendConfig) 
+
+   virtual bool Configuration(std::string Message);
+   virtual ServerState * CreateServerState(URI uri);
+   using pkgAcqMethod::FetchResult;
+   using pkgAcqMethod::FetchItem;
+
+   HttpsMethod() : ServerMethod("1.2",Pipeline | SendConfig), File(NULL)

    {
    {

-      File = 0;

       curl = curl_easy_init();
    };
       curl = curl_easy_init();
    };

+
+   ~HttpsMethod()
+   {
+      curl_easy_cleanup(curl);
+   };

 };
 
 };
 

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

 URI Proxy;
 
 #endif
 URI Proxy;
 
 #endif