osmith has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32342 )
Change subject: bsc: AssignmentState: voice_call -> rtp_stream
......................................................................
bsc: AssignmentState: voice_call -> rtp_stream
Now that CSD is supported, rename the variable. It is true for both
voice calls and for CSD.
Related: OS#4393
Change-Id: Idfd9a102ad172d3aeaa4222a21357cdcd51680df
---
M bsc/BSC_Tests.ttcn
M bsc/MSC_ConnectionHandler.ttcn
2 files changed, 30 insertions(+), 17 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/42/32342/1
diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn
index f40b19e..eb44dd7 100644
--- a/bsc/BSC_Tests.ttcn
+++ b/bsc/BSC_Tests.ttcn
@@ -9384,7 +9384,7 @@
BSSAP.send(ass_cmd);
var AssignmentState st := valueof(ts_AssignmentStateInit);
- st.voice_call := true;
+ st.rtp_stream := true;
st.is_assignment := false;
alt {
[] as_modify(st);
@@ -11148,7 +11148,7 @@
ass_cmd.pdu.bssmap.assignmentRequest.codecList :=
valueof(ts_BSSMAP_IE_CodecList({ts_CodecFR}));
var AssignmentState st := valueof(ts_AssignmentStateInit);
- st.voice_call := true;
+ st.rtp_stream := true;
st.is_assignment := true;
var ExpectCriteria mgcpcrit := {
diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn
index b3e6af6..64b4e3d 100644
--- a/bsc/MSC_ConnectionHandler.ttcn
+++ b/bsc/MSC_ConnectionHandler.ttcn
@@ -1064,7 +1064,7 @@
type record AssignmentState {
/* global */
- boolean voice_call,
+ boolean rtp_stream,
boolean is_assignment,
/* Assignment related bits */
boolean rr_ass_cmpl_seen,
@@ -1080,7 +1080,7 @@
}
template (value) AssignmentState ts_AssignmentStateInit := {
- voice_call := false,
+ rtp_stream := false,
is_assignment := false,
rr_ass_cmpl_seen := false,
old_lchan_deact_sacch_seen := false,
@@ -1222,7 +1222,7 @@
/* no assignment, just mode modify */
var RSL_Message rsl;
- [st.voice_call and not st.rr_modify_seen]
RSL.receive(tr_RSL_DATA_REQ(g_chan_nr)) -> value rsl {
+ [st.rtp_stream and not st.rr_modify_seen]
RSL.receive(tr_RSL_DATA_REQ(g_chan_nr)) -> value rsl {
var PDU_ML3_NW_MS l3 :=
dec_PDU_ML3_NW_MS(rsl.ies[2].body.l3_info.payload);
log("Rx L3 from net: ", l3);
if (ischosen(l3.msgs.rrm.channelModeModify)) {
@@ -1233,7 +1233,7 @@
}
repeat;
}
- [st.voice_call and st.rr_modify_seen]
RSL.receive(tr_RSL_MsgTypeD(RSL_MT_MODE_MODIFY_REQ)) -> value rsl {
+ [st.rtp_stream and st.rr_modify_seen]
RSL.receive(tr_RSL_MsgTypeD(RSL_MT_MODE_MODIFY_REQ)) -> value rsl {
st.rsl_mode_modify_msg := rsl;
RSL.send(ts_RSL_MODE_MODIFY_ACK(g_chan_nr));
st.modify_done := true;
@@ -1427,9 +1427,9 @@
transid := omit
};
var AssignmentState st := valueof(ts_AssignmentStateInit);
- /* if the channel type is SIGNAL, we're not handling a voice call */
+ /* if the channel type is SIGNAL, we're not handling an rtp stream */
if
(ass_cmd.pdu.bssmap.assignmentRequest.channelType.speechOrDataIndicator !=
'0011'B) {
- st.voice_call := true;
+ st.rtp_stream := true;
exp_modify := true;
}
@@ -1459,8 +1459,8 @@
g_media.mgcp_conn[0].mdcx_seen_exp := 0;
g_media.mgcp_conn[1].crcx_seen_exp := 0;
g_media.mgcp_conn[1].mdcx_seen_exp := 0;
- } else if (st.voice_call) {
- /* For voice calls we expect the following MGCP activity */
+ } else if (st.rtp_stream) {
+ /* For RTP streams we expect the following MGCP activity */
g_media.mgcp_conn[0].crcx_seen_exp := 1;
g_media.mgcp_conn[0].mdcx_seen_exp := 1;
g_media.mgcp_conn[1].crcx_seen_exp := 1;
@@ -1487,8 +1487,8 @@
/* modify related bits */
[not st.is_assignment and exp_modify] as_modify(st);
- /* voice call related bits (IPA CRCX/MDCX + MGCP) */
- [st.voice_call] as_Media();
+ /* RTP stream related bits (IPA CRCX/MDCX + MGCP) */
+ [st.rtp_stream] as_Media();
/* if we receive exactly what we expected, always return + pass */
[st.is_assignment and st.assignment_done or (not st.is_assignment and
(st.modify_done or not exp_modify))] BSSAP.receive(exp_ass_cpl) -> value bssap {
@@ -1526,11 +1526,11 @@
/* TODO: more precisely expect the different types of speech? */
var OCT1 rr_channel_mode :=
st.rr_channel_mode_modify_msg.msgs.rrm.channelModeModify.channelMode.mode;
- if (st.voice_call and rr_channel_mode == '00'O) {
+ if (st.rtp_stream and rr_channel_mode == '00'O) {
setverdict(fail, "f_establish_fully(): Expected RR
Channel Mode Modify",
" to a speech mode, but got channelMode ==
", rr_channel_mode);
mtc.stop;
- } else if (not st.voice_call and rr_channel_mode != '00'O) {
+ } else if (not st.rtp_stream and rr_channel_mode != '00'O) {
setverdict(fail, "f_establish_fully(): Expected RR
Channel Mode Modify",
" to signalling mode, but got channelMode ==
", rr_channel_mode);
mtc.stop;
@@ -1542,11 +1542,11 @@
mtc.stop;
}
var RSL_SpeechDataInd rsl_spd_ind :=
chan_mode_ie.chan_mode.spd_ind;
- if (st.voice_call and rsl_spd_ind != RSL_SPDI_SPEECH) {
+ if (st.rtp_stream and rsl_spd_ind != RSL_SPDI_SPEECH) {
setverdict(fail, "f_establish_fully(): Expected RSL
MODE MODIFY",
" to a speech mode, but got spd_ind == ",
rsl_spd_ind);
mtc.stop;
- } else if (not st.voice_call and rsl_spd_ind != RSL_SPDI_SIGN) {
+ } else if (not st.rtp_stream and rsl_spd_ind != RSL_SPDI_SIGN) {
setverdict(fail, "f_establish_fully(): Expected RSL
MODE MODIFY",
" to signalling mode, but got spd_ind == ",
rsl_spd_ind);
mtc.stop;
@@ -1591,7 +1591,7 @@
}
}
- if (not exp_fail and st.voice_call and not g_pars.aoip) {
+ if (not exp_fail and st.rtp_stream and not g_pars.aoip) {
/* With SCCPLite, connect to BSC-located MGW using a CRCX + SDP.
It is sent in MGCP over IPA in the BSC<->MSC (BSC-NAT)
connection. BSC will forward it to its MGW. */
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/32342
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Idfd9a102ad172d3aeaa4222a21357cdcd51680df
Gerrit-Change-Number: 32342
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <[email protected]>
Gerrit-MessageType: newchange
