<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13186">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Vadim Yanitskiy: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">msc: add codec to all Assignment Complete messages<br><br>So far we omit a Speech Codec (Chosen) from Assignment Complete messages, which<br>is actually a mandatory parameter. osmo-msc seems to carry on nevertheless, but<br>it actually shouldn't be able to.<br><br>Always send a Speech Codec (Chosen).<br><br>Change-Id: Ib35f019383db8ace05a9dc349648e2da7ba58bfa<br>---<br>M library/BSSMAP_Templates.ttcn<br>M msc/BSC_ConnectionHandler.ttcn<br>2 files changed, 14 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/library/BSSMAP_Templates.ttcn b/library/BSSMAP_Templates.ttcn</span><br><span>index b538095..4df39d4 100644</span><br><span>--- a/library/BSSMAP_Templates.ttcn</span><br><span>+++ b/library/BSSMAP_Templates.ttcn</span><br><span>@@ -462,6 +462,11 @@</span><br><span> lengthIndicator := 0, /* overwritten */</span><br><span> codecElements := valueof(elem)</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+template BSSMAP_IE_SpeechCodec ts_BSSMAP_IE_SpeechCodec(template BSSMAP_FIELD_CodecElements elem) := {</span><br><span style="color: hsl(120, 100%, 40%);">+ elementIdentifier := '7E'O,</span><br><span style="color: hsl(120, 100%, 40%);">+ lengthIndicator := 0, /* overwritten */</span><br><span style="color: hsl(120, 100%, 40%);">+ codecElements := valueof(elem)</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span> </span><br><span> template PDU_BSSAP</span><br><span> ts_BSSMAP_AssignmentReq(template BSSMAP_IE_CircuitIdentityCode cic := omit,</span><br><span>@@ -534,7 +539,8 @@</span><br><span> </span><br><span> template PDU_BSSAP</span><br><span> ts_BSSMAP_AssignmentComplete(template BSSMAP_IE_CircuitIdentityCode cic := omit,</span><br><span style="color: hsl(0, 100%, 40%);">- template BSSMAP_IE_AoIP_TransportLayerAddress aoip := omit)</span><br><span style="color: hsl(120, 100%, 40%);">+ template BSSMAP_IE_AoIP_TransportLayerAddress aoip := omit,</span><br><span style="color: hsl(120, 100%, 40%);">+ template BSSMAP_IE_SpeechCodec speechCodec := omit)</span><br><span> modifies ts_BSSAP_BSSMAP := {</span><br><span> pdu := {</span><br><span> bssmap := {</span><br><span>@@ -550,7 +556,7 @@</span><br><span> lSAIdentifier := omit,</span><br><span> talkerPriority := omit,</span><br><span> aoIPTransportLayer := aoip,</span><br><span style="color: hsl(0, 100%, 40%);">- speechCodec := omit,</span><br><span style="color: hsl(120, 100%, 40%);">+ speechCodec := speechCodec,</span><br><span> codecList := omit,</span><br><span> lCLS_BSS_Status := omit</span><br><span> }</span><br><span>diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn</span><br><span>index 2cd666f..e6cf2b0 100644</span><br><span>--- a/msc/BSC_ConnectionHandler.ttcn</span><br><span>+++ b/msc/BSC_ConnectionHandler.ttcn</span><br><span>@@ -532,8 +532,10 @@</span><br><span> valueof(ts_BSSMAP_IE_AoIP_TLA4(f_inet_addr(cpars.mgw_rtp_ip_bss),cpars.mgw_rtp_port_bss));</span><br><span> BSSAP.receive(tr_BSSMAP_AssignmentReq(omit, tla_ass)) {</span><br><span> var BSSMAP_IE_AoIP_TransportLayerAddress tla;</span><br><span style="color: hsl(120, 100%, 40%);">+ var BSSMAP_IE_SpeechCodec codec;</span><br><span> tla := valueof(ts_BSSMAP_IE_AoIP_TLA4(f_inet_addr(cpars.bss_rtp_ip), cpars.bss_rtp_port));</span><br><span style="color: hsl(0, 100%, 40%);">- BSSAP.send(ts_BSSMAP_AssignmentComplete(omit, tla));</span><br><span style="color: hsl(120, 100%, 40%);">+ codec := valueof(ts_BSSMAP_IE_SpeechCodec({ts_CodecFR}));</span><br><span style="color: hsl(120, 100%, 40%);">+ BSSAP.send(ts_BSSMAP_AssignmentComplete(omit, tla, codec));</span><br><span> }</span><br><span> </span><br><span> /* MS -> MSC: ALERTING */</span><br><span>@@ -633,8 +635,10 @@</span><br><span> /* expect AoIP IP/Port to match what we returned in CRCX_ACK above */</span><br><span> [] BSSAP.receive(tr_BSSMAP_AssignmentReq(omit, tla_ass)) {</span><br><span> var BSSMAP_IE_AoIP_TransportLayerAddress tla;</span><br><span style="color: hsl(120, 100%, 40%);">+ var BSSMAP_IE_SpeechCodec codec;</span><br><span> tla := valueof(ts_BSSMAP_IE_AoIP_TLA4(f_inet_addr(cpars.bss_rtp_ip), cpars.bss_rtp_port));</span><br><span style="color: hsl(0, 100%, 40%);">- BSSAP.send(ts_BSSMAP_AssignmentComplete(omit, tla));</span><br><span style="color: hsl(120, 100%, 40%);">+ codec := valueof(ts_BSSMAP_IE_SpeechCodec({ts_CodecFR}));</span><br><span style="color: hsl(120, 100%, 40%);">+ BSSAP.send(ts_BSSMAP_AssignmentComplete(omit, tla, codec));</span><br><span> }</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13186">change 13186</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/13186"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ib35f019383db8ace05a9dc349648e2da7ba58bfa </div>
<div style="display:none"> Gerrit-Change-Number: 13186 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>