<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-e1d/+/19058">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">extend logging (log more noteworthy events)<br><br>Let's log some more events that might happen.<br><br>Change-Id: I37fd290f0f0621fbf6e20e33fa709efc14df94c7<br>---<br>M src/ctl.c<br>M src/intf_line.c<br>2 files changed, 26 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-e1d refs/changes/58/19058/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/ctl.c b/src/ctl.c</span><br><span>index 1fa5d84..b29e990 100644</span><br><span>--- a/src/ctl.c</span><br><span>+++ b/src/ctl.c</span><br><span>@@ -31,11 +31,13 @@</span><br><span> </span><br><span> #include <osmocom/core/isdnhdlc.h></span><br><span> #include <osmocom/core/msgb.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/logging.h></span><br><span> </span><br><span> #include <osmocom/e1d/proto.h></span><br><span> #include <osmocom/e1d/proto_srv.h></span><br><span> </span><br><span> #include "e1d.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "log.h"</span><br><span> </span><br><span> </span><br><span> struct e1_intf *</span><br><span>@@ -94,6 +96,8 @@</span><br><span> void</span><br><span> e1_ts_stop(struct e1_ts *ts)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPTS(ts, DE1D, LOGL_INFO, "Stopping\n");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> ts->mode = E1_TS_MODE_OFF;</span><br><span> </span><br><span> if (ts->fd >= 0) {</span><br><span>@@ -107,6 +111,8 @@</span><br><span> {</span><br><span> int ret, sd[2];</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPTS(ts, DE1D, LOGL_INFO, "Starting in mode %u\n", mode);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> ret = socketpair(AF_UNIX, SOCK_SEQPACKET, 0, sd);</span><br><span> if (ret < 0)</span><br><span> return ret;</span><br><span>diff --git a/src/intf_line.c b/src/intf_line.c</span><br><span>index 335fb83..7127617 100644</span><br><span>--- a/src/intf_line.c</span><br><span>+++ b/src/intf_line.c</span><br><span>@@ -64,6 +64,8 @@</span><br><span> </span><br><span> llist_add_tail(&intf->list, &e1d->interfaces);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPIF(intf, DE1D, LOGL_NOTICE, "Created\n");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return intf;</span><br><span> }</span><br><span> </span><br><span>@@ -72,6 +74,8 @@</span><br><span> {</span><br><span> struct e1_line *line, *line2;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPIF(intf, DE1D, LOGL_NOTICE, "Destroying\n");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* destroy all lines */</span><br><span> llist_for_each_entry_safe(line, line2, &intf->lines, list)</span><br><span> e1_line_destroy(line);</span><br><span>@@ -107,12 +111,16 @@</span><br><span> </span><br><span> llist_add_tail(&line->list, &intf->lines);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLI(line, DE1D, LOGL_NOTICE, "Created\n");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return line;</span><br><span> }</span><br><span> </span><br><span> void</span><br><span> e1_line_destroy(struct e1_line *line)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLI(line, DE1D, LOGL_NOTICE, "Destroying\n");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* close all [peer] file descriptors */</span><br><span> for (int i=0; i<32; i++)</span><br><span> e1_ts_stop(&line->ts[i]);</span><br><span>@@ -147,6 +155,8 @@</span><br><span> rv, osmo_hexdump(ts->rx_buf, rv));</span><br><span> rv = write(ts->fd, ts->rx_buf, bytes_to_write);</span><br><span> if (rv < 0 && errno != EAGAIN) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPTS(ts, DE1D, LOGL_ERROR, "dead socket during write: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ strerror(errno));</span><br><span> e1_ts_stop(ts);</span><br><span> return -1;</span><br><span> }</span><br><span>@@ -178,6 +188,8 @@</span><br><span> ts->tx_len = rv; </span><br><span> ts->tx_ofs = 0;</span><br><span> } else if (rv < 0 && errno != EAGAIN) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPTS(ts, DE1D, LOGL_ERROR, "dead socket during read: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ strerror(errno));</span><br><span> e1_ts_stop(ts);</span><br><span> return -1;</span><br><span> }</span><br><span>@@ -237,8 +249,11 @@</span><br><span> switch (ts->mode) {</span><br><span> case E1_TS_MODE_RAW:</span><br><span> l = read(ts->fd, buf_ts, fts);</span><br><span style="color: hsl(0, 100%, 40%);">- if (l < 0 && errno != EAGAIN)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (l < 0 && errno != EAGAIN) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPTS(ts, DE1D, LOGL_ERROR, "dead socket during read: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ strerror(errno));</span><br><span> e1_ts_stop(ts);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> break;</span><br><span> case E1_TS_MODE_HDLCFCS:</span><br><span> l = _e1_tx_hdlcfs(ts, buf_ts, fts);</span><br><span>@@ -290,8 +305,11 @@</span><br><span> switch (ts->mode) {</span><br><span> case E1_TS_MODE_RAW:</span><br><span> rv = write(ts->fd, buf_ts, ftr);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rv < 0 && errno != EAGAIN)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rv < 0 && errno != EAGAIN) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPTS(ts, DE1D, LOGL_ERROR, "dead socket during write: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ strerror(errno));</span><br><span> e1_ts_stop(ts);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> break;</span><br><span> case E1_TS_MODE_HDLCFCS:</span><br><span> _e1_rx_hdlcfs(ts, buf_ts, ftr);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-e1d/+/19058">change 19058</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/c/osmo-e1d/+/19058"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-e1d </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I37fd290f0f0621fbf6e20e33fa709efc14df94c7 </div>
<div style="display:none"> Gerrit-Change-Number: 19058 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>