<p>Max has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12317">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ctrl: pass config struct to all simple_ctrl_*()<br><br>Make basic logging-related information available to simple_ctrl_*()<br>functions.<br><br>Change-Id: I783dda27dfc5fd57401d971b2e970ede0efc7b2c<br>Related: SYS#2655<br>---<br>M src/osmo-ctrl-client.c<br>M src/osysmon_ctrl.c<br>M src/simple_ctrl.c<br>M src/simple_ctrl.h<br>4 files changed, 22 insertions(+), 25 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/17/12317/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-ctrl-client.c b/src/osmo-ctrl-client.c</span><br><span>index 83e9b7b..6a196eb 100644</span><br><span>--- a/src/osmo-ctrl-client.c</span><br><span>+++ b/src/osmo-ctrl-client.c</span><br><span>@@ -45,19 +45,18 @@</span><br><span> int main(int argc, char **argv)</span><br><span> {</span><br><span> struct simple_ctrl_handle *sch;</span><br><span style="color: hsl(0, 100%, 40%);">- const char *host;</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t port;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ctrl_cfg cfg = { .name = "osmo-ctrl-client" };</span><br><span> int rc;</span><br><span> </span><br><span> if (argc < 4)</span><br><span> exit_help();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- host = argv[1];</span><br><span style="color: hsl(0, 100%, 40%);">- port = atoi(argv[2]);</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg.remote_host = argv[1];</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg.remote_port = atoi(argv[2]);</span><br><span> </span><br><span> osmo_init_logging2(NULL, &log_info);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- sch = simple_ctrl_open(NULL, host, port, 1000);</span><br><span style="color: hsl(120, 100%, 40%);">+ sch = simple_ctrl_open(NULL, &cfg, 1000);</span><br><span> if (!sch)</span><br><span> exit(1);</span><br><span> </span><br><span>@@ -65,20 +64,20 @@</span><br><span> char *val;</span><br><span> if (argc < 5)</span><br><span> exit_help();</span><br><span style="color: hsl(0, 100%, 40%);">- val = simple_ctrl_get(sch, argv[4]);</span><br><span style="color: hsl(120, 100%, 40%);">+ val = simple_ctrl_get(&cfg, sch, argv[4]);</span><br><span> if (!val)</span><br><span> exit(2);</span><br><span> printf("%s\n", val);</span><br><span> } else if (!strcmp(argv[3], "set")) {</span><br><span> if (argc < 6)</span><br><span> exit_help();</span><br><span style="color: hsl(0, 100%, 40%);">- rc = simple_ctrl_set(sch, argv[4], argv[5]);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = simple_ctrl_set(&cfg, sch, argv[4], argv[5]);</span><br><span> if (rc < 0)</span><br><span> exit(1);</span><br><span> } else if (!strcmp(argv[3], "monitor")) {</span><br><span> simple_ctrl_set_timeout(sch, 0);</span><br><span> while (true) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *msg = simple_ctrl_receive(sch);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *msg = simple_ctrl_receive(&cfg, sch);</span><br><span> if (!msg)</span><br><span> exit(1);</span><br><span> printf("%s", (char *) msgb_l2(msg));</span><br><span>diff --git a/src/osysmon_ctrl.c b/src/osysmon_ctrl.c</span><br><span>index 097e24c..bcab94c 100644</span><br><span>--- a/src/osysmon_ctrl.c</span><br><span>+++ b/src/osysmon_ctrl.c</span><br><span>@@ -268,14 +268,14 @@</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, 1000);</span><br><span> /* abort, if that failed */</span><br><span> if (!cc->sch) {</span><br><span> return -1;</span><br><span> }</span><br><span> </span><br><span> llist_for_each_entry(ccgv, &cc->get_vars, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- char *value = simple_ctrl_get(cc->sch, ccgv->cfg.name);</span><br><span style="color: hsl(120, 100%, 40%);">+ char *value = simple_ctrl_get(cc->cfg, cc->sch, ccgv->cfg.name);</span><br><span> </span><br><span> /* FIXME: Distinguish between ERROR reply and</span><br><span> * connection issues */</span><br><span>diff --git a/src/simple_ctrl.c b/src/simple_ctrl.c</span><br><span>index 2261323..24d92b9 100644</span><br><span>--- a/src/simple_ctrl.c</span><br><span>+++ b/src/simple_ctrl.c</span><br><span>@@ -100,15 +100,14 @@</span><br><span> uint32_t tout_msec;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct simple_ctrl_handle *simple_ctrl_open(void *ctx, const char *host, uint16_t dport,</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t tout_msec)</span><br><span style="color: hsl(120, 100%, 40%);">+struct simple_ctrl_handle *simple_ctrl_open(void *ctx, const struct ctrl_cfg *cfg, uint32_t tout_msec)</span><br><span> {</span><br><span> struct simple_ctrl_handle *sch;</span><br><span> fd_set writeset;</span><br><span> int off = 0;</span><br><span> int rc, fd;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- fd = osmo_sock_init(AF_INET, SOCK_STREAM, IPPROTO_TCP, host, dport,</span><br><span style="color: hsl(120, 100%, 40%);">+ fd = osmo_sock_init(AF_INET, SOCK_STREAM, IPPROTO_TCP, cfg->remote_host, cfg->remote_port,</span><br><span> OSMO_SOCK_F_CONNECT | OSMO_SOCK_F_NONBLOCK);</span><br><span> if (fd < 0) {</span><br><span> fprintf(stderr, "CTRL: error connecting socket: %s\n", strerror(errno));</span><br><span>@@ -191,7 +190,7 @@</span><br><span> return resp;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct msgb *simple_ctrl_receive(struct simple_ctrl_handle *sch)</span><br><span style="color: hsl(120, 100%, 40%);">+struct msgb *simple_ctrl_receive(const struct ctrl_cfg *cfg, struct simple_ctrl_handle *sch)</span><br><span> {</span><br><span> struct msgb *resp;</span><br><span> struct ipaccess_head *ih;</span><br><span>@@ -241,7 +240,7 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct msgb *simple_ctrl_xceive(struct simple_ctrl_handle *sch, struct msgb *msg)</span><br><span style="color: hsl(120, 100%, 40%);">+static struct msgb *simple_ctrl_xceive(const struct ctrl_cfg *cfg, struct simple_ctrl_handle *sch, struct msgb *msg)</span><br><span> {</span><br><span> int rc;</span><br><span> </span><br><span>@@ -250,10 +249,10 @@</span><br><span> return NULL;</span><br><span> </span><br><span> /* FIXME: ignore any TRAP */</span><br><span style="color: hsl(0, 100%, 40%);">- return simple_ctrl_receive(sch);</span><br><span style="color: hsl(120, 100%, 40%);">+ return simple_ctrl_receive(cfg, sch);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-char *simple_ctrl_get(struct simple_ctrl_handle *sch, const char *var)</span><br><span style="color: hsl(120, 100%, 40%);">+char *simple_ctrl_get(const struct ctrl_cfg *cfg, struct simple_ctrl_handle *sch, const char *var)</span><br><span> {</span><br><span> struct msgb *msg = msgb_alloc_headroom(512+8, 8, "CTRL GET");</span><br><span> struct msgb *resp;</span><br><span>@@ -269,7 +268,7 @@</span><br><span> msgb_free(msg);</span><br><span> return NULL;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- resp = simple_ctrl_xceive(sch, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ resp = simple_ctrl_xceive(cfg, sch, msg);</span><br><span> if (!resp)</span><br><span> return NULL;</span><br><span> </span><br><span>@@ -290,7 +289,7 @@</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int simple_ctrl_set(struct simple_ctrl_handle *sch, const char *var, const char *val)</span><br><span style="color: hsl(120, 100%, 40%);">+int simple_ctrl_set(const struct ctrl_cfg *cfg, struct simple_ctrl_handle *sch, const char *var, const char *val)</span><br><span> {</span><br><span> struct msgb *msg = msgb_alloc_headroom(512+8, 8, "CTRL SET");</span><br><span> struct msgb *resp;</span><br><span>@@ -306,7 +305,7 @@</span><br><span> msgb_free(msg);</span><br><span> return -1;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- resp = simple_ctrl_xceive(sch, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ resp = simple_ctrl_xceive(cfg, sch, msg);</span><br><span> if (!resp)</span><br><span> return -1;</span><br><span> </span><br><span>diff --git a/src/simple_ctrl.h b/src/simple_ctrl.h</span><br><span>index f5aa770..b320fb8 100644</span><br><span>--- a/src/simple_ctrl.h</span><br><span>+++ b/src/simple_ctrl.h</span><br><span>@@ -13,13 +13,12 @@</span><br><span> </span><br><span> struct simple_ctrl_handle;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct simple_ctrl_handle *simple_ctrl_open(void *ctx, const char *host, uint16_t dport,</span><br><span style="color: hsl(0, 100%, 40%);">- uint32_t tout_msec);</span><br><span style="color: hsl(120, 100%, 40%);">+struct simple_ctrl_handle *simple_ctrl_open(void *ctx, const struct ctrl_cfg *cfg, uint32_t tout_msec);</span><br><span> void simple_ctrl_close(struct simple_ctrl_handle *sch);</span><br><span> </span><br><span> void simple_ctrl_set_timeout(struct simple_ctrl_handle *sch, uint32_t tout_msec);</span><br><span style="color: hsl(0, 100%, 40%);">-struct msgb *simple_ctrl_receive(struct simple_ctrl_handle *sch);</span><br><span style="color: hsl(120, 100%, 40%);">+struct msgb *simple_ctrl_receive(const struct ctrl_cfg *cfg, struct simple_ctrl_handle *sch);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-char *simple_ctrl_get(struct simple_ctrl_handle *sch, const char *var);</span><br><span style="color: hsl(0, 100%, 40%);">-int simple_ctrl_set(struct simple_ctrl_handle *sch, const char *var, const char *val);</span><br><span style="color: hsl(120, 100%, 40%);">+char *simple_ctrl_get(const struct ctrl_cfg *cfg, struct simple_ctrl_handle *sch, const char *var);</span><br><span style="color: hsl(120, 100%, 40%);">+int simple_ctrl_set(const struct ctrl_cfg *cfg, struct simple_ctrl_handle *sch, const char *var, const char *val);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12317">change 12317</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/12317"/><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: I783dda27dfc5fd57401d971b2e970ede0efc7b2c </div>
<div style="display:none"> Gerrit-Change-Number: 12317 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>