diff options
| author | Harald Welte <laforge@gnumonks.org> | 2018-03-12 15:01:23 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2018-04-18 23:23:22 +0200 |
| commit | d879bd9aa0edd4b22cf26d245b56dadf2efa14de (patch) | |
| tree | 2e1cc361f668e2f16994d5c123b3ee48bc66ad01 /lapdm | |
| parent | 2d86affc8cbff74dd71f0467388608cc78fafa95 (diff) | |
LAPDm: Re-structure: Merge Frame type A+B which are really the same
A is B with zero-length payload. No need to separate them.
Change-Id: I7b3079899f42a61d67be03e3a17346af80d7b3be
Diffstat (limited to 'lapdm')
| -rw-r--r-- | lapdm/L1CTL_Test.ttcn | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/lapdm/L1CTL_Test.ttcn b/lapdm/L1CTL_Test.ttcn index 98dc43b1..97704acb 100644 --- a/lapdm/L1CTL_Test.ttcn +++ b/lapdm/L1CTL_Test.ttcn @@ -45,9 +45,9 @@ module L1CTL_Test { } /* template for a valid SABM frame */ template LapdmFrame LAPDm_B_SABM(template GsmSapi sapi, octetstring payload) := { - b := { + ab := { addr := tr_LapdmAddr(sapi, false), - ctrl := t_LapdmCtrlSABM(true), + ctrl := tr_LapdmCtrlSABM(true), len := lengthof(payload), m := false, el := 1, @@ -57,9 +57,9 @@ module L1CTL_Test { /* template for a valid UA frame */ template LapdmFrame tr_LAPDm_B_UA(template GsmSapi sapi, template octetstring payload) := { - b := { + ab := { addr := tr_LapdmAddr(sapi, false), - ctrl := t_LapdmCtrlUA(true), + ctrl := tr_LapdmCtrlUA(true), len := ?, m := false, el := 1, @@ -69,9 +69,9 @@ module L1CTL_Test { /* template for a valid UA frame */ template LapdmFrame LAPDm_B_UA(template GsmSapi sapi, octetstring payload) := { - b := { + ab := { addr := tr_LapdmAddr(sapi, false), - ctrl := t_LapdmCtrlUA(true), + ctrl := tr_LapdmCtrlUA(true), len := lengthof(payload), m := false, el := 1, @@ -81,9 +81,9 @@ module L1CTL_Test { /* template for a valid UI frame */ template LapdmFrame LAPDm_B_UI(template GsmSapi sapi, octetstring payload) := { - b := { + ab := { addr := tr_LapdmAddr(sapi, true), - ctrl := t_LapdmCtrlUI(false), + ctrl := tr_LapdmCtrlUI(false), len := lengthof(payload), m := false, el := 1, @@ -92,7 +92,7 @@ module L1CTL_Test { } template LapdmFrame t_nopayload(template GsmSapi sapi) := { - b := { + ab := { addr := tr_LapdmAddr(sapi, true), ctrl := ?, len := 0, @@ -103,14 +103,14 @@ module L1CTL_Test { } template LapdmFrame LAPDm_B_DISC(template GsmSapi sapi) modifies t_nopayload := { - b := { - ctrl := t_LapdmCtrlDISC(true) + ab := { + ctrl := tr_LapdmCtrlDISC(true) } } template LapdmFrame LAPDm_B_RR(template GsmSapi sapi, template uint3_t nr) modifies t_nopayload := { - b := { - ctrl := t_LapdmCtrlRR(nr, false) + ab := { + ctrl := tr_LapdmCtrlRR(nr, false) } } @@ -232,12 +232,12 @@ module L1CTL_Test { log("DEC UI CU: ", dec_LapdmCtrlU('03'O)); log("DEC UI CT: ", dec_LapdmCtrl('03'O)); - log("DEC UA: ", dec_LapdmFrameB('017301'O)); - log("DEC UI: ", dec_LapdmFrameA('030301'O)); - log("DEC I: ", dec_LapdmFrameA('030001'O)); - log("DEC S: ", dec_LapdmFrameA('030101'O)); - log("DEC: ", dec_LapdmFrameB('030301'O)); - log("DEC: ", dec_LapdmFrameB('0303012B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B'O)); + log("DEC UA: ", dec_LapdmFrameAB('017301'O)); + log("DEC UI: ", dec_LapdmFrameAB('030301'O)); + log("DEC I: ", dec_LapdmFrameAB('030001'O)); + log("DEC S: ", dec_LapdmFrameAB('030101'O)); + log("DEC: ", dec_LapdmFrameAB('030301'O)); + log("DEC: ", dec_LapdmFrameAB('0303012B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B2B'O)); } control { |