windows build stuff

build-windows/pEpEngine.vcxproj

@@ -100,15 +100,17 @@
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\asn1_helper.c" />
     <ClCompile Include="..\src\baseprotocol.c" />
     <ClCompile Include="..\src\blacklist.c" />
     <ClCompile Include="..\src\bloblist.c" />
     <ClCompile Include="..\src\cryptotech.c" />
     <ClCompile Include="..\src\email.c" />
     <ClCompile Include="..\src\etpan_mime.c" />
+    <ClCompile Include="..\src\growing_buf.c" />
     <ClCompile Include="..\src\identity_list.c" />
     <ClCompile Include="..\src\keymanagement.c" />
+    <ClCompile Include="..\src\KeySync_fsm.c" />
+    <ClCompile Include="..\src\key_reset.c" />
     <ClCompile Include="..\src\labeled_int_list.c" />
     <ClCompile Include="..\src\map_asn1.c" />
     <ClCompile Include="..\src\message.c" />
@@ -123,12 +125,12 @@
     <ClCompile Include="..\src\sqlite3.c" />
     <ClCompile Include="..\src\stringlist.c" />
     <ClCompile Include="..\src\stringpair.c" />
-    <ClCompile Include="..\src\sync.c" />
-    <ClCompile Include="..\src\sync_actions.c" />
-    <ClCompile Include="..\src\sync_driver.c" />
-    <ClCompile Include="..\src\sync_fsm.c" />
-    <ClCompile Include="..\src\sync_impl.c" />
-    <ClCompile Include="..\src\sync_send_actions.c" />
+    <ClCompile Include="..\src\Sync_actions.c" />
+    <ClCompile Include="..\src\sync_api.c" />
+    <ClCompile Include="..\src\sync_codec.c" />
+    <ClCompile Include="..\src\Sync_event.c" />
+    <ClCompile Include="..\src\Sync_func.c" />
+    <ClCompile Include="..\src\Sync_impl.c" />
     <ClCompile Include="..\src\timestamp.c" />
     <ClCompile Include="..\src\transport.c" />
     <ClCompile Include="..\src\trans_auto.c" />
@@ -142,8 +144,11 @@
     <ClInclude Include="..\src\dynamic_api.h" />
     <ClInclude Include="..\src\email.h" />
     <ClInclude Include="..\src\etpan_mime.h" />
+    <ClInclude Include="..\src\growing_buf.h" />
     <ClInclude Include="..\src\identity_list.h" />
     <ClInclude Include="..\src\keymanagement.h" />
+    <ClInclude Include="..\src\KeySync_fsm.h" />
+    <ClInclude Include="..\src\key_reset.h" />
     <ClInclude Include="..\src\labeled_int_list.h" />
     <ClInclude Include="..\src\map_asn1.h" />
     <ClInclude Include="..\src\message.h" />
@@ -162,9 +167,11 @@
     <ClInclude Include="..\src\sqlite3.h" />
     <ClInclude Include="..\src\stringlist.h" />
     <ClInclude Include="..\src\stringpair.h" />
-    <ClInclude Include="..\src\sync.h" />
-    <ClInclude Include="..\src\sync_fsm.h" />
-    <ClInclude Include="..\src\sync_impl.h" />
+    <ClInclude Include="..\src\sync_api.h" />
+    <ClInclude Include="..\src\sync_codec.h" />
+    <ClInclude Include="..\src\Sync_event.h" />
+    <ClInclude Include="..\src\Sync_func.h" />
+    <ClInclude Include="..\src\Sync_impl.h" />
     <ClInclude Include="..\src\timestamp.h" />
     <ClInclude Include="..\src\transport.h" />
     <ClInclude Include="..\src\trans_auto.h" />

build-windows/pEpEngine.vcxproj.filters

@@ -72,43 +72,49 @@
     <ClCompile Include="..\src\blacklist.c">
       <Filter>Quelldateien</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\sync.c">
+    <ClCompile Include="..\src\map_asn1.c">
       <Filter>Quelldateien</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\sync_actions.c">
+    <ClCompile Include="..\src\baseprotocol.c">
       <Filter>Quelldateien</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\sync_driver.c">
+    <ClCompile Include="..\src\openpgp_compat.c">
       <Filter>Quelldateien</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\sync_fsm.c">
+    <ClCompile Include="..\src\resource_id.c">
       <Filter>Quelldateien</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\map_asn1.c">
+    <ClCompile Include="..\src\pEp_string.c">
       <Filter>Quelldateien</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\baseprotocol.c">
+    <ClCompile Include="..\src\labeled_int_list.c">
       <Filter>Quelldateien</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\sync_send_actions.c">
+    <ClCompile Include="..\src\key_reset.c">
       <Filter>Quelldateien</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\openpgp_compat.c">
+    <ClCompile Include="..\src\KeySync_fsm.c">
       <Filter>Quelldateien</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\asn1_helper.c">
+    <ClCompile Include="..\src\Sync_actions.c">
       <Filter>Quelldateien</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\sync_impl.c">
+    <ClCompile Include="..\src\sync_api.c">
       <Filter>Quelldateien</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\resource_id.c">
+    <ClCompile Include="..\src\sync_codec.c">
       <Filter>Quelldateien</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\pEp_string.c">
+    <ClCompile Include="..\src\Sync_event.c">
       <Filter>Quelldateien</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\labeled_int_list.c">
+    <ClCompile Include="..\src\Sync_func.c">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\Sync_impl.c">
+      <Filter>Quelldateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\growing_buf.c">
       <Filter>Quelldateien</Filter>
     </ClCompile>
   </ItemGroup>
@@ -188,12 +194,6 @@
     <ClInclude Include="..\src\blacklist.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\sync.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\sync_fsm.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\map_asn1.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
@@ -206,9 +206,6 @@
     <ClInclude Include="..\src\asn1_helper.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\sync_impl.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\resource_id.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
@@ -218,6 +215,30 @@
     <ClInclude Include="..\src\labeled_int_list.h">
       <Filter>Headerdateien</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\key_reset.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\KeySync_fsm.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\sync_api.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\sync_codec.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\Sync_event.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\Sync_func.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\Sync_impl.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\growing_buf.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\LICENSE.txt" />

sync/gen_codec.ysl2

@@ -108,7 +108,7 @@ tstylesheet {
         #include "pEp_internal.h"
         #include "growing_buf.h"
 
-        DYNAMIC_API PEP_STATUS decode_«@name»_message(
+        PEP_STATUS decode_«@name»_message(
                 const char *data,
                 size_t size,
                 «@name»_t **msg
@@ -128,7 +128,7 @@ tstylesheet {
             return PEP_STATUS_OK;
         }
 
-        DYNAMIC_API PEP_STATUS encode_«@name»_message(
+        PEP_STATUS encode_«@name»_message(
                 «@name»_t *msg,
                 char **data,
                 size_t *size
@@ -153,7 +153,7 @@ tstylesheet {
             return PEP_STATUS_OK;
         }
 
-        DYNAMIC_API PEP_STATUS PER_to_XER_«@name»_msg(
+        PEP_STATUS PER_to_XER_«@name»_msg(
                 const char *data,
                 size_t size,
                 char **text
@@ -195,7 +195,7 @@ tstylesheet {
             return status;
         }
 
-        DYNAMIC_API PEP_STATUS XER_to_PER_«@name»_msg(
+        PEP_STATUS XER_to_PER_«@name»_msg(
                 const char *text,
                 char **data,
                 size_t *size