X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fconnobject%2FConnectionObject.h;h=b8d82d34ff6d9e6338f0a1ccb9be4717c903aef1;hp=96aa615ef6344180d0eb2116026abc14163c17bf;hb=f2f4ddfdf1b569af4578bda527d5329f6ccffa98;hpb=b1467ce3cde3c61f79030bf4329f7037904043e1

diff --git a/source/connobject/ConnectionObject.h b/source/connobject/ConnectionObject.h
index 96aa615..b8d82d3 100644
--- a/source/connobject/ConnectionObject.h
+++ b/source/connobject/ConnectionObject.h
@@ -1,6 +1,6 @@
 // ConnectionObject.h - ConnectionObject interface header file.
 //
-// (c) 2012-2015 Xestia Software Development.
+// (c) 2012-2016 Xestia Software Development.
 //
 // This file is part of Xestia Address Book.
 //
@@ -24,13 +24,29 @@
 #include <iostream>
 #include "../common/sslcertstructs.h"
 
+#if defined (__APPLE__)
+#import <Foundation/Foundation.h>
+#import <SecurityInterface/SFCertificateTrustPanel.h>
+#endif
+
+#if defined (__WIN32__)
+#include <Windows.h>
+#include <basetsd.h>
+#include <winapifamily.h>
+#include <security.h>
+#include <schannel.h>
+#include <cryptuiapi.h>
+#include <sspi.h>
+#endif
+
 enum COConnectResult {
 	COCONNECT_UNITTESTFAIL = -1,
 	COCONNECT_OK,
 	COCONNECT_SSLFAIL,
 	COCONNECT_INVALID,
 	COCONNECT_TIMEOUT,
-	COCONNECT_AUTHFAIL
+	COCONNECT_AUTHFAIL,
+	COCONNECT_NOCONNECTION,
 };
 
 enum CORequestResult {
@@ -38,6 +54,7 @@ enum CORequestResult {
 	COREQUEST_OK,
 	COREQUEST_ERROR_NOTCONNECTED,
 	COREQUEST_ERROR_SERVER,
+	COREQUEST_NOCONNECTION,
 };
 
 enum COSSLVerified {
@@ -49,17 +66,24 @@ enum COSSLVerified {
 	COSSL_NORESULT
 };
 
+enum COContactStatus {
+	COCS_UNKNOWN,
+	COCS_UPDATED,
+	COCS_DELETED
+};
+
 struct COServerResponse {
-	CORequestResult RequestResult;
-	std::string EntityTag;
-	int SessionCode;
-	int ResultCode;
-	std::string ResultMessage;
+	CORequestResult RequestResult = COREQUEST_NOCONNECTION;
+	std::string EntityTag = "";
+	int SessionCode = 0;
+	int ResultCode = 0;
+	std::string ResultMessage = "";
 };
 
 struct COContactData {
-	std::string Location;
-	std::string Data;
+	std::string Location = "";
+	std::string Data = "";
+	COContactStatus Status = COCS_UNKNOWN;
 };
 
 struct COContactList {
@@ -71,41 +95,44 @@ struct COContactList {
 class ConnectionObject{
 	
 	public:
-		ConnectionObject(std::string ServerAddress, int ServerPort, std::string ServerUser, std::string ServerPass, bool ServerSSL);
-		ConnectionObject(std::string ServerAddress, int ServerPort, std::string ServerUser, std::string ServerPass, bool ServerSSL, std::string ServerPrefix, std::string ServerAccount);
-	
+
 		// Virtual functions to be setup by the inheriting classes.
 	
-		virtual void SetupConnectionObject() { };
-		//virtual ~ConnectionObject() {};
+		virtual void SetupConnectionObject() = 0;
 		
-		virtual bool IsTaskCompleted() {};
+		virtual bool IsTaskCompleted() = 0;
 		
-		virtual COConnectResult Connect(bool DoAuthentication) {};
-		virtual void BypassSSLVerification(bool EnableBypass) {};
+		virtual COConnectResult Connect(bool DoAuthentication) = 0;
+		virtual void BypassSSLVerification(bool EnableBypass) = 0;
 		
-		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 GetServerEntityTagValue(std::string Location) {};
-		virtual COServerResponse GetContact(std::string Location) {};
-		virtual COContactList GetContactList(std::string SyncToken) {};
+		virtual COServerResponse GetDefaultPrefix(std::string *ServerPrefix) = 0;
+		virtual COServerResponse AddContact(std::string Location, std::string Data) = 0;
+		virtual COServerResponse EditContact(std::string Location, std::string Data) = 0;
+		virtual COServerResponse DeleteContact(std::string Location) = 0;
+		virtual COServerResponse GetServerEntityTagValue(std::string Location) = 0;
+		virtual COServerResponse GetContact(std::string Location, std::string *PageData) = 0;
+		virtual COContactList GetContactList(std::string SyncToken) = 0;
 		
-		virtual bool CanDoProcessing() {};
-		virtual bool CanDoSSL() {};
-		virtual COSSLVerified SSLVerify() {};
-		virtual bool AbleToLogin() {};
-		virtual bool HasValidResponse() {};
-		virtual bool IsSelfSigned() {};
-		virtual std::string GetErrorMessage() {};
+		virtual bool CanDoProcessing() = 0;
+		virtual bool CanDoSSL() = 0;
+		virtual COSSLVerified SSLVerify() = 0;
+		virtual bool AbleToLogin() = 0;
+		virtual bool HasValidResponse() = 0;
+		virtual bool IsSelfSigned() = 0;
+		virtual std::string GetErrorMessage() = 0;
 	
 		// OS specific functions.
 		
 #if defined(__APPLE__)
+    
+		virtual SecTrustRef BuildSSLCollection() = 0;
+    
 #elif defined(__WIN32__)
+
+		virtual PCCERT_CONTEXT BuildSSLCollection() = 0;
+
 #else
-		SSLCertCollectionString BuildSSLCollection() {};
+		virtual SSLCertCollectionString BuildSSLCollection() = 0;
 
 #endif
 		
@@ -139,4 +166,4 @@ class ConnectionObject{
 
 };
 
-#endif
\ No newline at end of file
+#endif