connection point, next step :-/
authorVolker Birk <vb@pep-project.org>
Wed, 11 May 2016 19:53:47 +0200
changeset 74f2531096699e
parent 73 9e7bbe855f19
child 75 65a253e12538
connection point, next step :-/
CpEpEngine.cpp
CpEpEngine.h
pEpCOMServerAdapter.idl
pEpCOMServerAdapter.vcxproj
pEpCOMServerAdapter.vcxproj.filters
pEp_utility.cpp
pEp_utility.h
stdafx.h
     1.1 --- a/CpEpEngine.cpp	Wed May 11 19:37:27 2016 +0200
     1.2 +++ b/CpEpEngine.cpp	Wed May 11 19:53:47 2016 +0200
     1.3 @@ -965,6 +965,27 @@
     1.4      return _ident;
     1.5  }
     1.6  
     1.7 +PEP_STATUS CpEpEngine::messageToSend(void * obj, const message *msg)
     1.8 +{
     1.9 +    text_message _msg;
    1.10 +    text_message_from_C(&_msg, msg);
    1.11 +    CpEpEngine *me = (CpEpEngine *) obj;
    1.12 +    me->Fire_MessageToSend(&_msg);
    1.13 +    return PEP_STATUS_OK;
    1.14 +}
    1.15 +
    1.16 +sync_handshake_result_s CpEpEngine::showHandshake(void * obj, const pEp_identity *self, const pEp_identity *partner)
    1.17 +{
    1.18 +    pEp_identity_s _self;
    1.19 +    copy_identity(&_self, self);
    1.20 +    pEp_identity_s _partner;
    1.21 +    copy_identity(&_partner, partner);
    1.22 +    CpEpEngine *me = (CpEpEngine *) obj;
    1.23 +    sync_handshake_result_s result;
    1.24 +    me->Fire_ShowHandshake(&_self, &_partner, &result);
    1.25 +    return result;
    1.26 +}
    1.27 +
    1.28  STDMETHODIMP CpEpEngine::blacklist_add(BSTR fpr)
    1.29  {
    1.30      assert(fpr);
     2.1 --- a/CpEpEngine.h	Wed May 11 19:37:27 2016 +0200
     2.2 +++ b/CpEpEngine.h	Wed May 11 19:53:47 2016 +0200
     2.3 @@ -107,6 +107,9 @@
     2.4  
     2.5      typedef locked_queue<pEp_identity_cpp> identity_queue_t;
     2.6      static ::pEp_identity * retrieve_next_identity(void *management);
     2.7 +    static PEP_STATUS messageToSend(void *obj, const message *msg);
     2.8 +    static sync_handshake_result_s showHandshake(void * obj, const pEp_identity *self, const pEp_identity *partner);
     2.9 +
    2.10      HRESULT error(_bstr_t msg);
    2.11  
    2.12      void verbose(string text)
     3.1 --- a/pEpCOMServerAdapter.idl	Wed May 11 19:37:27 2016 +0200
     3.2 +++ b/pEpCOMServerAdapter.idl	Wed May 11 19:53:47 2016 +0200
     3.3 @@ -284,7 +284,7 @@
     3.4      properties:
     3.5      methods:
     3.6          [id(1)] HRESULT MessageToSend([in] struct text_message * msg);
     3.7 -        [id(2)] HRESULT ShowHandshake([in] struct pEp_identity_s * self, [in] struct pEp_identity_s * partner, [out, retval] sync_handshake_result_s * result);
     3.8 +        [id(2)] HRESULT ShowHandshake([in] struct pEp_identity_s * self, [in] struct pEp_identity_s * partner, [in,out] sync_handshake_result_s * result);
     3.9      };
    3.10      [
    3.11          uuid(EF1B073D-5058-4E0E-829E-B4D22CA21EA2)
     4.1 --- a/pEpCOMServerAdapter.vcxproj	Wed May 11 19:37:27 2016 +0200
     4.2 +++ b/pEpCOMServerAdapter.vcxproj	Wed May 11 19:53:47 2016 +0200
     4.3 @@ -159,7 +159,7 @@
     4.4      <ClInclude Include="targetver.h" />
     4.5      <ClInclude Include="utf8_helper.h" />
     4.6      <ClInclude Include="xdlldata.h" />
     4.7 -    <ClInclude Include="_IpEpEngineEvents_CP.h" />
     4.8 +    <ClInclude Include="_IpEpEngineEvents_CP.H" />
     4.9    </ItemGroup>
    4.10    <ItemGroup>
    4.11      <ResourceCompile Include="pEpCOMServerAdapter.rc" />
     5.1 --- a/pEpCOMServerAdapter.vcxproj.filters	Wed May 11 19:37:27 2016 +0200
     5.2 +++ b/pEpCOMServerAdapter.vcxproj.filters	Wed May 11 19:53:47 2016 +0200
     5.3 @@ -66,11 +66,11 @@
     5.4      <ClInclude Include="utf8_helper.h">
     5.5        <Filter>Header Files</Filter>
     5.6      </ClInclude>
     5.7 -    <ClInclude Include="_IpEpEngineEvents_CP.h">
     5.8 +    <ClInclude Include="pEp_utility.h">
     5.9        <Filter>Header Files</Filter>
    5.10      </ClInclude>
    5.11 -    <ClInclude Include="pEp_utility.h">
    5.12 -      <Filter>Header Files</Filter>
    5.13 +    <ClInclude Include="_IpEpEngineEvents_CP.H">
    5.14 +      <Filter>Generated Files</Filter>
    5.15      </ClInclude>
    5.16    </ItemGroup>
    5.17    <ItemGroup>
     6.1 --- a/pEp_utility.cpp	Wed May 11 19:37:27 2016 +0200
     6.2 +++ b/pEp_utility.cpp	Wed May 11 19:53:47 2016 +0200
     6.3 @@ -284,7 +284,7 @@
     6.4              memset(msg, 0, sizeof(text_message));
     6.5          }
     6.6  
     6.7 -        void text_message_from_C(text_message *msg2, ::message *msg)
     6.8 +        void text_message_from_C(text_message *msg2, const ::message *msg)
     6.9          {
    6.10              assert(msg2);
    6.11              assert(msg);
     7.1 --- a/pEp_utility.h	Wed May 11 19:37:27 2016 +0200
     7.2 +++ b/pEp_utility.h	Wed May 11 19:53:47 2016 +0200
     7.3 @@ -74,6 +74,6 @@
     7.4          }
     7.5  
     7.6          ::message * text_message_to_C(text_message *msg);
     7.7 -        void text_message_from_C(text_message *msg2, ::message *msg);
     7.8 +        void text_message_from_C(text_message *msg2, const ::message *msg);
     7.9      }
    7.10  }
     8.1 --- a/stdafx.h	Wed May 11 19:37:27 2016 +0200
     8.2 +++ b/stdafx.h	Wed May 11 19:53:47 2016 +0200
     8.3 @@ -43,3 +43,4 @@
     8.4  #include "../../pEpEngine/src/message_api.h"
     8.5  #include "../../pEpEngine/src/stringpair.h"
     8.6  #include "../../pEpEngine/src/blacklist.h"
     8.7 +#include "../../pEpEngine/src/sync.h"
     8.8 \ No newline at end of file