Added COContactStatus enum and marked BuildSSLCollection as virtual

[xestiaab/.git] / source / connobject / ConnectionObject.h

diff --git a/source/connobject/ConnectionObject.h b/source/connobject/ConnectionObject.h
index 9ffbe4d..24f357f 100644 (file)
--- a/source/connobject/ConnectionObject.h
+++ b/source/connobject/ConnectionObject.h
@@ -21,10 +21,13 @@
 
 #include <string>
 #include <vector>
+#include <iostream>
+#include "../common/sslcertstructs.h"
 
 enum COConnectResult {
        COCONNECT_UNITTESTFAIL = -1,
        COCONNECT_OK,
+       COCONNECT_SSLFAIL,
        COCONNECT_INVALID,
        COCONNECT_TIMEOUT,
        COCONNECT_AUTHFAIL
@@ -34,7 +37,7 @@ enum CORequestResult {
        COREQUEST_UNITTESTFAIL = -1,
        COREQUEST_OK,
        COREQUEST_ERROR_NOTCONNECTED,
-       COREQUEST_ERROR_SERVER
+       COREQUEST_ERROR_SERVER,
 };
 
 enum COSSLVerified {
@@ -46,6 +49,12 @@ enum COSSLVerified {
        COSSL_NORESULT
 };
 
+enum COContactStatus {
+       COCS_UNKNOWN,
+       COCS_UPDATED,
+       COCS_DELETED
+};
+
 struct COServerResponse {
        CORequestResult RequestResult;
        std::string EntityTag;
@@ -57,6 +66,7 @@ struct COServerResponse {
 struct COContactData {
        std::string Location;
        std::string Data;
+       COContactStatus Status = COCS_UNKNOWN;
 };
 
 struct COContactList {
@@ -73,19 +83,20 @@ class ConnectionObject{
        
                // Virtual functions to be setup by the inheriting classes.
        
-               virtual void SetupConnectionObject() {};
+               virtual void SetupConnectionObject() { };
                //virtual ~ConnectionObject() {};
                
                virtual bool IsTaskCompleted() {};
                
-               virtual COConnectResult Connect() {};
+               virtual COConnectResult Connect(bool DoAuthentication) {};
+               virtual void BypassSSLVerification(bool EnableBypass) {};
                
-               virtual std::string GetDefaultPrefix() {};
+               virtual COServerResponse GetDefaultPrefix(std::string *ServerPrefix) {};
                virtual COServerResponse AddContact(std::string Location, std::string Data) {};
                virtual COServerResponse EditContact(std::string Location, std::string Data) {};
-               virtual COServerResponse DeleteContact(std::string Location, std::string EntityTag) {};
+               virtual COServerResponse DeleteContact(std::string Location) {};
                virtual COServerResponse GetServerEntityTagValue(std::string Location) {};
-               virtual COServerResponse GetContact(std::string Location) {};
+               virtual COServerResponse GetContact(std::string Location, std::string *PageData) {};
                virtual COContactList GetContactList(std::string SyncToken) {};
                
                virtual bool CanDoProcessing() {};
@@ -93,6 +104,17 @@ class ConnectionObject{
                virtual COSSLVerified SSLVerify() {};
                virtual bool AbleToLogin() {};
                virtual bool HasValidResponse() {};
+               virtual bool IsSelfSigned() {};
+               virtual std::string GetErrorMessage() {};
+       
+               // OS specific functions.
+               
+#if defined(__APPLE__)
+#elif defined(__WIN32__)
+#else
+               virtual SSLCertCollectionString BuildSSLCollection() {};
+
+#endif
                
        protected:
                // Test Mode.
@@ -109,7 +131,6 @@ class ConnectionObject{
                std::string ServerAccount = "";
                bool ServerSSL = true;
                std::string ErrorMessage = "";
-               std::string ErrorBufferMessage = "";
        
                // Connect results.