<p>Max <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12761">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
Objections:
Pau Espin Pedrol: I would prefer this is not merged as is
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Introduce generic host config and related helpers<br><br>Add generic host config struct and related helpers for TCP-based probes<br>and use them for ctrl probe.<br><br>This will be used in follow-up patch for OpenVPN probe as well.<br><br>Change-Id: Ie321655a92cdbefbfaa056ac0d583397c83beccb<br>---<br>M src/Makefile.am<br>A src/client.c<br>A src/client.h<br>M src/osysmon_ctrl.c<br>M src/simple_ctrl.c<br>M src/simple_ctrl.h<br>6 files changed, 133 insertions(+), 38 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/Makefile.am b/src/Makefile.am</span><br><span>index d0d6a22..f639023 100644</span><br><span>--- a/src/Makefile.am</span><br><span>+++ b/src/Makefile.am</span><br><span>@@ -21,7 +21,7 @@</span><br><span> $(NULL)</span><br><span> </span><br><span> noinst_LTLIBRARIES = libintern.la</span><br><span style="color: hsl(0, 100%, 40%);">-libintern_la_SOURCES = simple_ctrl.c</span><br><span style="color: hsl(120, 100%, 40%);">+libintern_la_SOURCES = simple_ctrl.c client.c</span><br><span> libintern_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)</span><br><span> </span><br><span> osmo_sysmon_CFLAGS = $(LIBMNL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOPING_CFLAGS) $(AM_CFLAGS)</span><br><span>@@ -44,6 +44,7 @@</span><br><span> </span><br><span> noinst_HEADERS = \</span><br><span> osysmon.h \</span><br><span style="color: hsl(120, 100%, 40%);">+ client.h \</span><br><span> simple_ctrl.h \</span><br><span> value_node.h \</span><br><span> $(NULL)</span><br><span>diff --git a/src/client.c b/src/client.c</span><br><span>new file mode 100644</span><br><span>index 0000000..6b37fc6</span><br><span>--- /dev/null</span><br><span>+++ b/src/client.c</span><br><span>@@ -0,0 +1,73 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/* Generic client structure and related helpers */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* (C) 2018 by Harald Welte <laforge@gnumonks.org></span><br><span style="color: hsl(120, 100%, 40%);">+ * (C) 2019 by sysmocom - s.f.m.c. GmbH.</span><br><span style="color: hsl(120, 100%, 40%);">+ * All Rights Reserved.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * SPDX-License-Identifier: GPL-2.0+</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+ * it under the terms of the GNU General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; either version 2 of the License, or</span><br><span style="color: hsl(120, 100%, 40%);">+ * (at your option) any later version.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * You should have received a copy of the GNU General Public License</span><br><span style="color: hsl(120, 100%, 40%);">+ * along with this program; if not, write to the Free Software</span><br><span style="color: hsl(120, 100%, 40%);">+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,</span><br><span style="color: hsl(120, 100%, 40%);">+ * MA 02110-1301, USA.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <stdbool.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <string.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <talloc.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include "client.h"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+bool match_config(const struct host_cfg *cfg, const char *match, enum match_kind k)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ bool m_name = (strcmp(match, cfg->name) == 0),</span><br><span style="color: hsl(120, 100%, 40%);">+ m_host = (strcmp(match, cfg->remote_host) == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (k) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case MATCH_NAME:</span><br><span style="color: hsl(120, 100%, 40%);">+ return m_name;</span><br><span style="color: hsl(120, 100%, 40%);">+ case MATCH_HOST:</span><br><span style="color: hsl(120, 100%, 40%);">+ return m_host;</span><br><span style="color: hsl(120, 100%, 40%);">+ case MATCH_EITHER:</span><br><span style="color: hsl(120, 100%, 40%);">+ return m_name | m_host;</span><br><span style="color: hsl(120, 100%, 40%);">+ case MATCH_BOTH:</span><br><span style="color: hsl(120, 100%, 40%);">+ return m_name & m_host;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct host_cfg *host_cfg_alloc(void *ctx, const char *name, const char *host, uint16_t port)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct host_cfg *cfg = talloc_zero(ctx, struct host_cfg);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!cfg)</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->name = talloc_strdup(cfg, name);</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->remote_host = talloc_strdup(cfg, host);</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg->remote_port = port;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return cfg;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+char *make_authority(void *ctx, const struct host_cfg *cfg)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!cfg->remote_host)</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return talloc_asprintf(ctx, "%s:%u", cfg->remote_host, cfg->remote_port);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span>diff --git a/src/client.h b/src/client.h</span><br><span>new file mode 100644</span><br><span>index 0000000..605ddd7</span><br><span>--- /dev/null</span><br><span>+++ b/src/client.h</span><br><span>@@ -0,0 +1,25 @@</span><br><span style="color: hsl(120, 100%, 40%);">+#pragma once</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <stdint.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <stdbool.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+enum match_kind {</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCH_NAME,</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCH_HOST,</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCH_BOTH,</span><br><span style="color: hsl(120, 100%, 40%);">+ MATCH_EITHER,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* a client config */</span><br><span style="color: hsl(120, 100%, 40%);">+struct host_cfg {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* name of this 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 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 style="color: hsl(120, 100%, 40%);">+struct host_cfg *host_cfg_alloc(void *ctx, const char *name, const char *host, uint16_t port);</span><br><span style="color: hsl(120, 100%, 40%);">+bool match_config(const struct host_cfg *cfg, const char *match, enum match_kind k);</span><br><span style="color: hsl(120, 100%, 40%);">+char *make_authority(void *ctx, const struct host_cfg *cfg);</span><br><span>diff --git a/src/osysmon_ctrl.c b/src/osysmon_ctrl.c</span><br><span>index c2d0725..c54779c 100644</span><br><span>--- a/src/osysmon_ctrl.c</span><br><span>+++ b/src/osysmon_ctrl.c</span><br><span>@@ -26,6 +26,7 @@</span><br><span> #include <osmocom/vty/vty.h></span><br><span> #include <osmocom/vty/command.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include "client.h"</span><br><span> #include "osysmon.h"</span><br><span> #include "simple_ctrl.h"</span><br><span> #include "value_node.h"</span><br><span>@@ -38,7 +39,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 ctrl_cfg cfg;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct host_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>@@ -62,7 +63,7 @@</span><br><span> {</span><br><span> struct ctrl_client *cc;</span><br><span> llist_for_each_entry(cc, &os->ctrl_clients, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (!strcmp(name, cc->cfg.name))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (match_config(cc->cfg, name, MATCH_NAME))</span><br><span> return cc;</span><br><span> }</span><br><span> return NULL;</span><br><span>@@ -79,9 +80,13 @@</span><br><span> cc = talloc_zero(os, struct ctrl_client);</span><br><span> if (!cc)</span><br><span> return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- cc->cfg.name = talloc_strdup(cc, name);</span><br><span style="color: hsl(0, 100%, 40%);">- cc->cfg.remote_host = talloc_strdup(cc, host);</span><br><span style="color: hsl(0, 100%, 40%);">- cc->cfg.remote_port = port;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ cc->cfg = host_cfg_alloc(cc, name, host, port);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!cc->cfg) {</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(cc);</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> INIT_LLIST_HEAD(&cc->get_vars);</span><br><span> llist_add_tail(&cc->list, &os->ctrl_clients);</span><br><span> /* FIXME */</span><br><span>@@ -156,10 +161,10 @@</span><br><span> struct ctrl_client *cc;</span><br><span> cc = ctrl_client_find(g_oss, argv[0]);</span><br><span> if (cc) {</span><br><span style="color: hsl(0, 100%, 40%);">- if ((strcmp(cc->cfg.remote_host, argv[1])) ||</span><br><span style="color: hsl(0, 100%, 40%);">- (cc->cfg.remote_port != atoi(argv[2]))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((strcmp(cc->cfg->remote_host, argv[1])) ||</span><br><span style="color: hsl(120, 100%, 40%);">+ (cc->cfg->remote_port != atoi(argv[2]))) {</span><br><span> vty_out(vty, "Client %s has different IP/port, please remove it first%s",</span><br><span style="color: hsl(0, 100%, 40%);">- cc->cfg.name, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ cc->cfg->name, VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> } else</span><br><span>@@ -215,8 +220,8 @@</span><br><span> static void write_one_ctrl_client(struct vty *vty, struct ctrl_client *cc)</span><br><span> {</span><br><span> struct ctrl_client_get_var *ccgv;</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "ctrl-client %s %s %u%s", cc->cfg.name,</span><br><span style="color: hsl(0, 100%, 40%);">- cc->cfg.remote_host, cc->cfg.remote_port, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "ctrl-client %s %s %u%s", cc->cfg->name,</span><br><span style="color: hsl(120, 100%, 40%);">+ cc->cfg->remote_host, cc->cfg->remote_port, VTY_NEWLINE);</span><br><span> llist_for_each_entry(ccgv, &cc->get_vars, list) {</span><br><span> vty_out(vty, " get-variable %s%s", ccgv->cfg.name, VTY_NEWLINE);</span><br><span> if (ccgv->cfg.display_name)</span><br><span>@@ -259,11 +264,11 @@</span><br><span> static int ctrl_client_poll(struct ctrl_client *cc, struct value_node *parent)</span><br><span> {</span><br><span> struct ctrl_client_get_var *ccgv;</span><br><span style="color: hsl(0, 100%, 40%);">- struct value_node *vn_clnt = value_node_add(parent, cc->cfg.name, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct value_node *vn_clnt = value_node_add(parent, cc->cfg->name, NULL);</span><br><span> </span><br><span> /* attempt to re-connect */</span><br><span> if (!cc->sch)</span><br><span style="color: hsl(0, 100%, 40%);">- cc->sch = simple_ctrl_open(cc, cc->cfg.remote_host, cc->cfg.remote_port, 1000);</span><br><span style="color: hsl(120, 100%, 40%);">+ cc->sch = simple_ctrl_open(cc, cc->cfg->remote_host, cc->cfg->remote_port, 1000);</span><br><span> /* abort, if that failed */</span><br><span> if (!cc->sch) {</span><br><span> return -1;</span><br><span>diff --git a/src/simple_ctrl.c b/src/simple_ctrl.c</span><br><span>index b56fc83..883e92f 100644</span><br><span>--- a/src/simple_ctrl.c</span><br><span>+++ b/src/simple_ctrl.c</span><br><span>@@ -35,10 +35,11 @@</span><br><span> #include <osmocom/gsm/ipa.h></span><br><span> #include <osmocom/gsm/protocol/ipaccess.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include "client.h"</span><br><span> #include "simple_ctrl.h"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-#define CTRL_ERR(cfg, fmt, args...) \</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "CTRL %s:%u error: " fmt, cfg.remote_host, cfg.remote_port, ##args)</span><br><span style="color: hsl(120, 100%, 40%);">+#define CTRL_ERR(sch, fmt, args...) \</span><br><span style="color: hsl(120, 100%, 40%);">+ fprintf(stderr, "CTRL %s error: " fmt, make_authority(sch, &sch->cfg), ##args)</span><br><span> </span><br><span> /***********************************************************************</span><br><span> * blocking I/O with timeout helpers</span><br><span>@@ -101,7 +102,7 @@</span><br><span> int fd;</span><br><span> uint32_t next_id;</span><br><span> uint32_t tout_msec;</span><br><span style="color: hsl(0, 100%, 40%);">- struct ctrl_cfg cfg;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct host_cfg cfg;</span><br><span> };</span><br><span> </span><br><span> struct simple_ctrl_handle *simple_ctrl_open(void *ctx, const char *host, uint16_t dport,</span><br><span>@@ -122,7 +123,7 @@</span><br><span> fd = osmo_sock_init(AF_INET, SOCK_STREAM, IPPROTO_TCP, host, dport,</span><br><span> OSMO_SOCK_F_CONNECT | OSMO_SOCK_F_NONBLOCK);</span><br><span> if (fd < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- CTRL_ERR(sch->cfg, "connecting socket: %s\n", strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+ CTRL_ERR(sch, "connecting socket: %s\n", strerror(errno));</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span>@@ -131,17 +132,17 @@</span><br><span> FD_SET(fd, &writeset);</span><br><span> rc = select(fd+1, NULL, &writeset, NULL, timeval_from_msec(tout_msec));</span><br><span> if (rc == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- CTRL_ERR(sch->cfg, "timeout during connect\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ CTRL_ERR(sch, "timeout during connect\n");</span><br><span> goto out_close;</span><br><span> }</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- CTRL_ERR(sch->cfg, "error connecting socket: %s\n", strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+ CTRL_ERR(sch, "error connecting socket: %s\n", strerror(errno));</span><br><span> goto out_close;</span><br><span> }</span><br><span> </span><br><span> /* set FD blocking again */</span><br><span> if (ioctl(fd, FIONBIO, (unsigned char *)&off) < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- CTRL_ERR(sch->cfg, "cannot set socket blocking: %s\n", strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+ CTRL_ERR(sch, "cannot set socket blocking: %s\n", strerror(errno));</span><br><span> goto out_close;</span><br><span> }</span><br><span> </span><br><span>@@ -173,10 +174,10 @@</span><br><span> </span><br><span> rc = read_timeout(sch->fd, (uint8_t *) &hh, sizeof(hh), sch->tout_msec);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- CTRL_ERR(sch->cfg, "read(): %d\n", rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ CTRL_ERR(sch, "read(): %d\n", rc);</span><br><span> return NULL;</span><br><span> } else if (rc < sizeof(hh)) {</span><br><span style="color: hsl(0, 100%, 40%);">- CTRL_ERR(sch->cfg, "short read (header)\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ CTRL_ERR(sch, "short read (header)\n");</span><br><span> return NULL;</span><br><span> }</span><br><span> len = ntohs(hh.len);</span><br><span>@@ -190,7 +191,7 @@</span><br><span> resp->l2h = resp->tail;</span><br><span> rc = read(sch->fd, resp->l2h, len);</span><br><span> if (rc < len) {</span><br><span style="color: hsl(0, 100%, 40%);">- CTRL_ERR(sch->cfg, "short read (payload)\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ CTRL_ERR(sch, "short read (payload)\n");</span><br><span> msgb_free(resp);</span><br><span> return NULL;</span><br><span> }</span><br><span>@@ -222,7 +223,7 @@</span><br><span> *tmp = '\0';</span><br><span> return resp;</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- CTRL_ERR(sch->cfg, "unknown IPA message %s\n", msgb_hexdump(resp));</span><br><span style="color: hsl(120, 100%, 40%);">+ CTRL_ERR(sch, "unknown IPA message %s\n", msgb_hexdump(resp));</span><br><span> msgb_free(resp);</span><br><span> }</span><br><span> }</span><br><span>@@ -237,10 +238,10 @@</span><br><span> </span><br><span> rc = write_timeout(sch->fd, msg->data, msg->len, sch->tout_msec);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- CTRL_ERR(sch->cfg, "write(): %d\n", rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ CTRL_ERR(sch, "write(): %d\n", rc);</span><br><span> return rc;</span><br><span> } else if (rc < msg->len) {</span><br><span style="color: hsl(0, 100%, 40%);">- CTRL_ERR(sch->cfg, "short write\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ CTRL_ERR(sch, "short write\n");</span><br><span> msgb_free(msg);</span><br><span> return -1;</span><br><span> } else {</span><br><span>@@ -291,7 +292,7 @@</span><br><span> free(rx_var);</span><br><span> free(rx_val);</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- CTRL_ERR(sch->cfg, "GET(%s) results in '%s'\n", var, (char *)msgb_l2(resp));</span><br><span style="color: hsl(120, 100%, 40%);">+ CTRL_ERR(sch, "GET(%s) results in '%s'\n", var, (char *)msgb_l2(resp));</span><br><span> }</span><br><span> </span><br><span> msgb_free(resp);</span><br><span>@@ -329,7 +330,7 @@</span><br><span> free(rx_var);</span><br><span> }</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- CTRL_ERR(sch->cfg, "SET(%s=%s) results in '%s'\n", var, val, (char *) msgb_l2(resp));</span><br><span style="color: hsl(120, 100%, 40%);">+ CTRL_ERR(sch, "SET(%s=%s) results in '%s'\n", var, val, (char *) msgb_l2(resp));</span><br><span> }</span><br><span> </span><br><span> msgb_free(resp);</span><br><span>diff --git a/src/simple_ctrl.h b/src/simple_ctrl.h</span><br><span>index f35eab1..81a759d 100644</span><br><span>--- a/src/simple_ctrl.h</span><br><span>+++ b/src/simple_ctrl.h</span><br><span>@@ -2,16 +2,6 @@</span><br><span> </span><br><span> #include <stdint.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* a CTRL client config */</span><br><span style="color: hsl(0, 100%, 40%);">-struct ctrl_cfg {</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%);">-};</span><br><span style="color: hsl(0, 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/12761">change 12761</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/12761"/><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: Ie321655a92cdbefbfaa056ac0d583397c83beccb </div>
<div style="display:none"> Gerrit-Change-Number: 12761 </div>
<div style="display:none"> Gerrit-PatchSet: 6 </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: Pau Espin Pedrol <pespin@sysmocom.de> </div>