<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10619">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;">X-Osmo-IGN: rather parse items by token, not char<br><br>Adjust the X-Osmo-IGN parsing to use string tokens instead of parsing single<br>characters.<br><br>Reconsidering the first implementation as a poor choice, rather specify the<br>format of X-Osmo-IGN as any-length string tokens separated by spaces, which is<br>more flexible and more future proof.<br><br>See also osmo-gsm-manuals If15a88c3b5b40fd1d24ad0f94f3231f678669ab1 which<br>defines the X-Osmo-IGN format as string tokens, matching this patch.<br><br>In mgcp_test, add an unknown X-Osmo-IGN item. Though the output is not checked<br>by the testsuite.at, running manually shows the error log about the unkown<br>X-Osmo-IGN item.<br><br>Change-Id: Ia6fe5ead4b601931c1bf41b29fc1b237aac37d2c<br>---<br>M src/libosmo-mgcp/mgcp_protocol.c<br>M tests/mgcp/mgcp_test.c<br>M tests/mgcp/mgcp_test.ok<br>3 files changed, 28 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>index cb2c965..7f4a7b8 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>@@ -674,6 +674,30 @@</span><br><span> return 534;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static bool parse_x_osmo_ign(struct mgcp_endpoint *endp, char *line)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ char *saveptr = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strncmp(line, MGCP_X_OSMO_IGN_HEADER, strlen(MGCP_X_OSMO_IGN_HEADER)))</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ line += strlen(MGCP_X_OSMO_IGN_HEADER);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ while (1) {</span><br><span style="color: hsl(120, 100%, 40%);">+ char *token = strtok_r(line, " ", &saveptr);</span><br><span style="color: hsl(120, 100%, 40%);">+ line = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!token)</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%);">+ if (!strcmp(token, "C"))</span><br><span style="color: hsl(120, 100%, 40%);">+ endp->x_osmo_ign |= MGCP_X_OSMO_IGN_CALLID;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLMGCP, LOGL_ERROR, "endpoint %x: received unknown X-Osmo-IGN item '%s'\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ ENDPOINT_NUMBER(endp), token);</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 true;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* CRCX command handler, processes the received command */</span><br><span> static struct msgb *handle_create_con(struct mgcp_parse_data *p)</span><br><span> {</span><br><span>@@ -723,22 +747,9 @@</span><br><span> break;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Parse X-Osmo-IGN header */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!strncmp(line, MGCP_X_OSMO_IGN_HEADER,</span><br><span style="color: hsl(0, 100%, 40%);">- strlen(MGCP_X_OSMO_IGN_HEADER))) {</span><br><span style="color: hsl(0, 100%, 40%);">- int i;</span><br><span style="color: hsl(0, 100%, 40%);">- int line_len = strlen(line);</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = strlen(MGCP_X_OSMO_IGN_HEADER); i < line_len; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- switch (line[i]) {</span><br><span style="color: hsl(0, 100%, 40%);">- case 'C':</span><br><span style="color: hsl(0, 100%, 40%);">- endp->x_osmo_ign |= MGCP_X_OSMO_IGN_CALLID;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (parse_x_osmo_ign(endp, line))</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Ignore unknown X-headers */</span><br><span> break;</span><br><span> case '\0':</span><br><span>diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c</span><br><span>index 2d1e28a..f8f701e 100644</span><br><span>--- a/tests/mgcp/mgcp_test.c</span><br><span>+++ b/tests/mgcp/mgcp_test.c</span><br><span>@@ -314,7 +314,7 @@</span><br><span> "M: recvonly\r\n" \</span><br><span> "C: 2\r\n" \</span><br><span> "L: p:20\r\n" \</span><br><span style="color: hsl(0, 100%, 40%);">- "X-Osmo-IGN: C\r\n" \</span><br><span style="color: hsl(120, 100%, 40%);">+ "X-Osmo-IGN: C foo\r\n" \</span><br><span> "\r\n" \</span><br><span> "v=0\r\n" \</span><br><span> "c=IN IP4 123.12.12.123\r\n" \</span><br><span>diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok</span><br><span>index bdaf5d7..fcad85a 100644</span><br><span>--- a/tests/mgcp/mgcp_test.ok</span><br><span>+++ b/tests/mgcp/mgcp_test.ok</span><br><span>@@ -427,7 +427,7 @@</span><br><span> M: recvonly
</span><br><span> C: 2
</span><br><span> L: p:20
</span><br><span style="color: hsl(0, 100%, 40%);">-X-Osmo-IGN: C
</span><br><span style="color: hsl(120, 100%, 40%);">+X-Osmo-IGN: C foo
</span><br><span> </span><br><span> v=0
</span><br><span> c=IN IP4 123.12.12.123
</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10619">change 10619</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/10619"/><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: Ia6fe5ead4b601931c1bf41b29fc1b237aac37d2c </div>
<div style="display:none"> Gerrit-Change-Number: 10619 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </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>