<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/14131">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp: Handle CI and X-Osmux param name as case insensitive<br><br>RFC3435 states most text (except SDP) must be handled as case<br>insensitive.<br><br>Since we are no longer using strstr(msg->l2h), we need to iterate per<br>line and call related extract/handle function for that line.<br><br>Call to bsc_mgcp_osmux_confirm() is left at the end because it needs to<br>be called too in case no matching line is found. In that case, it will<br>release the CID. Similar stuff ocurrs for bsc_mgcp_extract_ci().<br><br>Related: OS#4001<br>Change-Id: Iadc004064a5a237c93009f242cb943ebc4d2d7e6<br>---<br>M openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c<br>M openbsc/tests/bsc-nat/bsc_nat_test.c<br>2 files changed, 66 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c</span><br><span>index 17dc659..1b0abf3 100644</span><br><span>--- a/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c</span><br><span>+++ b/openbsc/src/osmo-bsc_nat/bsc_mgcp_utils.c</span><br><span>@@ -663,19 +663,38 @@</span><br><span> mgcp_release_endp(endp);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! Check MGCP parameter line (string) for plausibility.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] endp pointer to endpoint (only used for log output)</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] line single parameter line from the MGCP message</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns 1 when line seems plausible, 0 on error */</span><br><span style="color: hsl(120, 100%, 40%);">+static int bsc_mgcp_check_param(const struct mgcp_endpoint *endp, const char *line)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ const size_t line_len = strlen(line);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (line[0] != '\0' && line_len < 2) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLMGCP, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Wrong MGCP option format: '%s' on 0x%x\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ line, ENDPOINT_NUMBER(endp));</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</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%);">+ /* FIXME: A couple more checks wouldn't hurt... */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return 1;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static void bsc_mgcp_osmux_confirm(struct mgcp_endpoint *endp, const char *str)</span><br><span> {</span><br><span> unsigned int osmux_cid;</span><br><span style="color: hsl(0, 100%, 40%);">- char *res;</span><br><span style="color: hsl(120, 100%, 40%);">+ const char x_osmux_prefix[] = "X-Osmux: ";</span><br><span style="color: hsl(120, 100%, 40%);">+ const size_t x_osmux_prefix_len = strlen(x_osmux_prefix);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- res = strstr(str, "X-Osmux: ");</span><br><span style="color: hsl(0, 100%, 40%);">- if (!res) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!str || strncasecmp(str, x_osmux_prefix, x_osmux_prefix_len)) {</span><br><span> LOGP(DMGCP, LOGL_INFO,</span><br><span style="color: hsl(0, 100%, 40%);">- "BSC doesn't want to use Osmux, failing back to RTP\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ "BSC doesn't want to use Osmux, failing back to RTP (str=%s)\n", str);</span><br><span> goto err;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (sscanf(res, "X-Osmux: %u", &osmux_cid) != 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (sscanf(str + x_osmux_prefix_len, "%u", &osmux_cid) != 1) {</span><br><span> LOGP(DMGCP, LOGL_ERROR, "Failed to parse Osmux CID '%s'\n",</span><br><span> str);</span><br><span> goto err;</span><br><span>@@ -713,6 +732,10 @@</span><br><span> struct mgcp_endpoint *endp = NULL;</span><br><span> int i, code;</span><br><span> char transaction_id[60];</span><br><span style="color: hsl(120, 100%, 40%);">+ char *save;</span><br><span style="color: hsl(120, 100%, 40%);">+ char *line = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ char *line_osmux = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ char *line_ci = NULL;</span><br><span> </span><br><span> /* Some assumption that our buffer is big enough.. and null terminate */</span><br><span> if (msgb_l2len(msg) > 2000) {</span><br><span>@@ -752,14 +775,42 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- endp->ci = bsc_mgcp_extract_ci((const char *) msg->l2h);</span><br><span style="color: hsl(120, 100%, 40%);">+ save = alloca(msgb_l2len(msg) + 1); /* +1 -> null char appended */</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(save, msg->l2h, msgb_l2len(msg) + 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ for_each_line(line, save) {</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!bsc_mgcp_check_param(endp, line))</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (line[0]) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'I':</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'i':</span><br><span style="color: hsl(120, 100%, 40%);">+ line_ci = line;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'X':</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'x':</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strncasecmp(line, "X-Osmux: ", strlen("X-Osmux: ")) == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ line_osmux = line;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Ignore unknown X-headers */</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case '\0':</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Reached SDP section, we are done parsing header */</span><br><span style="color: hsl(120, 100%, 40%);">+ goto mgcp_header_done;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</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%);">+mgcp_header_done:</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ endp->ci = bsc_mgcp_extract_ci((const char *) line_ci);</span><br><span> if (endp->ci == CI_UNUSED) {</span><br><span> free_chan_downstream(endp, bsc_endp, bsc);</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span> if (endp->osmux.state == OSMUX_STATE_NEGOTIATING)</span><br><span style="color: hsl(0, 100%, 40%);">- bsc_mgcp_osmux_confirm(endp, (const char *) msg->l2h);</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_mgcp_osmux_confirm(endp, line_osmux);</span><br><span> </span><br><span> /* If we require osmux and it is disabled.. fail */</span><br><span> if (nat_osmux_only(bsc->nat->mgcp_cfg, bsc->cfg) &&</span><br><span>@@ -806,14 +857,16 @@</span><br><span> uint32_t bsc_mgcp_extract_ci(const char *str)</span><br><span> {</span><br><span> unsigned int ci;</span><br><span style="color: hsl(0, 100%, 40%);">- char *res = strstr(str, "I: ");</span><br><span style="color: hsl(0, 100%, 40%);">- if (!res) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMGCP, LOGL_ERROR, "No CI in msg '%s'\n", str);</span><br><span style="color: hsl(120, 100%, 40%);">+ const char ci_prefix[] = "I: ";</span><br><span style="color: hsl(120, 100%, 40%);">+ const size_t ci_prefix_len = strlen(ci_prefix);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!str || strncasecmp(str, ci_prefix, ci_prefix_len)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMGCP, LOGL_ERROR, "No CI in line '%s'\n", str);</span><br><span> return CI_UNUSED;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (sscanf(res, "I: %x", &ci) != 1) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMGCP, LOGL_ERROR, "Failed to parse CI in msg '%s'\n", str);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (sscanf(str + ci_prefix_len, "%x", &ci) != 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMGCP, LOGL_ERROR, "Failed to parse CI in line '%s'\n", str);</span><br><span> return CI_UNUSED;</span><br><span> }</span><br><span> </span><br><span>diff --git a/openbsc/tests/bsc-nat/bsc_nat_test.c b/openbsc/tests/bsc-nat/bsc_nat_test.c</span><br><span>index 4bee60d..f6cf8b0 100644</span><br><span>--- a/openbsc/tests/bsc-nat/bsc_nat_test.c</span><br><span>+++ b/openbsc/tests/bsc-nat/bsc_nat_test.c</span><br><span>@@ -675,7 +675,7 @@</span><br><span> abort();</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ci = bsc_mgcp_extract_ci(crcx_resp);</span><br><span style="color: hsl(120, 100%, 40%);">+ ci = bsc_mgcp_extract_ci(strstr(crcx_resp, "I: "));</span><br><span> if (ci != 0x0F) {</span><br><span> printf("Failed to parse the CI. Got: %d\n", ci);</span><br><span> abort();</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14131">change 14131</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/14131"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: openbsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Iadc004064a5a237c93009f242cb943ebc4d2d7e6 </div>
<div style="display:none"> Gerrit-Change-Number: 14131 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@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: Pau Espin Pedrol <pespin@sysmocom.de> </div>