<p>Max has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12761">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Add generic host config and related helpers<br><br>This will be used in follow-up patches as a generic way to store remote<br>host related configuration data by several TCP-based probes.<br><br>Change-Id: Ie321655a92cdbefbfaa056ac0d583397c83beccb<br>---<br>M src/Makefile.am<br>A src/client.c<br>A src/client.h<br>3 files changed, 130 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-sysmon refs/changes/61/12761/1</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..e38b70e 100644</span><br><span>--- a/src/Makefile.am</span><br><span>+++ b/src/Makefile.am</span><br><span>@@ -9,6 +9,7 @@</span><br><span> -Wall \</span><br><span> $(LIBOSMOCORE_CFLAGS) \</span><br><span> $(LIBOSMOGSM_CFLAGS) \</span><br><span style="color: hsl(120, 100%, 40%);">+ $(LIBOSMONETIF_CFLAGS) \</span><br><span> $(NULL)</span><br><span> </span><br><span> AM_LDFLAGS = \</span><br><span>@@ -21,8 +22,8 @@</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(0, 100%, 40%);">-libintern_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS)</span><br><span style="color: hsl(120, 100%, 40%);">+libintern_la_SOURCES = simple_ctrl.c client.c</span><br><span style="color: hsl(120, 100%, 40%);">+libintern_la_LIBADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(LIBOSMONETIF_LIBS)</span><br><span> </span><br><span> osmo_sysmon_CFLAGS = $(LIBMNL_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOPING_CFLAGS) $(AM_CFLAGS)</span><br><span> </span><br><span>@@ -44,6 +45,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..25db885</span><br><span>--- /dev/null</span><br><span>+++ b/src/client.c</span><br><span>@@ -0,0 +1,96 @@</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%);">+#include <osmocom/netif/stream.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%);">+#define MATCH(a, b) (strcmp(a, b) != 0) ? false : true</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 = MATCH(match, cfg->name), m_host = MATCH(match, cfg->remote_host);</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 *make_config(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%);">+void update_name(struct host_cfg *cfg, const char *new_name)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_talloc_replace_string(cfg, (char **)&cfg->name, new_name);</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%);">+void update_host(struct host_cfg *cfg, const char *new_host)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_talloc_replace_string(cfg, (char **)&cfg->remote_host, new_host);</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 *get_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 style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_stream_cli *make_tcp_client(struct host_cfg *cfg)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_stream_cli *cl = osmo_stream_cli_create(cfg);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cl) {</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_stream_cli_set_addr(cl, cfg->remote_host);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_stream_cli_set_port(cl, cfg->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%);">+ return cl;</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..9e69fef</span><br><span>--- /dev/null</span><br><span>+++ b/src/client.h</span><br><span>@@ -0,0 +1,30 @@</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 *make_config(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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void update_name(struct host_cfg *cfg, const char *new_name);</span><br><span style="color: hsl(120, 100%, 40%);">+void update_host(struct host_cfg *cfg, const char *new_host);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_stream_cli *make_tcp_client(struct host_cfg *cfg);</span><br><span style="color: hsl(120, 100%, 40%);">+char *get_authority(void *ctx, const struct host_cfg *cfg);</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: newchange </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: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>