#include "../vcard/vcard34conv.h"
#include "../vcard/vcard.h"
-#ifndef FRMACTIVITYMGR_H
-#define FRMACTIVITYMGR_H
-
DEFINE_EVENT_TYPE(ACTMGR_RESUMEPROC);
DEFINE_EVENT_TYPE(ACTMGR_TOGGLECONN);
DEFINE_EVENT_TYPE(ACTMGR_STARTTIMER);
SSLInvalidCertNotifObj SSLICNProcData;
+ SSLCertCollection certcol = ConnHandle.GetCertificateData();
+
bool *PauseMode = new bool;
QRNotif qrn;
SSLInvalidCertNotifObj SSLICNProcData;
+ SSLCertCollection certcol = ConnHandle.GetCertificateData();
+
bool *PauseMode = new bool;
QRNotif qrn;
std::map<wxString,FileSyncData> *SCListData = NULL;
while (ExitLoop == FALSE){
-
- ServerContactList = ConnHandle.GetContactList(SyncTokenLoad.ToUTF8());
- SSLCertCollection certcol = ConnHandle.GetCertificateData();
-
- // Create a pointer for the std::map<wxString,FileSyncData>.
-
- SCListData = &ServerContactList.ListData;
// Check if any errors have occured whilst getting the data.
- int ErrorCode = ConnHandle.GetResultCode();
+ int ErrorCode = ConnHandle.SSLVerifyTest();
- if (ErrorCode != 0){
+ if (ErrorCode != CURLE_OK){
- if (ErrorCode == 60 || ErrorCode == 51){
+ if (ErrorCode == CURLE_SSL_CACERT ||
+ ErrorCode == CURLE_PEER_FAILED_VERIFICATION ||
+ ErrorCode == CURLE_SSL_CONNECT_ERROR){
// Invalid SSL certificate so bring up a dialog to the user
// explaining what has happened and the options available.
bool ContinueProcess = AccDir.GetFirst(&AccDirFilename, wxEmptyString, wxDIR_DEFAULT);
+ ServerContactList = ConnHandle.GetContactList(SyncTokenLoad.ToUTF8());
+ SSLCertCollection certcol = ConnHandle.GetCertificateData();
+
+ // Create a pointer for the std::map<wxString,FileSyncData>.
+
+ SCListData = &ServerContactList.ListData;
+
// Process the server data.
if (SCListData != NULL){
}
-}
-
-#endif
\ No newline at end of file
+}
\ No newline at end of file