Use some semantically more correct buffer operations

[apt.git] / methods / https.h

diff --git a/methods/https.h b/methods/https.h
index 6917a6ff68981d311168ec85ae45ed1f9935b2bb..4d50c5a040cdd1f62508c781876333f71f009446 100644 (file)
--- a/methods/https.h
+++ b/methods/https.h
@@ -17,6 +17,7 @@
 #include <iostream>
 #include <stddef.h>
 #include <string>
 #include <iostream>
 #include <stddef.h>
 #include <string>

+#include <memory>

 
 #include "server.h"
 
 
 #include "server.h"
 


@@ -29,38 +30,37 @@ class FileFd;
 
 class HttpsServerState : public ServerState
 {
 
 class HttpsServerState : public ServerState
 {

+   Hashes * Hash;
+

    protected:
    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:
 
    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 */
 
    /** \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 &/*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();};
 
    HttpsServerState(URI Srv, HttpsMethod *Owner);
    virtual ~HttpsServerState() {Close();};

-
-   bool ReceivedData;

 };
 
 };
 

-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;
 
 {
    // minimum speed in bytes/se that triggers download timeout handling
    static const int DL_MIN_SPEED = 10;
 

-   virtual bool Fetch(FetchItem *);
-   virtual bool Configuration(std::string Message);
+   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 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);


@@ -68,13 +68,19 @@ class HttpsMethod : public pkgAcqMethod
                                 double ultotal, double ulnow);
    void SetupProxy();
    CURL *curl;
                                 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:
 
    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 = curl_easy_init();
    };
    {
       curl = curl_easy_init();
    };