completing
authorVolker Birk <vb@pep-project.org>
Tue, 03 May 2016 08:44:27 +0200
changeset 569d0baaf55e038
parent 568 17b2543e1350
child 570 963682eaf5c8
completing
sync/sync.fsm
     1.1 --- a/sync/sync.fsm	Tue May 03 08:39:15 2016 +0200
     1.2 +++ b/sync/sync.fsm	Tue May 03 08:44:27 2016 +0200
     1.3 @@ -33,7 +33,7 @@
     1.4          state HandshakingSole(identity partner) {
     1.5              on init
     1.6                  do showHandshake(partner);
     1.7 -            on HandshakeRejected {
     1.8 +            on HandshakeRejected(partner) {
     1.9                  do reject(partner);
    1.10                  go Sole;
    1.11              }
    1.12 @@ -49,11 +49,15 @@
    1.13          }
    1.14      
    1.15          state WaitForGroupKeys(identity partner) {
    1.16 -            on ReceiveGroupKeys(partner) {
    1.17 +            on ReceiveGroupKeys(identity partner) {
    1.18                  storeGroupKeys(partner);
    1.19                  go Grouped;
    1.20              }
    1.21              on Cancel go Sole;
    1.22 +            on RejectReceived(identity partner) {
    1.23 +                do reject(partner);
    1.24 +                go Sole;
    1.25 +            }
    1.26          }
    1.27  
    1.28          state Grouped {
    1.29 @@ -63,13 +67,10 @@
    1.30                  do sendHandshakeRequest;
    1.31                  do showHandshake(partner);
    1.32              }
    1.33 -            on HandshakeRejected {
    1.34 +            on HandshakeRejected(identity partner)
    1.35                  do reject(partner);
    1.36 -                go Grouped;
    1.37 -            }
    1.38 -            on HandshakeAccepted {
    1.39 -
    1.40 -            }
    1.41 +            on HandshakeAccepted(identity partner)
    1.42 +                sendGroupKeys(partner);
    1.43          }
    1.44      }
    1.45  }