Not Logged In
|
Login
|
Register
Home
|
News
|
Projects
|
Releases
Bugs
|
RFE
|
Repositories
|
Help
projects
/
xestiaab
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed CardDAV class and all uses/references.
[xestiaab/.git]
/
source
/
connobject
/
ConnectionObject.h
diff --git
a/source/connobject/ConnectionObject.h
b/source/connobject/ConnectionObject.h
index
90eb0cb
..
ab479e3
100644
(file)
--- a/
source/connobject/ConnectionObject.h
+++ b/
source/connobject/ConnectionObject.h
@@
-16,12
+16,18
@@
// You should have received a copy of the GNU General Public License along
// with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
// You should have received a copy of the GNU General Public License along
// with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
+#ifndef __CONNOBJECT_CONNECTIONOBJECT_H__
+#define __CONNOBJECT_CONNECTIONOBJECT_H__
+
#include <string>
#include <vector>
#include <string>
#include <vector>
+#include <iostream>
+#include "../common/sslcertstructs.h"
enum COConnectResult {
COCONNECT_UNITTESTFAIL = -1,
COCONNECT_OK,
enum COConnectResult {
COCONNECT_UNITTESTFAIL = -1,
COCONNECT_OK,
+ COCONNECT_SSLFAIL,
COCONNECT_INVALID,
COCONNECT_TIMEOUT,
COCONNECT_AUTHFAIL
COCONNECT_INVALID,
COCONNECT_TIMEOUT,
COCONNECT_AUTHFAIL
@@
-31,7
+37,16
@@
enum CORequestResult {
COREQUEST_UNITTESTFAIL = -1,
COREQUEST_OK,
COREQUEST_ERROR_NOTCONNECTED,
COREQUEST_UNITTESTFAIL = -1,
COREQUEST_OK,
COREQUEST_ERROR_NOTCONNECTED,
- COREQUEST_ERROR_SERVER
+ COREQUEST_ERROR_SERVER,
+};
+
+enum COSSLVerified {
+ COSSL_UNITTESTFAIL = -1,
+ COSSL_VERIFIED,
+ COSSL_VERIFIED_USER,
+ COSSL_UNABLETOVERIFY,
+ COSSL_NOTAPPLICABLE,
+ COSSL_NORESULT
};
struct COServerResponse {
};
struct COServerResponse {
@@
-61,24
+76,38
@@
class ConnectionObject{
// Virtual functions to be setup by the inheriting classes.
// Virtual functions to be setup by the inheriting classes.
- virtual void SetupConnectionObject() {};
- virtual ~ConnectionObject() {};
+ virtual void SetupConnectionObject() {
};
+
//
virtual ~ConnectionObject() {};
- virtual
COConnectResult Connect
() {};
+ virtual
bool IsTaskCompleted
() {};
- virtual std::string GetDefaultPrefix() {};
+ virtual COConnectResult Connect(bool DoAuthentication) {};
+ virtual void BypassSSLVerification(bool EnableBypass) {};
+
+ 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 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 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() {};
virtual bool CanDoSSL() {};
virtual COContactList GetContactList(std::string SyncToken) {};
virtual bool CanDoProcessing() {};
virtual bool CanDoSSL() {};
- virtual
bool
SSLVerify() {};
+ virtual
COSSLVerified
SSLVerify() {};
virtual bool AbleToLogin() {};
virtual bool HasValidResponse() {};
virtual bool AbleToLogin() {};
virtual bool HasValidResponse() {};
+ virtual bool IsSelfSigned() {};
+ virtual std::string GetErrorMessage() {};
+
+ // OS specific functions.
+
+#if defined(__APPLE__)
+#elif defined(__WIN32__)
+#else
+ SSLCertCollectionString BuildSSLCollection() {};
+
+#endif
protected:
// Test Mode.
protected:
// Test Mode.
@@
-95,17
+124,19
@@
class ConnectionObject{
std::string ServerAccount = "";
bool ServerSSL = true;
std::string ErrorMessage = "";
std::string ServerAccount = "";
bool ServerSSL = true;
std::string ErrorMessage = "";
- std::string ErrorBufferMessage = "";
// Connect results.
bool SSLStatus = false;
// Connect results.
bool SSLStatus = false;
-
bool SSLVerified = false
;
+
COSSLVerified SSLVerified = COSSL_NORESULT
;
bool ValidResponse = false;
bool AuthPassed = false;
bool CanProcess = false;
bool SSLSelfSigned = false;
bool ValidResponse = false;
bool AuthPassed = false;
bool CanProcess = false;
bool SSLSelfSigned = false;
+ bool TaskCompleted = false;
private:
private:
-};
\ No newline at end of file
+};
+
+#endif
\ No newline at end of file
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy