<p>Max has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12318">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ctrl: log host/port on errors<br><br>In case of multiple ctrl-client entries in .cfg file it's impossible to<br>see which one is causing particular ctrl error. Fix this by introducing<br>macro wrapper for stderr logging which always show host:port relevant to<br>the error.<br><br>Change-Id: I788d51359965a66c54075a3971aa7824c3bfb0bf<br>Related: SYS#2655<br>---<br>M src/simple_ctrl.c<br>1 file changed, 18 insertions(+), 16 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/18/12318/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/simple_ctrl.c b/src/simple_ctrl.c</span><br><span>index 24d92b9..433f3bf 100644</span><br><span>--- a/src/simple_ctrl.c</span><br><span>+++ b/src/simple_ctrl.c</span><br><span>@@ -37,6 +37,8 @@</span><br><span> </span><br><span> #include "simple_ctrl.h"</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define CTRL_ERR(c, fmt, args...) fprintf(stderr, "CTRL %s:%u error: " fmt "\n", c->remote_host, c->remote_port, ##args)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /***********************************************************************</span><br><span> * blocking I/O with timeout helpers</span><br><span> ***********************************************************************/</span><br><span>@@ -110,7 +112,7 @@</span><br><span> 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 style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "CTRL: error connecting socket: %s\n", strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+ CTRL_ERR(cfg, "connecting socket: %s", strerror(errno));</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span>@@ -119,17 +121,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%);">- fprintf(stderr, "CTRL: timeout during connect\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ CTRL_ERR(cfg, "timeout during connect");</span><br><span> goto out_close;</span><br><span> }</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "CTRL: error connecting socket: %s\n", strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+ CTRL_ERR(cfg, "error connecting socket: %s", 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%);">- fprintf(stderr, "CTRL: cannot set socket blocking: %s\n", strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+ CTRL_ERR(cfg, "cannot set socket blocking: %s", strerror(errno));</span><br><span> goto out_close;</span><br><span> }</span><br><span> </span><br><span>@@ -156,7 +158,7 @@</span><br><span> talloc_free(sch);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct msgb *simple_ipa_receive(struct simple_ctrl_handle *sch)</span><br><span style="color: hsl(120, 100%, 40%);">+static struct msgb *simple_ipa_receive(const struct ctrl_cfg *cfg, struct simple_ctrl_handle *sch)</span><br><span> {</span><br><span> struct ipaccess_head hh;</span><br><span> struct msgb *resp;</span><br><span>@@ -164,10 +166,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%);">- fprintf(stderr, "CTRL: Error during read: %d\n", rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ CTRL_ERR(cfg, "read(): %d", rc);</span><br><span> return NULL;</span><br><span> } else if (rc < sizeof(hh)) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "CTRL: ERROR: short read (header)\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ CTRL_ERR(cfg, "short read (header)");</span><br><span> return NULL;</span><br><span> }</span><br><span> len = ntohs(hh.len);</span><br><span>@@ -181,7 +183,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%);">- fprintf(stderr, "CTRL: ERROR: short read (payload)\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ CTRL_ERR(cfg, "short read (payload)");</span><br><span> msgb_free(resp);</span><br><span> return NULL;</span><br><span> }</span><br><span>@@ -199,7 +201,7 @@</span><br><span> </span><br><span> /* loop until we've received a CTRL message */</span><br><span> while (true) {</span><br><span style="color: hsl(0, 100%, 40%);">- resp = simple_ipa_receive(sch);</span><br><span style="color: hsl(120, 100%, 40%);">+ resp = simple_ipa_receive(cfg, sch);</span><br><span> if (!resp)</span><br><span> return NULL;</span><br><span> </span><br><span>@@ -213,13 +215,13 @@</span><br><span> *tmp = '\0';</span><br><span> return resp;</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "unknown IPA message %s\n", msgb_hexdump(resp));</span><br><span style="color: hsl(120, 100%, 40%);">+ CTRL_ERR(cfg, "unknown IPA message %s", msgb_hexdump(resp));</span><br><span> msgb_free(resp);</span><br><span> }</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int simple_ctrl_send(struct simple_ctrl_handle *sch, struct msgb *msg)</span><br><span style="color: hsl(120, 100%, 40%);">+static int simple_ctrl_send(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>@@ -228,10 +230,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%);">- fprintf(stderr, "CTRL: Error during write: %d\n", rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ CTRL_ERR(cfg, "write(): %d", rc);</span><br><span> return rc;</span><br><span> } else if (rc < msg->len) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "CTRL: ERROR: short write\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ CTRL_ERR(cfg, "short write");</span><br><span> msgb_free(msg);</span><br><span> return -1;</span><br><span> } else {</span><br><span>@@ -244,7 +246,7 @@</span><br><span> {</span><br><span> int rc;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = simple_ctrl_send(sch, msg);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = simple_ctrl_send(cfg, sch, msg);</span><br><span> if (rc < 0)</span><br><span> return NULL;</span><br><span> </span><br><span>@@ -282,7 +284,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%);">- fprintf(stderr, "CTRL: ERROR: GET(%s) results in '%s'\n", var, (char *)msgb_l2(resp));</span><br><span style="color: hsl(120, 100%, 40%);">+ CTRL_ERR(cfg, "GET(%s) results in '%s'", var, (char *)msgb_l2(resp));</span><br><span> }</span><br><span> </span><br><span> msgb_free(resp);</span><br><span>@@ -320,7 +322,7 @@</span><br><span> free(rx_var);</span><br><span> }</span><br><span> } else {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "CTRL: ERROR: SET(%s=%s) results in '%s'\n", var, val, (char *) msgb_l2(resp));</span><br><span style="color: hsl(120, 100%, 40%);">+ CTRL_ERR(cfg, "SET(%s=%s) results in '%s'", var, val, (char *) msgb_l2(resp));</span><br><span> }</span><br><span> </span><br><span> msgb_free(resp);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12318">change 12318</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/12318"/><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: I788d51359965a66c54075a3971aa7824c3bfb0bf </div>
<div style="display:none"> Gerrit-Change-Number: 12318 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@sysmocom.de> </div>