<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10677">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(): compare conn Id ('I:') case insensitively<br><br>The Connection Identifier is defined as a hex string, so clients may send the<br>ID back in lower case. Convert to upper case before comparing.<br><br>A specific SCCPlite MSC is observed to DLCX with Connection Identifier in lower<br>case, which would mismatch pefore this patch.<br><br>Add test_conn_id_matching() in mgcp_test.c to verify case insensitivity.<br><br>Cosmetic: use strcmp(), not strncmp(). In the presence of a terminating nul as<br>we can assume here, this makes no functional difference, but it clarifies the<br>code.<br><br>Related: OS#3508<br>Depends: Ib0ee1206b9f31d7ba25c31f8008119ac55440797 (libosmocore)<br>Change-Id: I8e52278c3abe9e9c8c848c2b1538bce443f68a43<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, 49 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 0126c7c..0918b8b 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_conn.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_conn.c</span><br><span>@@ -189,9 +189,18 @@</span><br><span> struct mgcp_conn *mgcp_conn_get(struct mgcp_endpoint *endp, const char *id)</span><br><span> {</span><br><span> struct mgcp_conn *conn;</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *id_upper;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!id || !*id)</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Use uppercase to compare identifiers, to avoid mismatches: RFC3435 2.1.3.2 "Names of</span><br><span style="color: hsl(120, 100%, 40%);">+ * Connections" defines the id as a hex string, so clients may return lower case hex even though</span><br><span style="color: hsl(120, 100%, 40%);">+ * we sent upper case hex in the CRCX response. */</span><br><span style="color: hsl(120, 100%, 40%);">+ 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 (strncmp(conn->id, id, sizeof(conn->id)) == 0)</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 c40eabc..99ddd71 100644</span><br><span>--- a/tests/mgcp/mgcp_test.c</span><br><span>+++ b/tests/mgcp/mgcp_test.c</span><br><span>@@ -1751,6 +1751,40 @@</span><br><span> OSMO_ASSERT(pt_dst == -EINVAL);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void test_conn_id_matching()</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct mgcp_endpoint endp = {};</span><br><span style="color: hsl(120, 100%, 40%);">+ struct mgcp_conn *conn;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct mgcp_conn *conn_match;</span><br><span style="color: hsl(120, 100%, 40%);">+ int i;</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *conn_id_generated = "000023AB";</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *conn_id_request[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ "000023AB",</span><br><span style="color: hsl(120, 100%, 40%);">+ "000023ab",</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%);">+ printf("\nTesting %s\n", __func__);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ INIT_LLIST_HEAD(&endp.conns);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ conn = talloc_zero(NULL, struct mgcp_conn);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(conn);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_strlcpy(conn->id, conn_id_generated, sizeof(conn->id));</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_add(&conn->entry, &endp.conns);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < ARRAY_SIZE(conn_id_request); i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *needle = conn_id_request[i];</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("needle='%s' ", needle);</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_match = mgcp_conn_get(&endp, needle);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(conn_match);</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("found '%s'\n", conn_match->id);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(conn_match == conn);</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%);">+ llist_del(&conn->entry);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(conn);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int main(int argc, char **argv)</span><br><span> {</span><br><span> void *ctx = talloc_named_const(NULL, 0, "mgcp_test");</span><br><span>@@ -1775,6 +1809,7 @@</span><br><span> test_get_lco_identifier();</span><br><span> test_check_local_cx_options(ctx);</span><br><span> test_mgcp_codec_pt_translate();</span><br><span style="color: hsl(120, 100%, 40%);">+ test_conn_id_matching();</span><br><span> </span><br><span> OSMO_ASSERT(talloc_total_size(msgb_ctx) == 0);</span><br><span> OSMO_ASSERT(talloc_total_blocks(msgb_ctx) == 1);</span><br><span>diff --git a/tests/mgcp/mgcp_test.ok b/tests/mgcp/mgcp_test.ok</span><br><span>index ddda751..f50f487 100644</span><br><span>--- a/tests/mgcp/mgcp_test.ok</span><br><span>+++ b/tests/mgcp/mgcp_test.ok</span><br><span>@@ -1169,4 +1169,8 @@</span><br><span> '' -> '(null)'</span><br><span> p10, aPCMU -> (null)</span><br><span> '10,a :PCMU' -> '(null)'</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+Testing test_conn_id_matching</span><br><span style="color: hsl(120, 100%, 40%);">+needle='000023AB' found '000023AB'</span><br><span style="color: hsl(120, 100%, 40%);">+needle='000023ab' found '000023AB'</span><br><span> Done</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10677">change 10677</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/10677"/><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: I8e52278c3abe9e9c8c848c2b1538bce443f68a43 </div>
<div style="display:none"> Gerrit-Change-Number: 10677 </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>