X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/4c333a25a88b1afac2ed50bf1b9af61dc5b09343..4460551841d909d3ee9c1de00156ed3cdf8b1665:/methods/https.h

diff --git a/methods/https.h b/methods/https.h
index 45d1f7f63..2fa714c7b 100644
--- a/methods/https.h
+++ b/methods/https.h
@@ -11,12 +11,11 @@
 #ifndef APT_HTTPS_H
 #define APT_HTTPS_H
 
-#include <apt-pkg/acquire-method.h>
-
 #include <curl/curl.h>
 #include <iostream>
 #include <stddef.h>
 #include <string>
+#include <memory>
 
 #include "server.h"
 
@@ -29,49 +28,59 @@ 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; }
+   virtual bool ReadHeaderLines(std::string &/*Data*/) APT_OVERRIDE { return false; }
+   virtual bool LoadNextResponse(bool const /*ToFile*/, FileFd * const /*File*/) APT_OVERRIDE { return false; }
 
    public:
-   virtual bool WriteResponse(std::string const &/*Data*/) { return false; }
+   virtual bool WriteResponse(std::string const &/*Data*/) APT_OVERRIDE { return false; }
 
    /** \brief Transfer the data from the socket */
-   virtual bool RunData(FileFd * const /*File*/) { return false; }
+   virtual bool RunData(FileFd * const /*File*/) APT_OVERRIDE { return false; }
 
-   virtual bool Open() { return false; }
-   virtual bool IsOpen() { return false; }
-   virtual bool Close() { return false; }
-   virtual bool InitHashes(FileFd &/*File*/) { return false; }
-   virtual Hashes * GetHashes() { return NULL; }
-   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; }
+   virtual bool Open() APT_OVERRIDE { return false; }
+   virtual bool IsOpen() APT_OVERRIDE { return false; }
+   virtual bool Close() APT_OVERRIDE { return false; }
+   virtual bool InitHashes(HashStringList const &ExpectedHashes) APT_OVERRIDE;
+   virtual Hashes * GetHashes() APT_OVERRIDE;
+   virtual bool Die(FileFd * const /*File*/) APT_OVERRIDE { return false; }
+   virtual bool Flush(FileFd * const /*File*/) APT_OVERRIDE { return false; }
+   virtual bool Go(bool /*ToFile*/, FileFd * const /*File*/) APT_OVERRIDE { return false; }
 
    HttpsServerState(URI Srv, HttpsMethod *Owner);
    virtual ~HttpsServerState() {Close();};
 };
 
-class HttpsMethod : public pkgAcqMethod
+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 *) APT_OVERRIDE;
+
    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 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;
-   FetchResult Res;
-   HttpsServerState *Server;
+
+   // Used by ServerMethods unused by https
+   virtual void SendReq(FetchItem *) APT_OVERRIDE { exit(42); }
+   virtual void RotateDNS() APT_OVERRIDE { exit(42); }
 
    public:
-   FileFd *File;
 
-   HttpsMethod() : pkgAcqMethod("1.2",Pipeline | SendConfig), Server(NULL), File(NULL)
+   virtual bool Configuration(std::string Message) APT_OVERRIDE;
+   virtual std::unique_ptr<ServerState> CreateServerState(URI const &uri) APT_OVERRIDE;
+   using pkgAcqMethod::FetchResult;
+   using pkgAcqMethod::FetchItem;
+
+   HttpsMethod() : ServerMethod("https","1.2",Pipeline | SendConfig)
    {
+      curl_global_init(CURL_GLOBAL_SSL);
       curl = curl_easy_init();
    };