ttcn3
/
osmo-ttcn3-hacks
mirror of https://gerrit.osmocom.org/osmo-ttcn3-hacks
10
0
Fork 1
Code Issues Releases Wiki Activity

msc: for mo and mt call, interleave MGCP and Assignment 

Upcoming osmo-msc changes move away from the current ordering of MGCP and
Assignment messages. Allow these async dialogs to appear in any order.

Change-Id: Ia06af1e347601949f4ddb19f963daa400766d9e7
This commit is contained in:
Neels Hofmeyr 2019-03-06 15:21:20 +01:00 committed by Neels Hofmeyr
parent 7e6a35cc65
commit 59e0c6f764
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
msc/BSC_ConnectionHandler.ttcn
View File

@ -513,8 +513,13 @@ runs on BSC_ConnHdlr {
f_mgcp_par_append(mgcp_resp.params, ts_MgcpParSpecEP(cpars.mgcp_ep));
MGCP.send(mgcp_resp);
}
var BSSMAP_IE_AoIP_TransportLayerAddress tla_ass :=
valueof(ts_BSSMAP_IE_AoIP_TLA4(f_inet_addr(cpars.mgw_rtp_ip_bss),cpars.mgw_rtp_port_bss));
interleave {
/* Second MGCP CRCX (this time for MSS/CN side) */
MGCP.receive(tr_CRCX(cpars.mgcp_ep)) -> value mgcp_cmd {
[] MGCP.receive(tr_CRCX(cpars.mgcp_ep)) -> value mgcp_cmd {
var SDP_Message sdp := valueof(ts_SDP(cpars.mgw_rtp_ip_mss, cpars.mgw_rtp_ip_mss,
hex2str(cpars.mgcp_call_id), "42",
cpars.mgw_rtp_port_mss,
@ -525,18 +530,19 @@ runs on BSC_ConnHdlr {
MGCP.send(ts_CRCX_ACK(mgcp_cmd.line.trans_id, cpars.mgcp_connection_id_mss, sdp));
/* MSC acknowledges the MNCC_CREATE to the MNCC handler */
MNCC.receive(tr_MNCC_RTP_CREATE(cpars.mncc_callref));
}
}
/* expect the MSC to trigger a BSSMAP ASSIGNMENT */
var BSSMAP_IE_AoIP_TransportLayerAddress tla_ass :=
valueof(ts_BSSMAP_IE_AoIP_TLA4(f_inet_addr(cpars.mgw_rtp_ip_bss),cpars.mgw_rtp_port_bss));
BSSAP.receive(tr_BSSMAP_AssignmentReq(omit, tla_ass)) {
[] BSSAP.receive(tr_BSSMAP_AssignmentReq(omit, tla_ass)) {
var BSSMAP_IE_AoIP_TransportLayerAddress tla;
var BSSMAP_IE_SpeechCodec codec;
tla := valueof(ts_BSSMAP_IE_AoIP_TLA4(f_inet_addr(cpars.bss_rtp_ip), cpars.bss_rtp_port));
codec := valueof(ts_BSSMAP_IE_SpeechCodec({ts_CodecFR}));
BSSAP.send(ts_BSSMAP_AssignmentComplete(omit, tla, codec));
}
}
/* MS -> MSC: ALERTING */
BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_CC_CONNECT(cpars.transaction_id)));
@ -613,8 +619,12 @@ runs on BSC_ConnHdlr {
MGCP.send(mgcp_resp);
}
}
var BSSMAP_IE_AoIP_TransportLayerAddress tla_ass :=
valueof(ts_BSSMAP_IE_AoIP_TLA4(f_inet_addr(cpars.mgw_rtp_ip_bss),cpars.mgw_rtp_port_bss));
interleave {
/* Second MGCP CRCX (this time for MSS/CN side) */
MGCP.receive(tr_CRCX(cpars.mgcp_ep)) -> value mgcp_cmd {
[] MGCP.receive(tr_CRCX(cpars.mgcp_ep)) -> value mgcp_cmd {
var SDP_Message sdp := valueof(ts_SDP(cpars.mgw_rtp_ip_mss, cpars.mgw_rtp_ip_mss,
hex2str(cpars.mgcp_call_id), "42",
cpars.mgw_rtp_port_mss,
@ -623,15 +633,13 @@ runs on BSC_ConnHdlr {
cpars.rtp_sdp_format)),
valueof(ts_SDP_ptime(20)) }));
MGCP.send(ts_CRCX_ACK(mgcp_cmd.line.trans_id, cpars.mgcp_connection_id_mss, sdp));
}
/* Alerting */
MNCC.send(ts_MNCC_ALERT_req(cpars.mncc_callref));
/* Alerting */
MNCC.send(ts_MNCC_ALERT_req(cpars.mncc_callref));
}
var BSSMAP_IE_AoIP_TransportLayerAddress tla_ass :=
valueof(ts_BSSMAP_IE_AoIP_TLA4(f_inet_addr(cpars.mgw_rtp_ip_bss),cpars.mgw_rtp_port_bss));
interleave {
[] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_CC_ALERTING(cpars.transaction_id))) {}
[] BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_CC_ALERTING(cpars.transaction_id))) {
}
/* expect AoIP IP/Port to match what we returned in CRCX_ACK above */
[] BSSAP.receive(tr_BSSMAP_AssignmentReq(omit, tla_ass)) {
var BSSMAP_IE_AoIP_TransportLayerAddress tla;