Browse Source

bugfix

COM-121
Volker Birk 6 years ago
parent
commit
79da10282b
2 changed files with 6 additions and 5 deletions
  1. +4
    -4
      CpEpEngine.cpp
  2. +2
    -1
      CpEpEngine.h

+ 4
- 4
CpEpEngine.cpp View File

@ -984,11 +984,11 @@ PEP_STATUS CpEpEngine::messageToSend(void * obj, const message *msg)
return PEP_STATUS_OK;
}
sync_handshake_result_s CpEpEngine::showHandshake(void * obj, const pEp_identity *self, const pEp_identity *partner)
sync_handshake_result CpEpEngine::showHandshake(void * obj, const pEp_identity *self, const pEp_identity *partner)
{
assert(self && partner);
if (!(self && partner))
return SYNC_HANDSHAKE_CANCEL_S;
return SYNC_HANDSHAKE_CANCEL;
pEp_identity_s _self;
copy_identity(&_self, self);
@ -999,9 +999,9 @@ sync_handshake_result_s CpEpEngine::showHandshake(void * obj, const pEp_identity
HRESULT r = me->Fire_ShowHandshake(&_self, &_partner, &result);
assert(r == S_OK);
if (r != S_OK)
return SYNC_HANDSHAKE_CANCEL_S;
return SYNC_HANDSHAKE_CANCEL;
return result;
return (sync_handshake_result) (int) result;
}
STDMETHODIMP CpEpEngine::blacklist_add(BSTR fpr)


+ 2
- 1
CpEpEngine.h View File

@ -37,6 +37,7 @@ public:
PEP_STATUS status = ::init(&m_session);
assert(status == PEP_STATUS_OK);
::register_examine_function(m_session, CpEpEngine::examine_identity, (void *)this);
::register_sync_callbacks(m_session, (void*)this, messageToSend, showHandshake);
::log_event(m_session, "Startup", "pEp COM Adapter", NULL, NULL);
}
@ -108,7 +109,7 @@ protected:
typedef locked_queue<pEp_identity_cpp> identity_queue_t;
static ::pEp_identity * retrieve_next_identity(void *management);
static PEP_STATUS messageToSend(void *obj, const message *msg);
static sync_handshake_result_s showHandshake(void * obj, const pEp_identity *self, const pEp_identity *partner);
static sync_handshake_result showHandshake(void * obj, const pEp_identity *self, const pEp_identity *partner);
HRESULT error(_bstr_t msg);


Loading…
Cancel
Save