Browse Source

connection point, next step :-/

COM-121
Volker Birk 6 years ago
parent
commit
4578c80710
8 changed files with 32 additions and 7 deletions
  1. +21
    -0
      CpEpEngine.cpp
  2. +3
    -0
      CpEpEngine.h
  3. +1
    -1
      pEpCOMServerAdapter.idl
  4. +1
    -1
      pEpCOMServerAdapter.vcxproj
  5. +3
    -3
      pEpCOMServerAdapter.vcxproj.filters
  6. +1
    -1
      pEp_utility.cpp
  7. +1
    -1
      pEp_utility.h
  8. +1
    -0
      stdafx.h

+ 21
- 0
CpEpEngine.cpp View File

@ -965,6 +965,27 @@ int CpEpEngine::examine_identity(pEp_identity *ident, void *management)
return _ident;
}
PEP_STATUS CpEpEngine::messageToSend(void * obj, const message *msg)
{
text_message _msg;
text_message_from_C(&_msg, msg);
CpEpEngine *me = (CpEpEngine *) obj;
me->Fire_MessageToSend(&_msg);
return PEP_STATUS_OK;
}
sync_handshake_result_s CpEpEngine::showHandshake(void * obj, const pEp_identity *self, const pEp_identity *partner)
{
pEp_identity_s _self;
copy_identity(&_self, self);
pEp_identity_s _partner;
copy_identity(&_partner, partner);
CpEpEngine *me = (CpEpEngine *) obj;
sync_handshake_result_s result;
me->Fire_ShowHandshake(&_self, &_partner, &result);
return result;
}
STDMETHODIMP CpEpEngine::blacklist_add(BSTR fpr)
{
assert(fpr);


+ 3
- 0
CpEpEngine.h View File

@ -107,6 +107,9 @@ 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);
HRESULT error(_bstr_t msg);
void verbose(string text)


+ 1
- 1
pEpCOMServerAdapter.idl View File

@ -284,7 +284,7 @@ library pEpCOMServerAdapterLib
properties:
methods:
[id(1)] HRESULT MessageToSend([in] struct text_message * msg);
[id(2)] HRESULT ShowHandshake([in] struct pEp_identity_s * self, [in] struct pEp_identity_s * partner, [out, retval] sync_handshake_result_s * result);
[id(2)] HRESULT ShowHandshake([in] struct pEp_identity_s * self, [in] struct pEp_identity_s * partner, [in,out] sync_handshake_result_s * result);
};
[
uuid(EF1B073D-5058-4E0E-829E-B4D22CA21EA2)


+ 1
- 1
pEpCOMServerAdapter.vcxproj View File

@ -159,7 +159,7 @@ echo "generating interop assembly $(TargetDir)pEpCOMServerAdapter.Interop.dll"
<ClInclude Include="targetver.h" />
<ClInclude Include="utf8_helper.h" />
<ClInclude Include="xdlldata.h" />
<ClInclude Include="_IpEpEngineEvents_CP.h" />
<ClInclude Include="_IpEpEngineEvents_CP.H" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="pEpCOMServerAdapter.rc" />


+ 3
- 3
pEpCOMServerAdapter.vcxproj.filters View File

@ -66,12 +66,12 @@
<ClInclude Include="utf8_helper.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="_IpEpEngineEvents_CP.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="pEp_utility.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="_IpEpEngineEvents_CP.H">
<Filter>Generated Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="pEpCOMServerAdapter.rc">


+ 1
- 1
pEp_utility.cpp View File

@ -284,7 +284,7 @@ namespace pEp {
memset(msg, 0, sizeof(text_message));
}
void text_message_from_C(text_message *msg2, ::message *msg)
void text_message_from_C(text_message *msg2, const ::message *msg)
{
assert(msg2);
assert(msg);


+ 1
- 1
pEp_utility.h View File

@ -74,6 +74,6 @@ namespace pEp {
}
::message * text_message_to_C(text_message *msg);
void text_message_from_C(text_message *msg2, ::message *msg);
void text_message_from_C(text_message *msg2, const ::message *msg);
}
}

+ 1
- 0
stdafx.h View File

@ -43,3 +43,4 @@
#include "../../pEpEngine/src/message_api.h"
#include "../../pEpEngine/src/stringpair.h"
#include "../../pEpEngine/src/blacklist.h"
#include "../../pEpEngine/src/sync.h"

Loading…
Cancel
Save