remove device_name sync
authorVolker Birk <vb@pep-project.org>
Thu, 21 Mar 2019 18:44:22 +0100
branchsync
changeset 33754f64652fb80d
parent 3367 f23745b102eb
child 3376 64ef75bc10fb
remove device_name
src/pEpEngine.c
src/pEpEngine.h
src/pEp_internal.h
src/sync_api.c
sync/gen_statemachine.ysl2
     1.1 --- a/src/pEpEngine.c	Thu Mar 21 14:12:51 2019 +0100
     1.2 +++ b/src/pEpEngine.c	Thu Mar 21 18:44:22 2019 +0100
     1.3 @@ -4906,3 +4906,4 @@
     1.4  }
     1.5  
     1.6  #endif
     1.7 +
     2.1 --- a/src/pEpEngine.h	Thu Mar 21 14:12:51 2019 +0100
     2.2 +++ b/src/pEpEngine.h	Thu Mar 21 18:44:22 2019 +0100
     2.3 @@ -1525,7 +1525,9 @@
     2.4                       const char *fpr, 
     2.5                       char **sign, 
     2.6                       size_t *sign_size);
     2.7 -                     
     2.8 +
     2.9 +const char *get_device_name(PEP_SESSION session);
    2.10 +
    2.11  #ifdef __cplusplus
    2.12  }
    2.13  #endif
     3.1 --- a/src/pEp_internal.h	Thu Mar 21 14:12:51 2019 +0100
     3.2 +++ b/src/pEp_internal.h	Thu Mar 21 18:44:22 2019 +0100
     3.3 @@ -241,13 +241,13 @@
     3.4      // callbacks
     3.5      examine_identity_t examine_identity;
     3.6      void *examine_management;
     3.7 -    void *sync_management;
     3.8 -    void *sync_obj;
     3.9      notifyHandshake_t notifyHandshake;
    3.10      inject_sync_event_t inject_sync_event;
    3.11      retrieve_next_sync_event_t retrieve_next_sync_event;
    3.12  
    3.13      // pEp Sync
    3.14 +    void *sync_management;
    3.15 +    void *sync_obj;
    3.16      struct Sync_state_s sync_state;
    3.17      struct own_Sync_state_s own_sync_state;
    3.18  
     4.1 --- a/src/sync_api.c	Thu Mar 21 14:12:51 2019 +0100
     4.2 +++ b/src/sync_api.c	Thu Mar 21 18:44:22 2019 +0100
     4.3 @@ -128,14 +128,6 @@
     4.4      session->sync_obj = obj;
     4.5  
     4.6      PEP_STATUS status = recv_Sync_event(session, event);
     4.7 -    if (status != PEP_STATUS_OK && status != PEP_MESSAGE_IGNORE) {
     4.8 -        char buffer[MAX_LINELENGTH];
     4.9 -        memset(buffer, 0, MAX_LINELENGTH);
    4.10 -        snprintf(buffer, MAX_LINELENGTH, "problem with msg received: %d\n",
    4.11 -                (int) status);
    4.12 -        log_event(session, buffer, "pEp sync protocol", NULL, NULL);
    4.13 -    }
    4.14 -
    4.15      return status == PEP_MESSAGE_IGNORE ? PEP_STATUS_OK : status;
    4.16  }
    4.17  
     5.1 --- a/sync/gen_statemachine.ysl2	Thu Mar 21 14:12:51 2019 +0100
     5.2 +++ b/sync/gen_statemachine.ysl2	Thu Mar 21 18:44:22 2019 +0100
     5.3 @@ -876,13 +876,6 @@
     5.4  
     5.5          #define «@name»_ERR_LOG_INT(t, n) _«@name»_ERR_LOG_int(session, (t), (n), false)
     5.6          #define «@name»_ERR_LOG_HEX(t, n) _«@name»_ERR_LOG_int(session, (t), (n), true)
     5.7 -
     5.8 -        #ifndef SERVICE_LOG
     5.9 -        // SERVICE LOG is meant to check session->service_log in runtime config;
    5.10 -        // for older engines log more than needed
    5.11 -        #define SERVICE_LOG(session, t, n, d) log_event((session), (t), (n), (d), "service")
    5.12 -        #endif 
    5.13 -
    5.14          #define «@name»_SERVICE_LOG(t, d) SERVICE_LOG(session, (t), "«@name»", (d))
    5.15  
    5.16          «@name»_state fsm_«@name»(