<p>Neels Hofmeyr has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/10753">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mgcp_verify_ci(): return meaningful error codes<br><br>Instead of just -1, return RFC3435 error codes that can be used to compose a<br>FAIL message response. Note that the return value stays compatible in that it<br>returns 0 on a valid Connection Identifier, nonzero otherwise.<br><br>The idea is to be able to distinguish between "Conn ID not found" and "Conn ID<br>invalid" in mgcp_test.c's expected output, in upcoming change<br>I8d6cc96be252bb486e94f343a8c7cae641ff9429.<br><br>Change-Id: Ifc17f2893cc4b9a865f3ffcb9888bbf1039337a6<br>---<br>M src/libosmo-mgcp/mgcp_msg.c<br>M src/libosmo-mgcp/mgcp_protocol.c<br>2 files changed, 12 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/53/10753/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libosmo-mgcp/mgcp_msg.c b/src/libosmo-mgcp/mgcp_msg.c</span><br><span>index c4e66ff..f732158 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_msg.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_msg.c</span><br><span>@@ -430,16 +430,19 @@</span><br><span> /*! Check if the specified connection id seems plausible.</span><br><span> * \param[in] endp pointer to endpoint</span><br><span> * \param{in] connection id to verify</span><br><span style="color: hsl(0, 100%, 40%);">- * \returns 0 when connection id is valid and exists, nozero on error.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns 0 when connection id is valid and exists, an RFC3435 error code on error.</span><br><span> */</span><br><span> int mgcp_verify_ci(struct mgcp_endpoint *endp, const char *conn_id)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* For invalid conn_ids, return 510 "The transaction could not be executed, because some</span><br><span style="color: hsl(120, 100%, 40%);">+ * unspecified protocol error was detected." */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Check for null identifiers */</span><br><span> if (!conn_id) {</span><br><span> LOGP(DLMGCP, LOGL_ERROR,</span><br><span> "endpoint:0x%x invalid ConnectionIdentifier (missing)\n",</span><br><span> ENDPOINT_NUMBER(endp));</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 510;</span><br><span> }</span><br><span> </span><br><span> /* Check for empty connection identifiers */</span><br><span>@@ -447,7 +450,7 @@</span><br><span> LOGP(DLMGCP, LOGL_ERROR,</span><br><span> "endpoint:0x%x invalid ConnectionIdentifier (empty)\n",</span><br><span> ENDPOINT_NUMBER(endp));</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 510;</span><br><span> }</span><br><span> </span><br><span> /* Check for over long connection identifiers */</span><br><span>@@ -455,7 +458,7 @@</span><br><span> LOGP(DLMGCP, LOGL_ERROR,</span><br><span> "endpoint:0x%x invalid ConnectionIdentifier (too long) 0x%s\n",</span><br><span> ENDPOINT_NUMBER(endp), conn_id);</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 510;</span><br><span> }</span><br><span> </span><br><span> /* Check if connection exists */</span><br><span>@@ -466,7 +469,9 @@</span><br><span> "endpoint:0x%x no connection found under ConnectionIdentifier 0x%s\n",</span><br><span> ENDPOINT_NUMBER(endp), conn_id);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* When the conn_id was not found, return error code 515 "The transaction refers to an incorrect</span><br><span style="color: hsl(120, 100%, 40%);">+ * connection-id (may have been already deleted)." */</span><br><span style="color: hsl(120, 100%, 40%);">+ return 515;</span><br><span> }</span><br><span> </span><br><span> /*! Extract individual lines from MCGP message.</span><br><span>diff --git a/src/libosmo-mgcp/mgcp_protocol.c b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>index 7f4a7b8..bc191b5 100644</span><br><span>--- a/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>+++ b/src/libosmo-mgcp/mgcp_protocol.c</span><br><span>@@ -999,10 +999,8 @@</span><br><span> break;</span><br><span> case 'I':</span><br><span> conn_id = (const char *)line + 3;</span><br><span style="color: hsl(0, 100%, 40%);">- if (mgcp_verify_ci(endp, conn_id) != 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- error_code = 515;</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((error_code = mgcp_verify_ci(endp, conn_id)))</span><br><span> goto error3;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> break;</span><br><span> case 'L':</span><br><span> local_options = (const char *)line + 3;</span><br><span>@@ -1185,10 +1183,8 @@</span><br><span> break;</span><br><span> case 'I':</span><br><span> conn_id = (const char *)line + 3;</span><br><span style="color: hsl(0, 100%, 40%);">- if (mgcp_verify_ci(endp, conn_id) != 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- error_code = 515;</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((error_code = mgcp_verify_ci(endp, conn_id)))</span><br><span> goto error3;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> break;</span><br><span> case 'Z':</span><br><span> silent = strcmp("noanswer", line + 3) == 0;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10753">change 10753</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/10753"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ifc17f2893cc4b9a865f3ffcb9888bbf1039337a6 </div>
<div style="display:none"> Gerrit-Change-Number: 10753 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>