<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-e1d/+/19056">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
tnt: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">close timeslot socket if read or write returns negative<br><br>If the user application has closed the timeslot socket, we will<br>get error returns from read/write calls, which we must use to clean<br>up the daemon-side state for this timeslot.<br><br>Change-Id: I2e3e5010f36e916b4c8908af91447b3d3661123f<br>---<br>M src/intf_line.c<br>1 file changed, 23 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/intf_line.c b/src/intf_line.c</span><br><span>index 9118232..7b85b4c 100644</span><br><span>--- a/src/intf_line.c</span><br><span>+++ b/src/intf_line.c</span><br><span>@@ -142,9 +142,12 @@</span><br><span> );</span><br><span> </span><br><span> if (rv > 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ int bytes_to_write = rv;</span><br><span> LOGP(DXFR, LOGL_DEBUG, "RX Message: %d %d [ %s]\n",</span><br><span> ts->id, rv, osmo_hexdump(ts->rx_buf, rv));</span><br><span style="color: hsl(0, 100%, 40%);">- write(ts->fd, ts->rx_buf, rv);</span><br><span style="color: hsl(120, 100%, 40%);">+ rv = write(ts->fd, ts->rx_buf, bytes_to_write);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rv < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return rv;</span><br><span> } else if (rv < 0 && ts->id == 4) {</span><br><span> LOGP(DXFR, LOGL_ERROR, "ERR RX: %d %d %d [ %s]\n",</span><br><span> rv,oi,cl, osmo_hexdump(buf, len));</span><br><span>@@ -172,7 +175,8 @@</span><br><span> ts->id, rv, osmo_hexdump(ts->tx_buf, rv));</span><br><span> ts->tx_len = rv; </span><br><span> ts->tx_ofs = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (rv < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return rv;</span><br><span> }</span><br><span> </span><br><span> /* */</span><br><span>@@ -234,9 +238,16 @@</span><br><span> l = _e1_tx_hdlcfs(ts, buf_ts, fts);</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(0);</span><br><span> continue;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (l < 0 && errno != EAGAIN) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DE1D, LOGL_ERROR, "dead socket during read: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+ e1_ts_stop(ts);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (l <= 0)</span><br><span> continue;</span><br><span> </span><br><span>@@ -269,6 +280,7 @@</span><br><span> {</span><br><span> struct e1_ts *ts = &line->ts[tsn];</span><br><span> uint8_t buf_ts[ftr];</span><br><span style="color: hsl(120, 100%, 40%);">+ int rv;</span><br><span> </span><br><span> if (ts->mode == E1_TS_MODE_OFF)</span><br><span> continue;</span><br><span>@@ -278,14 +290,21 @@</span><br><span> </span><br><span> switch (ts->mode) {</span><br><span> case E1_TS_MODE_RAW:</span><br><span style="color: hsl(0, 100%, 40%);">- write(ts->fd, buf_ts, ftr);</span><br><span style="color: hsl(120, 100%, 40%);">+ rv = write(ts->fd, buf_ts, ftr);</span><br><span> break;</span><br><span> case E1_TS_MODE_HDLCFCS:</span><br><span style="color: hsl(0, 100%, 40%);">- _e1_rx_hdlcfs(ts, buf_ts, ftr);</span><br><span style="color: hsl(120, 100%, 40%);">+ rv = _e1_rx_hdlcfs(ts, buf_ts, ftr);</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(0);</span><br><span> continue;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rv < 0 && errno != EAGAIN) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DE1D, LOGL_ERROR, "dead socket during write: %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ strerror(errno));</span><br><span style="color: hsl(120, 100%, 40%);">+ e1_ts_stop(ts);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> }</span><br><span> </span><br><span> return 0;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-e1d/+/19056">change 19056</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/+/19056"/><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: I2e3e5010f36e916b4c8908af91447b3d3661123f </div>
<div style="display:none"> Gerrit-Change-Number: 19056 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Assignee: tnt <tnt@246tNt.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: tnt <tnt@246tNt.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>