IOS-506 export public engine details in sync_app.h
authorDirk Zimmermann <dirk@pep-project.org>
Tue, 16 May 2017 15:53:59 +0200
changeset 17856471e6e427b3
parent 1784 dc910648bc32
child 1786 843c43703546
IOS-506 export public engine details in sync_app.h
build-mac/pEpEngine.xcodeproj/project.pbxproj
src/sync.h
src/sync_app.h
     1.1 --- a/build-mac/pEpEngine.xcodeproj/project.pbxproj	Tue May 16 14:26:15 2017 +0200
     1.2 +++ b/build-mac/pEpEngine.xcodeproj/project.pbxproj	Tue May 16 15:53:59 2017 +0200
     1.3 @@ -190,6 +190,7 @@
     1.4  
     1.5  /* Begin PBXFileReference section */
     1.6  		430D258A1C9ED75A00B94535 /* blacklist.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = blacklist.c; path = ../src/blacklist.c; sourceTree = "<group>"; };
     1.7 +		4346F86A1ECB38E700381CBE /* sync_app.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = sync_app.h; path = ../src/sync_app.h; sourceTree = "<group>"; };
     1.8  		4354FF641D6EDF300033069C /* sync_impl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sync_impl.c; path = ../src/sync_impl.c; sourceTree = "<group>"; };
     1.9  		4354FF681D6EE1A70033069C /* NULL.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = NULL.c; path = ../asn.1/NULL.c; sourceTree = "<group>"; };
    1.10  		43BA0F451D7964750059172F /* asn1_helper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = asn1_helper.c; path = ../src/asn1_helper.c; sourceTree = "<group>"; };
    1.11 @@ -517,6 +518,7 @@
    1.12  				646C41421D510D2C00C63EFF /* sync_send_actions.c */,
    1.13  				646C41431D510D2C00C63EFF /* sync.c */,
    1.14  				646C41441D510D2C00C63EFF /* sync.h */,
    1.15 +				4346F86A1ECB38E700381CBE /* sync_app.h */,
    1.16  				646788871CEB3D120001F54C /* map_asn1.c */,
    1.17  				646788881CEB3D120001F54C /* map_asn1.h */,
    1.18  				430D258A1C9ED75A00B94535 /* blacklist.c */,
    1.19 @@ -779,7 +781,7 @@
    1.20  			);
    1.21  			runOnlyForDeploymentPostprocessing = 0;
    1.22  			shellPath = /bin/sh;
    1.23 -			shellScript = "mkdir -p \"$BUILT_PRODUCTS_DIR/include\"\n\ncp \"$SRCROOT/../src/\"{\\\npEpEngine.h,\\\ncryptotech.h,\\\nkeymanagement.h,\\\nmessage_api.h,\\\ndynamic_api.h,\\\nstringlist.h,\\\ntimestamp.h,\\\nidentity_list.h,\\\nbloblist.h,\\\nstringpair.h,\\\nmessage.h,\\\nmime.h,\\\nsync_fsm.h,\\\nsync.h} \"$BUILT_PRODUCTS_DIR/include\"\n\nbash -l -c \"make -C ../asn.1 generate\"\nbash -l -c \"make -C ../asn.1\"\nbash -l -c \"LC_ALL=en_US.UTF-8 YML_PATH=$HOME/yml2 make -C ../sync\"\n";
    1.24 +			shellScript = "mkdir -p \"$BUILT_PRODUCTS_DIR/include\"\n\ncp \"$SRCROOT/../src/\"{\\\npEpEngine.h,\\\ncryptotech.h,\\\nkeymanagement.h,\\\nmessage_api.h,\\\ndynamic_api.h,\\\nstringlist.h,\\\ntimestamp.h,\\\nidentity_list.h,\\\nbloblist.h,\\\nstringpair.h,\\\nmessage.h,\\\nmime.h,\\\nsync_fsm.h,\\\nsync.h,\\\nsync_app.h} \"$BUILT_PRODUCTS_DIR/include\"\n\nbash -l -c \"make -C ../asn.1 generate\"\nbash -l -c \"make -C ../asn.1\"\nbash -l -c \"LC_ALL=en_US.UTF-8 YML_PATH=$HOME/yml2 make -C ../sync\"\n";
    1.25  		};
    1.26  /* End PBXShellScriptBuildPhase section */
    1.27  
     2.1 --- a/src/sync.h	Tue May 16 14:26:15 2017 +0200
     2.2 +++ b/src/sync.h	Tue May 16 15:53:59 2017 +0200
     2.3 @@ -203,7 +203,7 @@
     2.4  
     2.5  #include "message.h"
     2.6  #include "sync_fsm.h"
     2.7 -
     2.8 +#include "sync_app.h"
     2.9  
    2.10  // this module is for being used WITHOUT the Transport API in transport.h
    2.11  // DO NOT USE IT WHEN USING Transport API!
    2.12 @@ -227,28 +227,6 @@
    2.13  
    2.14  typedef PEP_STATUS (*messageToSend_t)(void *obj, message *msg);
    2.15  
    2.16 -// TODO add this to generated code.
    2.17 -typedef enum _sync_handshake_signal {
    2.18 -    SYNC_NOTIFY_UNDEFINED = 0,
    2.19 -
    2.20 -    // request show handshake dialog
    2.21 -    SYNC_NOTIFY_INIT_ADD_OUR_DEVICE,
    2.22 -    SYNC_NOTIFY_INIT_ADD_OTHER_DEVICE,
    2.23 -    SYNC_NOTIFY_INIT_FORM_GROUP,
    2.24 -    SYNC_NOTIFY_INIT_MOVE_OUR_DEVICE,
    2.25 -
    2.26 -    // handshake process timed out
    2.27 -    SYNC_NOTIFY_TIMEOUT,
    2.28 -
    2.29 -    // handshake accepted by user
    2.30 -    SYNC_NOTIFY_ACCEPTED_DEVICE_ADDED,
    2.31 -    SYNC_NOTIFY_ACCEPTED_GROUP_CREATED,
    2.32 -    SYNC_NOTIFY_ACCEPTED_DEVICE_MOVED,
    2.33 -
    2.34 -    // handshake dialog must be closed
    2.35 -    SYNC_NOTIFY_OVERTAKEN
    2.36 -} sync_handshake_signal;
    2.37 -
    2.38  // notifyHandshake() - notify UI about sync handshaking process
    2.39  //
    2.40  //  parameters:
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/src/sync_app.h	Tue May 16 15:53:59 2017 +0200
     3.3 @@ -0,0 +1,34 @@
     3.4 +//
     3.5 +//  sync_app.h
     3.6 +//  pEpEngine
     3.7 +//
     3.8 +//  Created by Dirk Zimmermann on 16.05.17.
     3.9 +//  Copyright © 2017 Edouard Tisserant. All rights reserved.
    3.10 +//
    3.11 +
    3.12 +#ifndef sync_app_h
    3.13 +#define sync_app_h
    3.14 +
    3.15 +// TODO add this to generated code.
    3.16 +typedef enum _sync_handshake_signal {
    3.17 +    SYNC_NOTIFY_UNDEFINED = 0,
    3.18 +
    3.19 +    // request show handshake dialog
    3.20 +    SYNC_NOTIFY_INIT_ADD_OUR_DEVICE,
    3.21 +    SYNC_NOTIFY_INIT_ADD_OTHER_DEVICE,
    3.22 +    SYNC_NOTIFY_INIT_FORM_GROUP,
    3.23 +    SYNC_NOTIFY_INIT_MOVE_OUR_DEVICE,
    3.24 +
    3.25 +    // handshake process timed out
    3.26 +    SYNC_NOTIFY_TIMEOUT,
    3.27 +
    3.28 +    // handshake accepted by user
    3.29 +    SYNC_NOTIFY_ACCEPTED_DEVICE_ADDED,
    3.30 +    SYNC_NOTIFY_ACCEPTED_GROUP_CREATED,
    3.31 +    SYNC_NOTIFY_ACCEPTED_DEVICE_MOVED,
    3.32 +
    3.33 +    // handshake dialog must be closed
    3.34 +    SYNC_NOTIFY_OVERTAKEN
    3.35 +} sync_handshake_signal;
    3.36 +
    3.37 +#endif /* sync_app_h */