diff options
| author | Neels Hofmeyr <neels@hofmeyr.de> | 2021-05-25 21:35:46 +0000 |
|---|---|---|
| committer | neels <nhofmeyr@sysmocom.de> | 2021-06-05 20:24:35 +0000 |
| commit | 1470fc668aae6e153af1399997c8039c76beed82 (patch) | |
| tree | 91e8aae6751435f5b7bbedf40f90e037b54ed958 | |
| parent | 9f3e6ac649a33dd3e635f290e6802df67a1df987 (diff) | |
allow ASP_RSL_UD on MSC_ConnHdlr RSL
In BSC_Tests_VAMOS.ttcn, in f_est_and_reassign_to_secondary_lchan()
there is a missing channel release ack. By allowing ASP_RSL_UD, this rel
ack can be sent trivially.
Change-Id: Icd04184ed87c359349d86c5e0893c2ce9de2f7f1
| -rw-r--r-- | bsc/BSC_Tests_VAMOS.ttcn | 4 | ||||
| -rw-r--r-- | library/RSL_Emulation.ttcn | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/bsc/BSC_Tests_VAMOS.ttcn b/bsc/BSC_Tests_VAMOS.ttcn index bf487cf5..9ecb255a 100644 --- a/bsc/BSC_Tests_VAMOS.ttcn +++ b/bsc/BSC_Tests_VAMOS.ttcn @@ -451,10 +451,8 @@ private function f_reassign_secondary_to_primary_lchan(RslChannelNr new_chan_nr) } [] RSL.receive(tr_RSL_DEACT_SACCH(g_chan_nr)) {} [] RSL.receive(tr_RSL_RF_CHAN_REL(g_chan_nr)) { - /* RSL.send(ts_ASP_RSL_UD(ts_RSL_RF_CHAN_REL_ACK(g_chan_nr), IPAC_PROTO_RSL_TRX0)); - */ f_rslem_unregister(0, g_chan_nr, RSL_PROC); g_chan_nr := new_chan_nr; } @@ -563,10 +561,8 @@ private function f_est_and_reassign_to_secondary_lchan(RslChannelNr new_chan_nr) } [] RSL.receive(tr_RSL_DEACT_SACCH(g_chan_nr)) {} [] RSL.receive(tr_RSL_RF_CHAN_REL(g_chan_nr)) { - /* RSL.send(ts_ASP_RSL_UD(ts_RSL_RF_CHAN_REL_ACK(g_chan_nr), IPAC_PROTO_RSL_TRX0)); - */ f_rslem_unregister(0, g_chan_nr, RSL_PROC); g_chan_nr := new_chan_nr; } diff --git a/library/RSL_Emulation.ttcn b/library/RSL_Emulation.ttcn index 91fa2dbb..f64329a6 100644 --- a/library/RSL_Emulation.ttcn +++ b/library/RSL_Emulation.ttcn @@ -85,7 +85,7 @@ template RSLEm_Event tr_RSLEm_EV(template RSLEm_EventType ev_type, }; type port RSL_DCHAN_PT message { - inout RSLDC_ChanRqd, RSL_Message; + inout RSLDC_ChanRqd, RSL_Message, ASP_RSL_Unitdata; } with { extension "internal" }; type port RSL_CCHAN_PT message { @@ -638,6 +638,9 @@ function main(boolean bts_role := true) runs on RSL_Emulation_CT { cid := f_cid_by_comp_ref(vc_conn); IPA_PT.send(ts_ASP_RSL_UD(rx_rsl_msg, ConnectionTable[cid].stream_id)); } + [bts_role] CLIENT_PT.receive(tr_ASP_RSL_UD(?, sid := ?)) -> value rx_rsl { + IPA_PT.send(ts_ASP_RSL_UD(rx_rsl.rsl, rx_rsl.streamId)); + } [not bts_role] CLIENT_PT.receive(tr_RSL_MsgType(?)) -> value rx_rsl_msg sender vc_conn { cid := f_cid_by_comp_ref(vc_conn); conn_id := f_trx_conn_map_resolve(ConnectionTable[cid].stream_id); |