<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10678">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_conn_get(): match conn Id ('I:') despite leading zeros<br><br>The Connection Identifier is defined as a hex string, so clients may send the<br>ID back with or without leading zeros. Ignore all leading zeros when comparing.<br><br>A specific SCCPlite MSC is observed to DLCX with Connection Identifier with<br>leading zeros removed, which would mismatch pefore this patch.<br><br>Extend test_conn_id_matching() in mgcp_test.c to include leading zero tests.<br><br>Now, mgcp_conn_get() would match a valid id with *any* amount of leading zeros,<br>even if that far surpasses the permitted conn id length. Valid lengths of<br>incoming conn ids should be and is checked elsewhere.<br><br>Related: OS#3509<br>Change-Id: If55a64a2da47b6eff035711c08e4114d70dbec91<br>---<br>M src/libosmo-mgcp/mgcp_conn.c<br>M tests/mgcp/mgcp_test.c<br>M tests/mgcp/mgcp_test.ok<br>3 files changed, 21 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libosmo-mgcp/mgcp_conn.c b/src/libosmo-mgcp/mgcp_conn.c</span><br><span>index 0918b8b..820c63a 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_conn.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_conn.c</span><br><span>@@ -190,17 +190,25 @@</span><br><span> {</span><br><span> struct mgcp_conn *conn;</span><br><span> const char *id_upper;</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *conn_id;</span><br><span> </span><br><span> if (!id || !*id)</span><br><span> return NULL;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Ignore leading zeros in needle */</span><br><span style="color: hsl(120, 100%, 40%);">+ while (*id == '0')</span><br><span style="color: hsl(120, 100%, 40%);">+ id++;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Use uppercase to compare identifiers, to avoid mismatches: RFC3435 2.1.3.2 "Names of</span><br><span> * Connections" defines the id as a hex string, so clients may return lower case hex even though</span><br><span> * we sent upper case hex in the CRCX response. */</span><br><span> id_upper = osmo_str_toupper(id);</span><br><span> </span><br><span> llist_for_each_entry(conn, &endp->conns, entry) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (strcmp(conn->id, id_upper) == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Ignore leading zeros in haystack */</span><br><span style="color: hsl(120, 100%, 40%);">+ for (conn_id=conn->id; *conn_id == '0'; conn_id++);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strcmp(conn_id, id_upper) == 0)</span><br><span> return conn;</span><br><span> }</span><br><span> </span><br><span>diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c</span><br><span>index 99ddd71..b9f7253 100644</span><br><span>--- a/tests/mgcp/mgcp_test.c</span><br><span>+++ b/tests/mgcp/mgcp_test.c</span><br><span>@@ -1759,8 +1759,14 @@</span><br><span> int i;</span><br><span> const char *conn_id_generated = "000023AB";</span><br><span> const char *conn_id_request[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ "23AB",</span><br><span style="color: hsl(120, 100%, 40%);">+ "0023AB",</span><br><span> "000023AB",</span><br><span style="color: hsl(120, 100%, 40%);">+ "00000023AB",</span><br><span style="color: hsl(120, 100%, 40%);">+ "23ab",</span><br><span style="color: hsl(120, 100%, 40%);">+ "0023ab",</span><br><span> "000023ab",</span><br><span style="color: hsl(120, 100%, 40%);">+ "00000023ab",</span><br><span> };</span><br><span> </span><br><span> printf("\nTesting %s\n", __func__);</span><br><span>diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok</span><br><span>index f50f487..28e9aad 100644</span><br><span>--- a/tests/mgcp/mgcp_test.ok</span><br><span>+++ b/tests/mgcp/mgcp_test.ok</span><br><span>@@ -1171,6 +1171,12 @@</span><br><span> '10,a :PCMU' -> '(null)'</span><br><span> </span><br><span> Testing test_conn_id_matching</span><br><span style="color: hsl(120, 100%, 40%);">+needle='23AB' found '000023AB'</span><br><span style="color: hsl(120, 100%, 40%);">+needle='0023AB' found '000023AB'</span><br><span> needle='000023AB' found '000023AB'</span><br><span style="color: hsl(120, 100%, 40%);">+needle='00000023AB' found '000023AB'</span><br><span style="color: hsl(120, 100%, 40%);">+needle='23ab' found '000023AB'</span><br><span style="color: hsl(120, 100%, 40%);">+needle='0023ab' found '000023AB'</span><br><span> needle='000023ab' found '000023AB'</span><br><span style="color: hsl(120, 100%, 40%);">+needle='00000023ab' found '000023AB'</span><br><span> Done</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10678">change 10678</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/10678"/><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: If55a64a2da47b6eff035711c08e4114d70dbec91 </div>
<div style="display:none"> Gerrit-Change-Number: 10678 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </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>