Browse Source

not needed any more

ENGINE-596
Volker Birk 3 years ago
parent
commit
b613a3e423
3 changed files with 8 additions and 14 deletions
  1. +3
    -3
      src/sync_api.h
  2. +3
    -6
      sync/cond_act_sync.yml2
  3. +2
    -5
      sync/sync.fsm

+ 3
- 3
src/sync_api.h View File

@ -27,13 +27,13 @@ typedef enum _sync_handshake_signal {
// handshake accepted by user
SYNC_NOTIFY_ACCEPTED_DEVICE_ADDED = 6,
SYNC_NOTIFY_ACCEPTED_GROUP_CREATED = 7,
// SYNC_NOTIFY_ACCEPTED_DEVICE_MOVED = 8,
SYNC_NOTIFY_ACCEPTED_DEVICE_ACCEPTED = 8,
// handshake dialog must be closed
SYNC_NOTIFY_OVERTAKEN = 9,
// SYNC_NOTIFY_OVERTAKEN = 9,
// forming group
SYNC_NOTIFY_FORMING_GROUP = 10,
// SYNC_NOTIFY_FORMING_GROUP = 10,
// notification of actual group status
SYNC_NOTIFY_SOLE = 254,


+ 3
- 6
sync/cond_act_sync.yml2 View File

@ -318,15 +318,12 @@ action showJoinGroupHandshake
action showGroupedHandshake
call "show_handshake" with "type" > SYNC_NOTIFY_INIT_ADD_OTHER_DEVICE
action hideHandshakeDialog
call "show_handshake" with "type" > SYNC_NOTIFY_OVERTAKEN
action showDeviceAdded
call "show_handshake" with "type" > SYNC_NOTIFY_ACCEPTED_DEVICE_ADDED
action showFormingGroup
call "show_handshake" with "type" > SYNC_NOTIFY_FORMING_GROUP
action showDeviceAccepted
call "show_handshake" with "type" > SYNC_NOTIFY_ACCEPTED_DEVICE_ACCEPTED
action showGroupCreated
call "show_handshake" with "type" > SYNC_NOTIFY_ACCEPTED_GROUP_CREATED


+ 2
- 5
sync/sync.fsm View File

@ -239,7 +239,6 @@ protocol Sync 1 {
on Init {
do prepareOwnKeys;
send OwnKeysOfferer; // we're not grouped yet, this is our own keys
do showFormingGroup;
}
on Cancel {
@ -259,9 +258,6 @@ protocol Sync 1 {
}
state FormingGroupRequester {
on Init
do showFormingGroup;
on Cancel {
send Rollback;
go Sole;
@ -431,7 +427,6 @@ protocol Sync 1 {
go HandshakingGroupedPhase2;
on GroupTrustThisKey {
do hideHandshakeDialog;
do trustThisKey;
if sameNegotiation
go Grouped;
@ -451,6 +446,7 @@ protocol Sync 1 {
on CommitAccept if sameNegotiationAndPartner {
do prepareOwnKeys;
send GroupKeys;
do showDeviceAccepted;
go Grouped;
}
@ -480,6 +476,7 @@ protocol Sync 1 {
send GroupTrustThisKey;
do prepareOwnKeys;
send GroupKeys;
do showDeviceAccepted;
go Grouped;
}


Loading…
Cancel
Save