<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9973">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  Neels Hofmeyr: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">nat: ctrl: Use ctrl_cmd_parse2 to obtain detailed error<br><br>Instead of always logging/sending same error, use the new<br>ctrl_cmd_parse2 API which always returns a cmd structure with a specific<br>error description.<br><br>Change-Id: I6ef2b6e309632ed9cb296e8a1e71f879007a36ae<br>---<br>M openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c<br>1 file changed, 2 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c b/openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c</span><br><span>index 61ac887..af110a2 100644</span><br><span>--- a/openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c</span><br><span>+++ b/openbsc/src/osmo-bsc_nat/bsc_nat_ctrl.c</span><br><span>@@ -103,20 +103,11 @@</span><br><span>       struct bsc_cmd_list *pending;</span><br><span>        char *var;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  cmd = ctrl_cmd_parse(bsc, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+       cmd = ctrl_cmd_parse2(bsc, msg);</span><br><span>     msgb_free(msg);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-     if (!cmd) {</span><br><span style="color: hsl(0, 100%, 40%);">-             cmd = talloc_zero(bsc, struct ctrl_cmd);</span><br><span style="color: hsl(0, 100%, 40%);">-                if (!cmd) {</span><br><span style="color: hsl(0, 100%, 40%);">-                     LOGP(DNAT, LOGL_ERROR, "OOM!\n");</span><br><span style="color: hsl(0, 100%, 40%);">-                     return -ENOMEM;</span><br><span style="color: hsl(0, 100%, 40%);">-         }</span><br><span style="color: hsl(0, 100%, 40%);">-               cmd->type = CTRL_TYPE_ERROR;</span><br><span style="color: hsl(0, 100%, 40%);">-         cmd->id = "err";</span><br><span style="color: hsl(0, 100%, 40%);">-           cmd->reply = "Failed to parse command.";</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cmd->type == CTRL_TYPE_ERROR)</span><br><span>                 goto err;</span><br><span style="color: hsl(0, 100%, 40%);">-       }</span><br><span> </span><br><span>        if (bsc->cfg && !llist_empty(&bsc->cfg->lac_list)) {</span><br><span>            if (cmd->variable) {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9973">change 9973</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/9973"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: openbsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I6ef2b6e309632ed9cb296e8a1e71f879007a36ae </div>
<div style="display:none"> Gerrit-Change-Number: 9973 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>