<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9737">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">BSC_Tests: use correct payload types and encoding names on MGCP<br><br>The test currently use a hardcoded payload type and encoding name.<br>This does mean in practice that even when an assignment with EFR<br>is happeining. The MGCP responses to the BSC tell that the codec<br>is AMR. This is not correct. The testcases should always pick a<br>suitable payload type / encoding name in the MGCP response<br><br>- Add constants for IANA/3GPP assigned payload types<br>- Add function to lookup the right encoding name for a payload type<br>- Initalize the encoding name and payload type in g_media according<br> to the BSSAP PDU.<br><br>Change-Id: I2735267091059e2f2169da80bdcd30abc2b1554b<br>Realted: OS#2728<br>---<br>M bsc/MSC_ConnectionHandler.ttcn<br>M library/MGCP_Emulation.ttcn<br>M library/MGCP_Types.ttcn<br>3 files changed, 67 insertions(+), 6 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/37/9737/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn</span><br><span>index 2042979..0f123b6 100644</span><br><span>--- a/bsc/MSC_ConnectionHandler.ttcn</span><br><span>+++ b/bsc/MSC_ConnectionHandler.ttcn</span><br><span>@@ -32,6 +32,24 @@</span><br><span> * Media related handling</span><br><span> ***********************************************************************/</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Get the matching payload type for a specified BSSAP codec type</span><br><span style="color: hsl(120, 100%, 40%);">+ * (see also: BSSAP_Types.ttcn */</span><br><span style="color: hsl(120, 100%, 40%);">+private function f_get_mgcp_pt(BSSMAP_FIELD_CodecType codecType) return SDP_FIELD_PayloadType {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (codecType == GSM_FR) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return PT_GSM;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (codecType == GSM_HR) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return PT_GSMHR;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (codecType == GSM_EFR) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return PT_GSMEFR;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (codecType == FR_AMR or codecType == HR_AMR) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return PT_AMR;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (codecType == FR_AMR_WB or codecType == OHR_AMR or codecType == OFR_AMR_WB or codecType == OHR_AMR_WB) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return PT_AMRWB;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return PT_PCMU;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Tuple containing host/ip and port */</span><br><span> type record HostPort {</span><br><span> HostName host,</span><br><span>@@ -66,7 +84,7 @@</span><br><span> BtsMediaState bts1 /* only during hand-over */</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-function f_MediaState_init(inout MediaState g_media, integer nr, HostName bts, HostName mgw) {</span><br><span style="color: hsl(120, 100%, 40%);">+function f_MediaState_init(inout MediaState g_media, integer nr, HostName bts, HostName mgw, BSSMAP_FIELD_CodecType codecType) {</span><br><span> /* BTS Side */</span><br><span> g_media.bts := {</span><br><span> ipa_crcx_seen := false,</span><br><span>@@ -93,10 +111,10 @@</span><br><span> g_media.mgcp_ep := "rtpbridge/" & int2str(nr) & "@mgw";</span><br><span> </span><br><span> for (var integer i:= 0; i < sizeof(g_media.mgcp_conn); i := i+1) {</span><br><span style="color: hsl(0, 100%, 40%);">- g_media.mgcp_conn[i].mime_type := "AMR";</span><br><span style="color: hsl(120, 100%, 40%);">+ g_media.mgcp_conn[i].mime_type := f_encoding_name_from_pt(f_get_mgcp_pt(codecType));</span><br><span> g_media.mgcp_conn[i].sample_rate := 8000;</span><br><span> g_media.mgcp_conn[i].ptime := 20;</span><br><span style="color: hsl(0, 100%, 40%);">- g_media.mgcp_conn[i].rtp_pt := 98;</span><br><span style="color: hsl(120, 100%, 40%);">+ g_media.mgcp_conn[i].rtp_pt := enum2int(f_get_mgcp_pt(codecType));</span><br><span> g_media.mgcp_conn[i].crcx_seen := false;</span><br><span> g_media.mgcp_conn[i].conn_id := f_mgcp_alloc_conn_id();</span><br><span> }</span><br><span>@@ -301,8 +319,8 @@</span><br><span> }</span><br><span> </span><br><span> /* initialize all parameters */</span><br><span style="color: hsl(0, 100%, 40%);">-function f_MscConnHdlr_init(integer i, HostName bts, HostName mgw) runs on MSC_ConnHdlr {</span><br><span style="color: hsl(0, 100%, 40%);">- f_MediaState_init(g_media, i, bts, mgw);</span><br><span style="color: hsl(120, 100%, 40%);">+function f_MscConnHdlr_init(integer i, HostName bts, HostName mgw, BSSMAP_FIELD_CodecType codecType) runs on MSC_ConnHdlr {</span><br><span style="color: hsl(120, 100%, 40%);">+ f_MediaState_init(g_media, i, bts, mgw, codecType);</span><br><span> if (not g_vty_initialized) {</span><br><span> map(self:BSCVTY, system:BSCVTY);</span><br><span> f_vty_set_prompts(BSCVTY);</span><br><span>@@ -754,7 +772,18 @@</span><br><span> /* establish a channel fully, expecting an assignment matching 'exp' */</span><br><span> function f_establish_fully(template (omit) PDU_BSSAP ass_tpl, template PDU_BSSAP exp_ass_cpl)</span><br><span> runs on MSC_ConnHdlr {</span><br><span style="color: hsl(0, 100%, 40%);">- f_MscConnHdlr_init(g_pars.media_nr, "127.0.0.2", "127.0.0.3");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ var BSSMAP_FIELD_CodecType codecType;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (isvalue(ass_tpl.pdu.bssmap.assignmentRequest.codecList)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ codecType := valueof(ass_tpl.pdu.bssmap.assignmentRequest.codecList.codecElements[0].codecType);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Make sure a meaningful default is assigned in case the</span><br><span style="color: hsl(120, 100%, 40%);">+ * codecList is not populated */</span><br><span style="color: hsl(120, 100%, 40%);">+ codecType := FR_AMR;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ f_MscConnHdlr_init(g_pars.media_nr, "127.0.0.2", "127.0.0.3", codecType);</span><br><span> </span><br><span> /* patch in the LCLS related items, as needed */</span><br><span> f_ass_patch_lcls(ass_tpl, exp_ass_cpl);</span><br><span>diff --git a/library/MGCP_Emulation.ttcn b/library/MGCP_Emulation.ttcn</span><br><span>index b02dc06..0863511 100644</span><br><span>--- a/library/MGCP_Emulation.ttcn</span><br><span>+++ b/library/MGCP_Emulation.ttcn</span><br><span>@@ -441,5 +441,26 @@</span><br><span> return omit;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Determine encoding name for a specified payload type number */</span><br><span style="color: hsl(120, 100%, 40%);">+function f_encoding_name_from_pt(SDP_FIELD_PayloadType pt) return charstring {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (pt == PT_PCMU) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return "PCMU";</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (pt == PT_GSM) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return "GSM";</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (pt == PT_PCMA) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return "PCMA";</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (pt == PT_GSMEFR) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return "GSM-EFR";</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (pt == PT_GSMHR) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return "GSM-HR-08";</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (pt == PT_AMR) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return "AMR";</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (pt == PT_AMRWB) {</span><br><span style="color: hsl(120, 100%, 40%);">+ return "AMR-WB";</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ setverdict(fail);</span><br><span style="color: hsl(120, 100%, 40%);">+ return "";</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span> }</span><br><span>diff --git a/library/MGCP_Types.ttcn b/library/MGCP_Types.ttcn</span><br><span>index 9d1a4e1..6bb266e 100644</span><br><span>--- a/library/MGCP_Types.ttcn</span><br><span>+++ b/library/MGCP_Types.ttcn</span><br><span>@@ -121,5 +121,16 @@</span><br><span> external function dec_MgcpMessage(in charstring id) return MgcpMessage</span><br><span> with { extension "prototype(convert) decode(TEXT)" };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* IANA / 3gpp assigned payload type numbers */</span><br><span style="color: hsl(120, 100%, 40%);">+ type enumerated SDP_FIELD_PayloadType {</span><br><span style="color: hsl(120, 100%, 40%);">+ PT_PCMU(0),</span><br><span style="color: hsl(120, 100%, 40%);">+ PT_GSM(3),</span><br><span style="color: hsl(120, 100%, 40%);">+ PT_PCMA(8),</span><br><span style="color: hsl(120, 100%, 40%);">+ PT_G729(18),</span><br><span style="color: hsl(120, 100%, 40%);">+ PT_GSMEFR(110),</span><br><span style="color: hsl(120, 100%, 40%);">+ PT_GSMHR(111),</span><br><span style="color: hsl(120, 100%, 40%);">+ PT_AMR(112),</span><br><span style="color: hsl(120, 100%, 40%);">+ PT_AMRWB(113)</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> } with { encode "TEXT" }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9737">change 9737</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/9737"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I2735267091059e2f2169da80bdcd30abc2b1554b </div>
<div style="display:none"> Gerrit-Change-Number: 9737 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>