IOSAD-103 merge in sync IOSAD-103
authorDirk Zimmermann <dirk@pep-project.org>
Wed, 31 Oct 2018 07:21:03 +0100
branchIOSAD-103
changeset 3119f4d996c27258
parent 3116 51bd81c53007
parent 3118 b7f133799831
child 3124 92b0cb493286
IOSAD-103 merge in sync
     1.1 --- a/sync/gen_statemachine.ysl2	Tue Oct 30 14:56:17 2018 +0100
     1.2 +++ b/sync/gen_statemachine.ysl2	Wed Oct 31 07:21:03 2018 +0100
     1.3 @@ -327,14 +327,17 @@
     1.4  
     1.5                  «@name»_event_t *ev = NULL;
     1.6  
     1.7 -                switch (msg->present) {
     1.8 +                «@name»_PR fsm = msg->present;
     1.9 +                int event = 0;
    1.10 +
    1.11 +                switch (fsm) {
    1.12                      `` apply "fsm", 2, mode=signal_message
    1.13                      default:
    1.14                          status = PEP_«yml:ucase(@name)»_ILLEGAL_MESSAGE;
    1.15                          goto the_end;
    1.16                  }
    1.17  
    1.18 -                ev = new_«@name»_event(None, None, msg);
    1.19 +                ev = new_«@name»_event(fsm, event, msg);
    1.20                  if (!ev) {
    1.21                      status = PEP_OUT_OF_MEMORY;
    1.22                      goto the_end;
    1.23 @@ -588,14 +591,15 @@
    1.24      {
    1.25          ||
    1.26          case «../@name»_PR_«yml:lcase(@name)»:
    1.27 -            switch (msg->choice.«yml:lcase(@name)».payload.present) {
    1.28 +            event = msg->choice.«yml:lcase(@name)».payload.present;
    1.29 +            switch (event) {
    1.30          ||
    1.31          if "message[@security='unencrypted']" {
    1.32              |         // these messages are going untested
    1.33              for "message[@security='unencrypted']"
    1.34                  |>> case «../@name»__payload_PR_«yml:mixedCase(@name)»:
    1.35              ||
    1.36 -                       break;
    1.37 +                        break;
    1.38  
    1.39              ||
    1.40          }