<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9466">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Reject ASSIGNMENT REQ with CIC but no AoIP transp addr in AoIP case<br><br>If we receive a BSSMAP ASSIGNMENT REQ for a speech channel<br>containing only a CIC but no AoIP transport layer address, then that's<br>illegal and must be rejected.<br><br>In Change-Id If362a0084de452727cd063063dfb645eca2f9beb we re-introduced<br>accepting CIC-only ASSIGNMENT REQ, but we failed to verify that this<br>actually only happens over a SCCPlite A interface.<br><br>This fixes the BSC_Tests.TC_assignment_cic_only testcase.<br><br>Change-Id: Ia6e3897edca48b9f838ea69939d9b8be7185abf8<br>---<br>M src/osmo-bsc/osmo_bsc_bssap.c<br>1 file changed, 25 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>index 24a5e3a..c2d51b5 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>@@ -742,6 +742,8 @@</span><br><span> }</span><br><span> </span><br><span> msc = conn->sccp.msc;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (msc->a.asp_proto != OSMO_SS7_ASP_PROT_IPA)</span><br><span style="color: hsl(120, 100%, 40%);">+ aoip = true;</span><br><span> </span><br><span> tlv_parse(&tp, gsm0808_att_tlvdef(), msg->l4h + 1, length - 1, 0, 0);</span><br><span> </span><br><span>@@ -771,14 +773,27 @@</span><br><span> cause = GSM0808_CAUSE_REQ_CODEC_TYPE_OR_CONFIG_NOT_SUPP;</span><br><span> goto reject;</span><br><span> case GSM0808_CHAN_SPEECH:</span><br><span style="color: hsl(0, 100%, 40%);">- /* Detect if a CIC code is present, if so, we use the classic ip.access method to</span><br><span style="color: hsl(0, 100%, 40%);">- * calculate the RTP port */</span><br><span> if (TLVP_PRESENT(&tp, GSM0808_IE_CIRCUIT_IDENTITY_CODE)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* CIC is permitted in both AoIP and SCCPlite */</span><br><span> conn->user_plane.cic =</span><br><span> osmo_load16be(TLVP_VAL(&tp, GSM0808_IE_CIRCUIT_IDENTITY_CODE));</span><br><span> timeslot = conn->user_plane.cic & 0x1f;</span><br><span> multiplex = (conn->user_plane.cic & ~0x1f) >> 5;</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (TLVP_PRESENT(&tp, GSM0808_IE_AOIP_TRASP_ADDR)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!aoip) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* no CIC but SCCPlite: illegal */</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMSC, LOGL_ERROR, "SCCPlite MSC, but no CIC in ASSIGN REQ?\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ cause = GSM0808_CAUSE_INFORMATION_ELEMENT_OR_FIELD_MISSING;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto reject;</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%);">+ if (TLVP_PRESENT(&tp, GSM0808_IE_AOIP_TRASP_ADDR)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!aoip) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* SCCPlite and AoIP transport address: illegal */</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMSC, LOGL_ERROR, "AoIP Transport address over IPA ?!?\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ cause = GSM0808_CAUSE_INCORRECT_VALUE;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto reject;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> /* Decode AoIP transport address element */</span><br><span> rc = gsm0808_dec_aoip_trasp_addr(&rtp_addr,</span><br><span> TLVP_VAL(&tp, GSM0808_IE_AOIP_TRASP_ADDR),</span><br><span>@@ -788,12 +803,14 @@</span><br><span> cause = GSM0808_CAUSE_INCORRECT_VALUE;</span><br><span> goto reject;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- aoip = true;</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMSC, LOGL_ERROR, "AoIP transport address and CIC missing. "</span><br><span style="color: hsl(0, 100%, 40%);">- "Audio would not work; rejecting\n");</span><br><span style="color: hsl(0, 100%, 40%);">- cause = GSM0808_CAUSE_INFORMATION_ELEMENT_OR_FIELD_MISSING;</span><br><span style="color: hsl(0, 100%, 40%);">- goto reject;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (aoip) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* no AoIP transport level address but AoIP transport: illegal */</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMSC, LOGL_ERROR, "AoIP transport address missing in ASSIGN REQ, "</span><br><span style="color: hsl(120, 100%, 40%);">+ "audio would not work; rejecting\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ cause = GSM0808_CAUSE_INFORMATION_ELEMENT_OR_FIELD_MISSING;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto reject;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> /* Decode speech codec list (AoIP) */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9466">change 9466</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/9466"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ia6e3897edca48b9f838ea69939d9b8be7185abf8 </div>
<div style="display:none"> Gerrit-Change-Number: 9466 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>