<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10750">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;">mgcp_client: error on too long conn id<br><br>Instead of just silently truncating the conn ID if it is too long, rather<br>verify its length and return an error where applicable.<br><br>Adjust expected test output.<br><br>Change-Id: If2a1aab1f13e771a6705c430e3c75bd42477a23b<br>---<br>M src/libosmo-mgcp-client/mgcp_client.c<br>M tests/mgcp_client/mgcp_client_test.err<br>M tests/mgcp_client/mgcp_client_test.ok<br>3 files changed, 11 insertions(+), 17 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 e9d7b3f..2a8cc15 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>@@ -550,6 +550,7 @@</span><br><span> char label, const char *line)</span><br><span> {</span><br><span> char label_string[4];</span><br><span style="color: hsl(120, 100%, 40%);">+ size_t rc;</span><br><span> </span><br><span> /* Detect empty parameters */</span><br><span> if (strlen(line) < 4)</span><br><span>@@ -562,7 +563,14 @@</span><br><span> </span><br><span> /* Copy payload part of the string to destinations (the label string</span><br><span> * is always 3 chars long) */</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_strlcpy(result, line + 3, result_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = osmo_strlcpy(result, line + 3, result_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc >= result_len) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DLMGCP, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Failed to parse MGCP response (parameter label: %c):"</span><br><span style="color: hsl(120, 100%, 40%);">+ " the received conn ID is too long: %zu, maximum is %u characters\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ label, rc, result_len - 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENOSPC;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> return 0;</span><br><span> </span><br><span> response_parse_failure:</span><br><span>diff --git a/tests/mgcp_client/mgcp_client_test.err b/tests/mgcp_client/mgcp_client_test.err</span><br><span>index 1d5a1a0..b20f93f 100644</span><br><span>--- a/tests/mgcp_client/mgcp_client_test.err</span><br><span>+++ b/tests/mgcp_client/mgcp_client_test.err</span><br><span>@@ -66,4 +66,6 @@</span><br><span> DLMGCP ptmap contains illegal mapping: codec=0 maps to pt=100</span><br><span> DLMGCP ptmap contains illegal mapping: codec=113 maps to pt=2</span><br><span> DLMGCP ptmap contains illegal mapping: codec=0 maps to pt=100</span><br><span style="color: hsl(120, 100%, 40%);">+DLMGCP Failed to parse MGCP response (parameter label: I): the received conn ID is too long: 39, maximum is 32 characters</span><br><span style="color: hsl(120, 100%, 40%);">+DLMGCP Cannot parse MGCP response (head parameters)</span><br><span> Done</span><br><span>diff --git a/tests/mgcp_client/mgcp_client_test.ok b/tests/mgcp_client/mgcp_client_test.ok</span><br><span>index aedb247..40e32ba 100644</span><br><span>--- a/tests/mgcp_client/mgcp_client_test.ok</span><br><span>+++ b/tests/mgcp_client/mgcp_client_test.ok</span><br><span>@@ -264,20 +264,4 @@</span><br><span> a=ptime:20
</span><br><span> </span><br><span> -----</span><br><span style="color: hsl(0, 100%, 40%);">-response cb received:</span><br><span style="color: hsl(0, 100%, 40%);">- head.response_code = 200</span><br><span style="color: hsl(0, 100%, 40%);">- head.trans_id = 1</span><br><span style="color: hsl(0, 100%, 40%);">- head.conn_id = 123456789abcdef0123456789ABCDEF0</span><br><span style="color: hsl(0, 100%, 40%);">- head.comment = OK</span><br><span style="color: hsl(0, 100%, 40%);">- audio_port = 16002</span><br><span style="color: hsl(0, 100%, 40%);">- audio_ip = 10.9.1.120</span><br><span style="color: hsl(0, 100%, 40%);">- ptime = 20</span><br><span style="color: hsl(0, 100%, 40%);">- codecs_len = 2</span><br><span style="color: hsl(0, 100%, 40%);">- codecs[0] = 112</span><br><span style="color: hsl(0, 100%, 40%);">- codecs[1] = 110</span><br><span style="color: hsl(0, 100%, 40%);">- ptmap_len = 2</span><br><span style="color: hsl(0, 100%, 40%);">- ptmap[0].codec = 112</span><br><span style="color: hsl(0, 100%, 40%);">- ptmap[0].pt = 110</span><br><span style="color: hsl(0, 100%, 40%);">- ptmap[1].codec = 110</span><br><span style="color: hsl(0, 100%, 40%);">- ptmap[1].pt = 96</span><br><span> Done</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10750">change 10750</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/10750"/><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: If2a1aab1f13e771a6705c430e3c75bd42477a23b </div>
<div style="display:none"> Gerrit-Change-Number: 10750 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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>