<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/14043">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;">mgw, mgcp-li: Handle X-Osmux param name as case insensitive<br><br>RFC3435 states most text (except SDP) must be handled as case<br>insensitive.<br><br>Related: OS#4001<br>Change-Id: Iac073f1db46569b46eddeaecc9934a2986bd50f1<br>---<br>M src/libosmo-mgcp-client/mgcp_client.c<br>M src/libosmo-mgcp/mgcp_msg.c<br>M src/libosmo-mgcp/mgcp_protocol.c<br>3 files changed, 10 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c</span><br><span>index d65a799..7074328 100644</span><br><span>--- a/src/libosmo-mgcp-client/mgcp_client.c</span><br><span>+++ b/src/libosmo-mgcp-client/mgcp_client.c</span><br><span>@@ -403,12 +403,12 @@</span><br><span> int osmux_cid;</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (strstr(line + 2, "Osmux: *")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strcasecmp(line + 2, "Osmux: *") == 0) {</span><br><span> LOGP(DLMGCP, LOGL_DEBUG, "Parsed wilcard Osmux CID\n");</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (sscanf(line + 2, "Osmux: %u", &osmux_cid) != 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (sscanf(line + 2 + 7, "%u", &osmux_cid) != 1) {</span><br><span> LOGP(DLMGCP, LOGL_ERROR, "Failed parsing Osmux in MGCP msg line: %s\n",</span><br><span> line);</span><br><span> return -2;</span><br><span>@@ -602,7 +602,8 @@</span><br><span> goto exit;</span><br><span> break;</span><br><span> case 'X':</span><br><span style="color: hsl(0, 100%, 40%);">- if (strncmp("Osmux: ", line + 2, strlen("Osmux: ")) == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'x':</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strncasecmp("Osmux: ", line + 2, strlen("Osmux: ")) == 0) {</span><br><span> rc = mgcp_parse_osmux_cid(line);</span><br><span> if (rc < 0) {</span><br><span> /* -1: we don't want wildcards in response. -2: error */</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_msg.c b/src/libosmo-mgcp/mgcp_msg.c</span><br><span>index a31bff4..59e0e91 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_msg.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_msg.c</span><br><span>@@ -360,12 +360,12 @@</span><br><span> int osmux_cid;</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (strstr(line + 2, "Osmux: *")) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strcasecmp(line + 2, "Osmux: *") == 0) {</span><br><span> LOGP(DLMGCP, LOGL_DEBUG, "Parsed wilcard Osmux CID\n");</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (sscanf(line + 2, "Osmux: %u", &osmux_cid) != 1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (sscanf(line + 2 + 7, "%u", &osmux_cid) != 1) {</span><br><span> LOGP(DLMGCP, LOGL_ERROR, "Failed parsing Osmux in MGCP msg line: %s\n",</span><br><span> line);</span><br><span> return -2;</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>index 0831abb..74926ad 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>@@ -816,7 +816,8 @@</span><br><span> mode = (const char *)line + 3;</span><br><span> break;</span><br><span> case 'X':</span><br><span style="color: hsl(0, 100%, 40%);">- if (strncmp("Osmux: ", line + 2, strlen("Osmux: ")) == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'x':</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strncasecmp("Osmux: ", line + 2, strlen("Osmux: ")) == 0) {</span><br><span> /* If osmux is disabled, just skip setting it up */</span><br><span> if (!p->endp->cfg->osmux)</span><br><span> break;</span><br><span>@@ -1099,7 +1100,8 @@</span><br><span> silent = strcmp("noanswer", line + 3) == 0;</span><br><span> break;</span><br><span> case 'X':</span><br><span style="color: hsl(0, 100%, 40%);">- if (strncmp("Osmux: ", line + 2, strlen("Osmux: ")) == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case 'x':</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strncasecmp("Osmux: ", line + 2, strlen("Osmux: ")) == 0) {</span><br><span> /* If osmux is disabled, just skip setting it up */</span><br><span> if (!p->endp->cfg->osmux)</span><br><span> break;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14043">change 14043</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/14043"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-mgw </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Iac073f1db46569b46eddeaecc9934a2986bd50f1 </div>
<div style="display:none"> Gerrit-Change-Number: 14043 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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>