<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmocore/+/21964">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  laforge: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ctrl: Allow handling CTRL get/set replies in user defined code<br><br>Prior to this patch, it was not possible to gather SET/GET reply<br>information when implementing a CTRL client using libosmocontrol. This<br>is specially important when using the GET command, since one wants to<br>receive the queried value.<br>CTRL traps can also be handled this way by extending this patch in the<br>future if needed.<br><br>Change-Id: Id3c4631cd32c13e78e11b6e8194b8c16307ec4f1<br>---<br>M TODO-RELEASE<br>M include/osmocom/ctrl/control_if.h<br>M src/ctrl/control_if.c<br>3 files changed, 12 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/TODO-RELEASE b/TODO-RELEASE</span><br><span>index e8fb32b..501f25b 100644</span><br><span>--- a/TODO-RELEASE</span><br><span>+++ b/TODO-RELEASE</span><br><span>@@ -12,3 +12,4 @@</span><br><span> libosmogsm  API change              struct ipac_preproc_ave_cfg: new zero-sized flexible array member at end</span><br><span> libosmovty  ABI change              struct cmd_element: add a field for program specific attributes</span><br><span> libosmovty   ABI change              struct vty_app_info: optional program specific attributes description</span><br><span style="color: hsl(120, 100%, 40%);">+libosmoctrl     ABI change               struct ctrl_handle changed size (new field "reply_cb" at the end)</span><br><span>diff --git a/include/osmocom/ctrl/control_if.h b/include/osmocom/ctrl/control_if.h</span><br><span>index 5fa9588..b73296f 100644</span><br><span>--- a/include/osmocom/ctrl/control_if.h</span><br><span>+++ b/include/osmocom/ctrl/control_if.h</span><br><span>@@ -9,6 +9,7 @@</span><br><span> </span><br><span> typedef int (*ctrl_cmd_lookup)(void *data, vector vline, int *node_type,</span><br><span>                               void **node_data, int *i);</span><br><span style="color: hsl(120, 100%, 40%);">+typedef void (*ctrl_cmd_reply_cb)(struct ctrl_handle *ctrl, struct ctrl_cmd *cmd, void *data);</span><br><span> </span><br><span> struct ctrl_handle {</span><br><span>       struct osmo_fd listen_fd;</span><br><span>@@ -18,6 +19,12 @@</span><br><span> </span><br><span>   /* List of control connections */</span><br><span>    struct llist_head ccon_list;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+        /* User defined GET/SET REPLY handler. User can set cmd->defer to 1 in</span><br><span style="color: hsl(120, 100%, 40%);">+        order to own and keep the cmd pointer and free it after the function</span><br><span style="color: hsl(120, 100%, 40%);">+          returns. "data" param is the user data pointer supplied during</span><br><span style="color: hsl(120, 100%, 40%);">+      ctrl_handle allocation  */</span><br><span style="color: hsl(120, 100%, 40%);">+ ctrl_cmd_reply_cb reply_cb;</span><br><span> };</span><br><span> </span><br><span> </span><br><span>diff --git a/src/ctrl/control_if.c b/src/ctrl/control_if.c</span><br><span>index ce2e367..9e3e3a9 100644</span><br><span>--- a/src/ctrl/control_if.c</span><br><span>+++ b/src/ctrl/control_if.c</span><br><span>@@ -221,6 +221,10 @@</span><br><span> </span><br><span>        if (cmd->type == CTRL_TYPE_SET_REPLY ||</span><br><span>       cmd->type == CTRL_TYPE_GET_REPLY) {</span><br><span style="color: hsl(120, 100%, 40%);">+            if (ctrl->reply_cb) {</span><br><span style="color: hsl(120, 100%, 40%);">+                      ctrl->reply_cb(ctrl, cmd, data);</span><br><span style="color: hsl(120, 100%, 40%);">+                   return CTRL_CMD_HANDLED;</span><br><span style="color: hsl(120, 100%, 40%);">+              }</span><br><span>            if (strncmp(cmd->reply, "OK", 2) == 0) {</span><br><span>                        LOGP(DLCTRL, LOGL_DEBUG, "%s <%s> for %s is OK\n",</span><br><span>                        get_value_string(ctrl_type_vals, cmd->type),</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmocore/+/21964">change 21964</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/c/libosmocore/+/21964"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: libosmocore </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Id3c4631cd32c13e78e11b6e8194b8c16307ec4f1 </div>
<div style="display:none"> Gerrit-Change-Number: 21964 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>