<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10679">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;">cosmetic: mgcp_test: fix get_conn_id_from_response()<br><br>This function is implemented in such a weird way that I couldn't stop myself<br>from rewriting it.<br><br>Change-Id: Ib9b13d7b0e64f8ae25a7b69cbb385e7fad33d02b<br>---<br>M tests/mgcp/mgcp_test.c<br>1 file changed, 30 insertions(+), 35 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/tests/mgcp/mgcp_test.c b/tests/mgcp/mgcp_test.c</span><br><span>index b9f7253..4cb16dd 100644</span><br><span>--- a/tests/mgcp/mgcp_test.c</span><br><span>+++ b/tests/mgcp/mgcp_test.c</span><br><span>@@ -607,47 +607,42 @@</span><br><span> MGCP_CONN_RECV_SEND);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* Extract a connection ID from a response (CRCX) */</span><br><span style="color: hsl(120, 100%, 40%);">+/* Extract a connection ID from a response and return in conn_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ * if there is none, return -EINVAL and leave conn_id unchanged. */</span><br><span> static int get_conn_id_from_response(uint8_t *resp, char *conn_id,</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int conn_id_len)</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t conn_id_buflen)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- char *conn_id_ptr;</span><br><span style="color: hsl(0, 100%, 40%);">- int i;</span><br><span style="color: hsl(0, 100%, 40%);">- bool got_conn_id = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *conn_id_start;</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *conn_id_end;</span><br><span style="color: hsl(120, 100%, 40%);">+ int conn_id_len;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* First try to get the conn_id from the I: parameter */</span><br><span style="color: hsl(0, 100%, 40%);">- conn_id_ptr = strstr((char *)resp, "I: ");</span><br><span style="color: hsl(0, 100%, 40%);">- if (conn_id_ptr) {</span><br><span style="color: hsl(0, 100%, 40%);">- memset(conn_id, 0, conn_id_len);</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(conn_id, conn_id_ptr + 3, 32);</span><br><span style="color: hsl(0, 100%, 40%);">- got_conn_id = true;</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- /* Alternatively try to extract the conn_id from the o=- SDP</span><br><span style="color: hsl(0, 100%, 40%);">- * parameter */</span><br><span style="color: hsl(0, 100%, 40%);">- conn_id_ptr = strstr((char *)resp, "o=- ");</span><br><span style="color: hsl(0, 100%, 40%);">- if(conn_id_ptr) {</span><br><span style="color: hsl(0, 100%, 40%);">- memset(conn_id, 0, conn_id_len);</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(conn_id, conn_id_ptr + 4, 32);</span><br><span style="color: hsl(0, 100%, 40%);">- got_conn_id = true;</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%);">+ const char *header_I = "\r\nI: ";</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *header_o = "\r\no=- ";</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (got_conn_id) {</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < conn_id_len; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (!isxdigit(conn_id[i])) {</span><br><span style="color: hsl(0, 100%, 40%);">- conn_id[i] = '\0';</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%);">+ /* Try to get the conn_id from the 'I:' or 'o=-' parameter */</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((conn_id_start = strstr((char *)resp, header_I))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_id_start += strlen(header_I);</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_id_end = strstr(conn_id_start, "\r\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if ((conn_id_start = strstr((char *)resp, header_o))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_id_start += strlen(header_o);</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_id_end = strchr(conn_id_start, ' ');</span><br><span style="color: hsl(120, 100%, 40%);">+ } else</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* A valid conn_id must at least contain one digit, and must</span><br><span style="color: hsl(0, 100%, 40%);">- * not exceed a length of 32 digits */</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(strlen(conn_id) <= 32);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(strlen(conn_id) > 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (conn_id_end)</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_id_len = conn_id_end - conn_id_start;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_id_len = strlen(conn_id_start);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(conn_id_len <= conn_id_buflen - 1);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* A valid conn_id must at least contain one digit, and must</span><br><span style="color: hsl(120, 100%, 40%);">+ * not exceed a length of 32 digits */</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(conn_id_len <= 32);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(conn_id_len > 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ strncpy(conn_id, conn_id_start, conn_id_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ conn_id[conn_id_len] = '\0';</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> }</span><br><span> </span><br><span> /* Check response, automatically patch connection ID if needed */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10679">change 10679</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/10679"/><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: Ib9b13d7b0e64f8ae25a7b69cbb385e7fad33d02b </div>
<div style="display:none"> Gerrit-Change-Number: 10679 </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>