<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18457">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">library/IPA_Emulation: assume TRX#0 in ASP_RSL_Unitdata templates<br><br>Change-Id: I93297680a2644516870222c2bb8eee03c6b575a9<br>---<br>M bsc/BSC_Tests.ttcn<br>M bsc/BSC_Tests_CBSP.ttcn<br>M library/IPA_Emulation.ttcnpp<br>M library/RSL_Emulation.ttcn<br>M selftest/Selftest.ttcn<br>5 files changed, 37 insertions(+), 45 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/57/18457/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn</span><br><span>index bcefe67..48766f1 100644</span><br><span>--- a/bsc/BSC_Tests.ttcn</span><br><span>+++ b/bsc/BSC_Tests.ttcn</span><br><span>@@ -228,7 +228,7 @@</span><br><span>    alt {</span><br><span>        [] IPA_RSL[i].receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_ID_ACK)) {</span><br><span>                 T.stop;</span><br><span style="color: hsl(0, 100%, 40%);">-         IPA_RSL[i].send(ts_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0,ts_RSL_PAGING_LOAD_IND(23)));</span><br><span style="color: hsl(120, 100%, 40%);">+               IPA_RSL[i].send(ts_ASP_RSL_UD(ts_RSL_PAGING_LOAD_IND(23)));</span><br><span>          }</span><br><span>    [] IPA_RSL[i].receive(ASP_IPA_Event:?) { repeat }</span><br><span>    [] IPA_RSL[i].receive { repeat }</span><br><span>@@ -398,7 +398,7 @@</span><br><span> </span><br><span>   T.start;</span><br><span>     alt {</span><br><span style="color: hsl(0, 100%, 40%);">-   [] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(sid, t_rx)) -> value rx_rsl_ud {</span><br><span style="color: hsl(120, 100%, 40%);">+  [] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(t_rx, sid)) -> value rx_rsl_ud {</span><br><span>                 T.stop;</span><br><span>              }</span><br><span>    [] IPA_RSL[bts_nr].receive { repeat; }</span><br><span>@@ -413,7 +413,7 @@</span><br><span> /* helper function to transmit RSL on a given BTS/stream */</span><br><span> function f_ipa_tx(integer bts_nr, template RSL_Message t_tx, IpaStreamId sid := IPAC_PROTO_RSL_TRX0)</span><br><span> runs on test_CT {</span><br><span style="color: hsl(0, 100%, 40%);">-        IPA_RSL[bts_nr].send(ts_ASP_RSL_UD(sid, t_tx));</span><br><span style="color: hsl(120, 100%, 40%);">+       IPA_RSL[bts_nr].send(ts_ASP_RSL_UD(t_tx, sid));</span><br><span> }</span><br><span> </span><br><span> </span><br><span>@@ -424,7 +424,7 @@</span><br><span> </span><br><span>       f_init(1);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  IPA_RSL[0].send(ts_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0,ts_RSL_CHAN_RQD('23'O, 23)));</span><br><span style="color: hsl(120, 100%, 40%);">+       IPA_RSL[0].send(ts_ASP_RSL_UD(ts_RSL_CHAN_RQD('23'O, 23)));</span><br><span>  rsl_unused := f_exp_ipa_rx(0, tr_RSL_MsgTypeD(RSL_MT_CHAN_ACTIV));</span><br><span>   setverdict(pass);</span><br><span> }</span><br><span>@@ -438,7 +438,7 @@</span><br><span>         f_init(1);</span><br><span> </span><br><span>       chreq_total := f_ctrl_get_ratectr_abs(IPA_CTRL, "bts", 0, "chreq:total");</span><br><span style="color: hsl(0, 100%, 40%);">-   IPA_RSL[0].send(ts_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0,ts_RSL_CHAN_RQD('23'O, 23)));</span><br><span style="color: hsl(120, 100%, 40%);">+       IPA_RSL[0].send(ts_ASP_RSL_UD(ts_RSL_CHAN_RQD('23'O, 23)));</span><br><span>  rsl_unused := f_exp_ipa_rx(0, tr_RSL_MsgTypeD(RSL_MT_CHAN_ACTIV));</span><br><span>   f_ctrl_get_exp_ratectr_abs(IPA_CTRL, "bts", 0, "chreq:total", chreq_total+1);</span><br><span> </span><br><span>@@ -554,11 +554,10 @@</span><br><span>        f_ipa_tx(0, ts_RSL_CHAN_RQD('42'O, 42));</span><br><span> </span><br><span>         alt {</span><br><span style="color: hsl(0, 100%, 40%);">-   [] IPA_RSL[0].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0,</span><br><span style="color: hsl(0, 100%, 40%);">-                                tr_RSL_MsgTypeD(RSL_MT_CHAN_ACTIV))) {</span><br><span style="color: hsl(120, 100%, 40%);">+        [] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr_RSL_MsgTypeD(RSL_MT_CHAN_ACTIV))) {</span><br><span>           setverdict(fail, "Received CHAN ACT ACK without resources?!?");</span><br><span>            }</span><br><span style="color: hsl(0, 100%, 40%);">-       [] IPA_RSL[0].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, tr_RSL_IMM_ASSIGN(?))) -> value rsl_ud {</span><br><span style="color: hsl(120, 100%, 40%);">+  [] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr_RSL_IMM_ASSIGN(?))) -> value rsl_ud {</span><br><span>              var GsmRrMessage rr;</span><br><span>                 /* match on IMM ASS REJ */</span><br><span>           rr := dec_GsmRrMessage(rsl_ud.rsl.ies[1].body.full_imm_ass_info.payload);</span><br><span>@@ -590,13 +589,11 @@</span><br><span> </span><br><span>        /* Expect CHANnel RELease */</span><br><span>         alt {</span><br><span style="color: hsl(0, 100%, 40%);">-   [] IPA_RSL[0].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0,</span><br><span style="color: hsl(0, 100%, 40%);">-                              tr_RSL_MsgTypeD(RSL_MT_RF_CHAN_REL))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ [] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr_RSL_MsgTypeD(RSL_MT_RF_CHAN_REL))) {</span><br><span>          log("Received CHANnel RELease");</span><br><span>           setverdict(pass);</span><br><span>            }</span><br><span style="color: hsl(0, 100%, 40%);">-       [] IPA_RSL[0].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0,</span><br><span style="color: hsl(0, 100%, 40%);">-                              tr_RSL_IMM_ASSIGN(?))) {</span><br><span style="color: hsl(120, 100%, 40%);">+        [] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr_RSL_IMM_ASSIGN(?))) {</span><br><span>                 /* See OS#3709, OsmoBSC should not send Immediate</span><br><span>             * Assignment Reject since a dedicated channel was</span><br><span>            * already allocated, and Immediate Assignment was</span><br><span>@@ -926,21 +923,19 @@</span><br><span>   log("f_expect_chan_rel() expecting: expect_deact_sacch=", expect_deact_sacch, " expect_rr_chan_rel=", expect_rr_chan_rel,</span><br><span>            " expect_rll_rel_req=", expect_rll_rel_req);</span><br><span>   alt {</span><br><span style="color: hsl(0, 100%, 40%);">-   [] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0,</span><br><span style="color: hsl(0, 100%, 40%);">-                                   tr_RSL_DEACT_SACCH(rsl_chan_nr))) {</span><br><span style="color: hsl(120, 100%, 40%);">+   [] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(tr_RSL_DEACT_SACCH(rsl_chan_nr))) {</span><br><span>                 got_deact_sacch := true;</span><br><span>             repeat;</span><br><span>      }</span><br><span style="color: hsl(0, 100%, 40%);">-       [is_csfb] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, tr_RSL_DATA_REQ(rsl_chan_nr, ?, decmatch tr_RRM_RR_RELEASE_CSFB))) {</span><br><span style="color: hsl(120, 100%, 40%);">+     [is_csfb] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(tr_RSL_DATA_REQ(rsl_chan_nr, ?, decmatch tr_RRM_RR_RELEASE_CSFB))) {</span><br><span>                 got_rr_chan_rel := true;</span><br><span>             repeat;</span><br><span>      }</span><br><span style="color: hsl(0, 100%, 40%);">-       [not is_csfb] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, tr_RSL_DATA_REQ(rsl_chan_nr, ?, decmatch tr_RRM_RR_RELEASE))) {</span><br><span style="color: hsl(120, 100%, 40%);">+      [not is_csfb] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(tr_RSL_DATA_REQ(rsl_chan_nr, ?, decmatch tr_RRM_RR_RELEASE))) {</span><br><span>          got_rr_chan_rel := true;</span><br><span>             repeat;</span><br><span>      }</span><br><span style="color: hsl(0, 100%, 40%);">-       [] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0,</span><br><span style="color: hsl(0, 100%, 40%);">-                                   tr_RSL_REL_REQ(rsl_chan_nr, ?))) {</span><br><span style="color: hsl(120, 100%, 40%);">+    [] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(tr_RSL_REL_REQ(rsl_chan_nr, ?))) {</span><br><span>          got_rll_rel_req := true;</span><br><span>             /* FIXME: Why are we getting this for LinkID SACCH? */</span><br><span>               if (handle_rll_rel) {</span><br><span>@@ -948,13 +943,12 @@</span><br><span>                }</span><br><span>            repeat;</span><br><span>      }</span><br><span style="color: hsl(0, 100%, 40%);">-       [] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0,</span><br><span style="color: hsl(0, 100%, 40%);">-                                           tr_RSL_MsgTypeD(RSL_MT_RF_CHAN_REL))) {</span><br><span style="color: hsl(120, 100%, 40%);">+       [] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(tr_RSL_MsgTypeD(RSL_MT_RF_CHAN_REL))) {</span><br><span>             /* respond with CHAN REL ACK */</span><br><span>              f_ipa_tx(0, ts_RSL_RF_CHAN_REL_ACK(rsl_chan_nr));</span><br><span>            }</span><br><span>    /* ignore any user data */</span><br><span style="color: hsl(0, 100%, 40%);">-      [] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, tr_RSL_MsgTypeR(?))) {</span><br><span style="color: hsl(120, 100%, 40%);">+  [] IPA_RSL[bts_nr].receive(tr_ASP_RSL_UD(tr_RSL_MsgTypeR(?))) {</span><br><span>              repeat;</span><br><span>              }</span><br><span>    }</span><br><span>@@ -1348,7 +1342,7 @@</span><br><span>            }</span><br><span>            T.start;</span><br><span>             alt {</span><br><span style="color: hsl(0, 100%, 40%);">-           [] IPA_RSL[i].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, tr_RSL_PAGING_CMD(mi))) {</span><br><span style="color: hsl(120, 100%, 40%);">+            [] IPA_RSL[i].receive(tr_ASP_RSL_UD(tr_RSL_PAGING_CMD(mi))) {</span><br><span>                        setverdict(fail, "Paging on BTS ", i, " which is not part of ", bts_ids);</span><br><span>                        }</span><br><span>            [] IPA_RSL[i].receive { repeat; }</span><br><span>@@ -1524,7 +1518,7 @@</span><br><span>    T.start;</span><br><span>     T_retrans.start;</span><br><span>     alt {</span><br><span style="color: hsl(0, 100%, 40%);">-   [] IPA_RSL[0].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, tr_RSL_PAGING_CMD(?))) {</span><br><span style="color: hsl(120, 100%, 40%);">+     [] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr_RSL_PAGING_CMD(?))) {</span><br><span>                 setverdict(fail, "Received PAGING after LOAD_IND(0)");</span><br><span>             mtc.stop;</span><br><span>            }</span><br><span>@@ -1607,15 +1601,15 @@</span><br><span>  /* Wait for 3 seconds if any more PAGING CMD are received on RSL */</span><br><span>  T.start;</span><br><span>     alt {</span><br><span style="color: hsl(0, 100%, 40%);">-   [] IPA_RSL[0].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, tr_RSL_PAGING_CMD(?))) {</span><br><span style="color: hsl(120, 100%, 40%);">+     [] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr_RSL_PAGING_CMD(?))) {</span><br><span>                 setverdict(fail, "Received PAGING after A-RESET");</span><br><span>                 mtc.stop;</span><br><span>            }</span><br><span style="color: hsl(0, 100%, 40%);">-       [] IPA_RSL[1].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, tr_RSL_PAGING_CMD(?))) {</span><br><span style="color: hsl(120, 100%, 40%);">+     [] IPA_RSL[1].receive(tr_ASP_RSL_UD(tr_RSL_PAGING_CMD(?))) {</span><br><span>                 setverdict(fail, "Received PAGING after A-RESET");</span><br><span>                 mtc.stop;</span><br><span>            }</span><br><span style="color: hsl(0, 100%, 40%);">-       [] IPA_RSL[2].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, tr_RSL_PAGING_CMD(?))) {</span><br><span style="color: hsl(120, 100%, 40%);">+     [] IPA_RSL[2].receive(tr_ASP_RSL_UD(tr_RSL_PAGING_CMD(?))) {</span><br><span>                 setverdict(fail, "Received PAGING after A-RESET");</span><br><span>                 mtc.stop;</span><br><span>            }</span><br><span>diff --git a/bsc/BSC_Tests_CBSP.ttcn b/bsc/BSC_Tests_CBSP.ttcn</span><br><span>index ff054fe..baba4c0 100644</span><br><span>--- a/bsc/BSC_Tests_CBSP.ttcn</span><br><span>+++ b/bsc/BSC_Tests_CBSP.ttcn</span><br><span>@@ -537,7 +537,7 @@</span><br><span>     timer T := 5.0;</span><br><span>      T.start;</span><br><span>     alt {</span><br><span style="color: hsl(0, 100%, 40%);">-   [] IPA_RSL[0].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, tr_RSL_DATA_REQ(dt.rsl_chan_nr, ?, ?))) -> value rx_rsl_ud {</span><br><span style="color: hsl(120, 100%, 40%);">+      [] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr_RSL_DATA_REQ(dt.rsl_chan_nr, ?, ?))) -> value rx_rsl_ud {</span><br><span>          var RSL_IE_Body l3_ie;</span><br><span>               if (f_rsl_find_ie(rx_rsl_ud.rsl, RSL_IE_L3_INFO, l3_ie) == false) {</span><br><span>                  setverdict(fail, "RSL DATA REQ without L3?");</span><br><span>@@ -575,11 +575,10 @@</span><br><span>      timer T := 5.0;</span><br><span>      T.start;</span><br><span>     alt {</span><br><span style="color: hsl(0, 100%, 40%);">-   [] IPA_RSL[0].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0,</span><br><span style="color: hsl(0, 100%, 40%);">-                                            tr_RSL_OSMO_ETWS_CMD(t_RslChanNr_PCH_AGCH(0), tr_apdu))) {</span><br><span style="color: hsl(120, 100%, 40%);">+        [] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr_RSL_OSMO_ETWS_CMD(t_RslChanNr_PCH_AGCH(0), tr_apdu))) {</span><br><span>               setverdict(pass);</span><br><span>            }</span><br><span style="color: hsl(0, 100%, 40%);">-       [] IPA_RSL[0].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, tr_RSL_OSMO_ETWS_CMD(?,?))) {</span><br><span style="color: hsl(120, 100%, 40%);">+        [] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr_RSL_OSMO_ETWS_CMD(?,?))) {</span><br><span>            setverdict(fail, "Received unexpected OSMO_ETWS_CMD");</span><br><span>             }</span><br><span>    [] IPA_RSL[0].receive { repeat; }</span><br><span>@@ -605,11 +604,10 @@</span><br><span>    timer T := 5.0;</span><br><span>      T.start;</span><br><span>     alt {</span><br><span style="color: hsl(0, 100%, 40%);">-   [] IPA_RSL[0].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0,</span><br><span style="color: hsl(0, 100%, 40%);">-                                            tr_RSL_OSMO_ETWS_CMD(t_RslChanNr_PCH_AGCH(0), tr_apdu))) {</span><br><span style="color: hsl(120, 100%, 40%);">+        [] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr_RSL_OSMO_ETWS_CMD(t_RslChanNr_PCH_AGCH(0), tr_apdu))) {</span><br><span>               setverdict(pass);</span><br><span>            }</span><br><span style="color: hsl(0, 100%, 40%);">-       [] IPA_RSL[0].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, tr_RSL_OSMO_ETWS_CMD(?,?))) {</span><br><span style="color: hsl(120, 100%, 40%);">+        [] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr_RSL_OSMO_ETWS_CMD(?,?))) {</span><br><span>            setverdict(fail, "Received unexpected OSMO_ETWS_CMD");</span><br><span>             }</span><br><span>    [] IPA_RSL[0].receive { repeat; }</span><br><span>@@ -621,11 +619,10 @@</span><br><span>    /* then expect it to be disabled after the warning period (5s) */</span><br><span>    T.start;</span><br><span>     alt {</span><br><span style="color: hsl(0, 100%, 40%);">-   [] IPA_RSL[0].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0,</span><br><span style="color: hsl(0, 100%, 40%);">-                                            tr_RSL_OSMO_ETWS_CMD(t_RslChanNr_PCH_AGCH(0), ''O))) {</span><br><span style="color: hsl(120, 100%, 40%);">+    [] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr_RSL_OSMO_ETWS_CMD(t_RslChanNr_PCH_AGCH(0), ''O))) {</span><br><span>           setverdict(pass);</span><br><span>            }</span><br><span style="color: hsl(0, 100%, 40%);">-       [] IPA_RSL[0].receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, tr_RSL_OSMO_ETWS_CMD(?,?))) {</span><br><span style="color: hsl(120, 100%, 40%);">+        [] IPA_RSL[0].receive(tr_ASP_RSL_UD(tr_RSL_OSMO_ETWS_CMD(?,?))) {</span><br><span>            setverdict(fail, "Received unexpected OSMO_ETWS_CMD");</span><br><span>             }</span><br><span>    [] IPA_RSL[0].receive { repeat; }</span><br><span>diff --git a/library/IPA_Emulation.ttcnpp b/library/IPA_Emulation.ttcnpp</span><br><span>index 1bfc8dc..0125c3a 100644</span><br><span>--- a/library/IPA_Emulation.ttcnpp</span><br><span>+++ b/library/IPA_Emulation.ttcnpp</span><br><span>@@ -110,12 +110,14 @@</span><br><span>       RSL_Message     rsl</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-template (value) ASP_RSL_Unitdata ts_ASP_RSL_UD(IpaStreamId sid, template (value) RSL_Message rsl) := {</span><br><span style="color: hsl(120, 100%, 40%);">+template (value) ASP_RSL_Unitdata ts_ASP_RSL_UD(template (value) RSL_Message rsl,</span><br><span style="color: hsl(120, 100%, 40%);">+                                               IpaStreamId sid := IPAC_PROTO_RSL_TRX0) := {</span><br><span>         streamId := sid,</span><br><span>     rsl := rsl</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-template ASP_RSL_Unitdata tr_ASP_RSL_UD(template IpaStreamId sid, template RSL_Message rsl) := {</span><br><span style="color: hsl(120, 100%, 40%);">+template ASP_RSL_Unitdata tr_ASP_RSL_UD(template (present) RSL_Message rsl,</span><br><span style="color: hsl(120, 100%, 40%);">+                                      template IpaStreamId sid := IPAC_PROTO_RSL_TRX0) := {</span><br><span>        streamId := sid,</span><br><span>     rsl := rsl</span><br><span> }</span><br><span>diff --git a/library/RSL_Emulation.ttcn b/library/RSL_Emulation.ttcn</span><br><span>index 5a0816f..67a473f 100644</span><br><span>--- a/library/RSL_Emulation.ttcn</span><br><span>+++ b/library/RSL_Emulation.ttcn</span><br><span>@@ -385,7 +385,7 @@</span><br><span>                   Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Lost IPA connection!");</span><br><span>                        }</span><br><span>            [bts_role] IPA_PT.receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_ID_ACK)) {</span><br><span style="color: hsl(0, 100%, 40%);">-                        IPA_PT.send(ts_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0,ts_RSL_PAGING_LOAD_IND(23)));</span><br><span style="color: hsl(120, 100%, 40%);">+                   IPA_PT.send(ts_ASP_RSL_UD(ts_RSL_PAGING_LOAD_IND(23)));</span><br><span>                      }</span><br><span>            [not bts_role] IPA_PT.receive(tr_ASP_IPA_EV(ASP_IPA_EVENT_ID_ACK)) { }</span><br><span>               [bts_role] IPA_PT.receive(tr_RSL(tr_RSL_IMM_ASSIGN)) -> value rx_rsl {</span><br><span>@@ -460,7 +460,7 @@</span><br><span>                      chan_nr := rx_rsl.rsl.ies[0].body.chan_nr;</span><br><span>                   trx_nr := f_trx_by_streamId(rx_rsl.streamId);</span><br><span>                        f_store_last_act_data(trx_nr, chan_nr, rx_rsl.rsl);</span><br><span style="color: hsl(0, 100%, 40%);">-                     IPA_PT.send(ts_ASP_RSL_UD(rx_rsl.streamId, ts_RSL_CHAN_ACT_ACK(chan_nr, 23)));</span><br><span style="color: hsl(120, 100%, 40%);">+                        IPA_PT.send(ts_ASP_RSL_UD(ts_RSL_CHAN_ACT_ACK(chan_nr, 23), rx_rsl.streamId));</span><br><span>               }</span><br><span> </span><br><span>                [not dchan_suspended] IPA_PT.receive(tr_RSL(tr_RSL_MsgTypeDR(?))) -> value rx_rsl {</span><br><span>@@ -483,8 +483,7 @@</span><br><span>                 [bts_role] CLIENT_PT.receive(RSLDC_ChanRqd:?) -> value chan_rqd sender vc_conn {</span><br><span>                  /* Store the knowledge that this sender has requested a certain RQ+time */</span><br><span>                   f_cid_create(chan_rqd.ra, chan_rqd.fn, vc_conn);</span><br><span style="color: hsl(0, 100%, 40%);">-                        IPA_PT.send(ts_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0,</span><br><span style="color: hsl(0, 100%, 40%);">-                                           ts_RSL_CHAN_RQD(chan_rqd.ra, chan_rqd.fn)));</span><br><span style="color: hsl(120, 100%, 40%);">+                 IPA_PT.send(ts_ASP_RSL_UD(ts_RSL_CHAN_RQD(chan_rqd.ra, chan_rqd.fn)));</span><br><span>                       }</span><br><span> </span><br><span>                [not bts_role] CLIENT_PT.receive(RSLDC_ChanRqd:?) -> value chan_rqd sender vc_conn {</span><br><span>@@ -495,11 +494,11 @@</span><br><span>              [] CLIENT_PT.receive(tr_RSL_MsgType(?)) -> value rx_rsl_msg sender vc_conn {</span><br><span>                      /* forward to BSC */</span><br><span>                         cid := f_cid_by_comp_ref(vc_conn);</span><br><span style="color: hsl(0, 100%, 40%);">-                      IPA_PT.send(ts_ASP_RSL_UD(ConnectionTable[cid].stream_id, rx_rsl_msg));</span><br><span style="color: hsl(120, 100%, 40%);">+                       IPA_PT.send(ts_ASP_RSL_UD(rx_rsl_msg, ConnectionTable[cid].stream_id));</span><br><span>                      }</span><br><span> </span><br><span>                [] CCHAN_PT.receive(tr_RSL(?)) -> value rx_rsl {</span><br><span style="color: hsl(0, 100%, 40%);">-                     IPA_PT.send(ts_ASP_RSL_UD(rx_rsl.streamId, rx_rsl.rsl));</span><br><span style="color: hsl(120, 100%, 40%);">+                      IPA_PT.send(ts_ASP_RSL_UD(rx_rsl.rsl, rx_rsl.streamId));</span><br><span>                     }</span><br><span> </span><br><span>                /* explicit registration, e.g. in (non-immediate) assignment case */</span><br><span>diff --git a/selftest/Selftest.ttcn b/selftest/Selftest.ttcn</span><br><span>index 263c317..3d74925 100644</span><br><span>--- a/selftest/Selftest.ttcn</span><br><span>+++ b/selftest/Selftest.ttcn</span><br><span>@@ -89,7 +89,7 @@</span><br><span>        T.timeout;</span><br><span> </span><br><span>       for (i := 0; i < 10; i := i+1) {</span><br><span style="color: hsl(0, 100%, 40%);">-             IPA_RSL.receive(tr_ASP_RSL_UD(IPAC_PROTO_RSL_TRX0, rsl));</span><br><span style="color: hsl(120, 100%, 40%);">+             IPA_RSL.receive(tr_ASP_RSL_UD(rsl));</span><br><span>         }</span><br><span>    setverdict(pass);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18457">change 18457</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18457"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-ttcn3-hacks </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I93297680a2644516870222c2bb8eee03c6b575a9 </div>
<div style="display:none"> Gerrit-Change-Number: 18457 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>