X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fconnobject%2FConnectionObject.h;h=24f357f63e9eeee953035806f970f73c7760e7fc;hb=28af58c233e5a0a78fd085bdf7fef24f76a9c5a6;hp=d0bd1cef59860dd13a64b5e29ef792282184678c;hpb=e41a3ab9dc4b2d35eaf76faf1a4160dd180e16e7;p=xestiaab%2F.git diff --git a/source/connobject/ConnectionObject.h b/source/connobject/ConnectionObject.h index d0bd1ce..24f357f 100644 --- a/source/connobject/ConnectionObject.h +++ b/source/connobject/ConnectionObject.h @@ -22,6 +22,7 @@ #include #include #include +#include "../common/sslcertstructs.h" enum COConnectResult { COCONNECT_UNITTESTFAIL = -1, @@ -36,7 +37,7 @@ enum CORequestResult { COREQUEST_UNITTESTFAIL = -1, COREQUEST_OK, COREQUEST_ERROR_NOTCONNECTED, - COREQUEST_ERROR_SERVER + COREQUEST_ERROR_SERVER, }; enum COSSLVerified { @@ -48,6 +49,12 @@ enum COSSLVerified { COSSL_NORESULT }; +enum COContactStatus { + COCS_UNKNOWN, + COCS_UPDATED, + COCS_DELETED +}; + struct COServerResponse { CORequestResult RequestResult; std::string EntityTag; @@ -59,6 +66,7 @@ struct COServerResponse { struct COContactData { std::string Location; std::string Data; + COContactStatus Status = COCS_UNKNOWN; }; struct COContactList { @@ -86,9 +94,9 @@ class ConnectionObject{ 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() {}; @@ -98,6 +106,15 @@ class ConnectionObject{ 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.