<p>Max <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12316">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  osmith: Looks good to me, but someone else must approve
  daniel: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ctrl: separate config structure<br><br>Moving configuration data from anonymous struct into shared header as a<br>preparation for ctrl logging improvements in follow-up patches.<br><br>Change-Id: I3520e14ca6e1b8e270dbd4b1bf2378fe486991ce<br>Related: SYS#2655<br>---<br>M src/osysmon_ctrl.c<br>M src/simple_ctrl.h<br>2 files changed, 11 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osysmon_ctrl.c b/src/osysmon_ctrl.c</span><br><span>index 4aa7a1d..c2d0725 100644</span><br><span>--- a/src/osysmon_ctrl.c</span><br><span>+++ b/src/osysmon_ctrl.c</span><br><span>@@ -38,14 +38,7 @@</span><br><span> struct ctrl_client {</span><br><span>         /* links to osysmon.ctrl_clients */</span><br><span>  struct llist_head list;</span><br><span style="color: hsl(0, 100%, 40%);">- struct {</span><br><span style="color: hsl(0, 100%, 40%);">-                /* name of this CTRL client */</span><br><span style="color: hsl(0, 100%, 40%);">-          const char *name;</span><br><span style="color: hsl(0, 100%, 40%);">-               /* remote host/IP */</span><br><span style="color: hsl(0, 100%, 40%);">-            const char *remote_host;</span><br><span style="color: hsl(0, 100%, 40%);">-                /* remote CTRL port */</span><br><span style="color: hsl(0, 100%, 40%);">-          uint16_t remote_port;</span><br><span style="color: hsl(0, 100%, 40%);">-   } cfg;</span><br><span style="color: hsl(120, 100%, 40%);">+        struct ctrl_cfg cfg;</span><br><span>         struct simple_ctrl_handle *sch;</span><br><span>      /* list of ctrl_client_get_var objects */</span><br><span>    struct llist_head get_vars;</span><br><span>diff --git a/src/simple_ctrl.h b/src/simple_ctrl.h</span><br><span>index 81a759d..f35eab1 100644</span><br><span>--- a/src/simple_ctrl.h</span><br><span>+++ b/src/simple_ctrl.h</span><br><span>@@ -2,6 +2,16 @@</span><br><span> </span><br><span> #include <stdint.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* a CTRL client config */</span><br><span style="color: hsl(120, 100%, 40%);">+struct ctrl_cfg {</span><br><span style="color: hsl(120, 100%, 40%);">+   /* name of this CTRL client */</span><br><span style="color: hsl(120, 100%, 40%);">+        const char *name;</span><br><span style="color: hsl(120, 100%, 40%);">+     /* remote host/IP */</span><br><span style="color: hsl(120, 100%, 40%);">+  const char *remote_host;</span><br><span style="color: hsl(120, 100%, 40%);">+      /* remote CTRL port */</span><br><span style="color: hsl(120, 100%, 40%);">+        uint16_t remote_port;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct simple_ctrl_handle;</span><br><span> </span><br><span> struct simple_ctrl_handle *simple_ctrl_open(void *ctx, const char *host, uint16_t dport,</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12316">change 12316</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/12316"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-sysmon </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I3520e14ca6e1b8e270dbd4b1bf2378fe486991ce </div>
<div style="display:none"> Gerrit-Change-Number: 12316 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@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: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: Stefan Sperling <stsp@stsp.name> </div>