Split carddav/carddav.cpp down into 8 files to make it manageable.

[xestiaab/.git] / source / carddav / carddav.h

diff --git a/source/carddav/carddav.h b/source/carddav/carddav.h
index fd1068a..dbbcc9b 100644 (file)
--- a/source/carddav/carddav.h
+++ b/source/carddav/carddav.h
@@ -21,6 +21,12 @@ struct ContactListData{
        std::map<wxString,FileSyncData> ListData;
 };
 
+struct UploadDataStruc{
+       wxString *readptr;
+       long sizeleft;
+       int seek = 0;
+};
+
 /*struct CertificateData{
        std::multimap<wxString,wxString> CertificateData;
        bool CertValid;
@@ -38,6 +44,7 @@ struct CertificateCollection{
 
 size_t WritebackFunc(char *ptr, size_t size, size_t nmemb, wxString *userdata);
 int ProgressFunc(void *clientdata, double TTDown, double NDown, double TTUp, double NUp);
+size_t UploadReadFunc(void *ptr, size_t size, size_t nmemb, void *userdata);
 
 class CardDAV
 {
@@ -51,7 +58,9 @@ class CardDAV
                bool SSLVerify();
                bool AbleToLogin();
                bool HasValidResponse();
-               wxString GetResponseData();             
+               bool IsSelfSigned();
+               wxString GetResponseData();
+               void AllowSelfSignTest(bool AllowSelfSignIn);           
                bool Connect();
                bool ConnectThread();
                void ProcessData();
@@ -79,6 +88,12 @@ class CardDAV
                static SSLCertCollection BuildSSLCollection(CURL *conn);
                wxString ETagValueResult();
                wxString GetErrorMessage();
+       
+               // SSL Verification tests when connecting.
+
+               static CURLcode SSLVerifyTest();
+               static SSLCertCollection GetSSLVerifyResults();
+
                //size_t WritebackFunc(char *ptr, size_t size, size_t nmemb, FILE *userdata);
        private:
                static wxString ServerAddress;
@@ -110,6 +125,8 @@ class CardDAV
                static char curlerrbuffer[CURL_ERROR_SIZE];
                static SSLCertCollection SSLCertCol;
                static wxString ErrorMessage;
+               static wxString ErrorBufferMessage;
+               static bool AllowSelfSign;
        protected:
                static int SSLErrorCode;
                static int ConnectionErrorCode;
@@ -117,6 +134,7 @@ class CardDAV
                static wxString PageData;
                static CURLcode claconncode;
                static int HTTPErrorCode;
+               static SSLCertCollection VerifyCertCollection;
                                
 };