adding dont_trigger_sync flag sync
authorVolker Birk <vb@pep-project.org>
Fri, 22 Mar 2019 12:51:51 +0100
branchsync
changeset 3377922fd505e0c0
parent 3376 64ef75bc10fb
child 3378 7f1e1775d946
child 3379 2f957d83c0f7
adding dont_trigger_sync flag
src/message_api.c
src/message_api.h
sync/sync.fsm
     1.1 --- a/src/message_api.c	Thu Mar 21 18:44:38 2019 +0100
     1.2 +++ b/src/message_api.c	Fri Mar 22 12:51:51 2019 +0100
     1.3 @@ -3851,7 +3851,8 @@
     1.4  
     1.5      message *msg = *dst ? *dst : src;
     1.6  
     1.7 -    if (session->inject_sync_event && msg && msg->from) {
     1.8 +    if (session->inject_sync_event && msg && msg->from &&
     1.9 +            !(*flags & PEP_decrypt_flag_dont_trigger_sync)) {
    1.10          size_t size;
    1.11          const char *data;
    1.12          char *sync_fpr = NULL;
     2.1 --- a/src/message_api.h	Thu Mar 21 18:44:38 2019 +0100
     2.2 +++ b/src/message_api.h	Fri Mar 22 12:51:51 2019 +0100
     2.3 @@ -270,7 +270,8 @@
     2.4      PEP_decrypt_flag_ignore = 0x4,
     2.5      PEP_decrypt_flag_src_modified = 0x8,
     2.6      // input flags    
     2.7 -    PEP_decrypt_flag_untrusted_server = 0x100
     2.8 +    PEP_decrypt_flag_untrusted_server = 0x100,
     2.9 +    PEP_decrypt_flag_dont_trigger_sync = 0x200,
    2.10  } PEP_decrypt_flags; 
    2.11  
    2.12  typedef unsigned int PEP_decrypt_flags_t;
     3.1 --- a/sync/sync.fsm	Thu Mar 21 18:44:38 2019 +0100
     3.2 +++ b/sync/sync.fsm	Fri Mar 22 12:51:51 2019 +0100
     3.3 @@ -52,7 +52,6 @@
     3.4                      send HandshakeAnswer;
     3.5                      if partnerIsGrouped
     3.6                          go HandshakingWithGroup;
     3.7 -
     3.8                      go HandshakingNew;
     3.9                  }
    3.10              }