retronetworking
/
osmo-e1d
mirror of https://gerrit.osmocom.org/osmo-e1d
13
0
Fork 0
Code Issues Releases Wiki Activity

close timeslot socket if read or write returns negative 

If the user application has closed the timeslot socket, we will
get error returns from read/write calls, which we must use to clean
up the daemon-side state for this timeslot.

Change-Id: I2e3e5010f36e916b4c8908af91447b3d3661123f
This commit is contained in:
Harald Welte 2020-06-29 21:24:35 +02:00
parent 54e9773d34
commit c98dbc2ba3
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/intf_line.c
View File

@ -142,9 +142,12 @@ _e1_rx_hdlcfs(struct e1_ts *ts, uint8_t *buf, int len)
); );
if (rv > 0) { if (rv > 0) {
int bytes_to_write = rv;
LOGP(DXFR, LOGL_DEBUG, "RX Message: %d %d [ %s]\n", LOGP(DXFR, LOGL_DEBUG, "RX Message: %d %d [ %s]\n",
ts->id, rv, osmo_hexdump(ts->rx_buf, rv)); ts->id, rv, osmo_hexdump(ts->rx_buf, rv));
write(ts->fd, ts->rx_buf, rv); rv = write(ts->fd, ts->rx_buf, bytes_to_write);
if (rv < 0)
return rv;
} else if (rv < 0 && ts->id == 4) { } else if (rv < 0 && ts->id == 4) {
LOGP(DXFR, LOGL_ERROR, "ERR RX: %d %d %d [ %s]\n", LOGP(DXFR, LOGL_ERROR, "ERR RX: %d %d %d [ %s]\n",
rv,oi,cl, osmo_hexdump(buf, len)); rv,oi,cl, osmo_hexdump(buf, len));
@ -172,7 +175,8 @@ _e1_tx_hdlcfs(struct e1_ts *ts, uint8_t *buf, int len)
ts->id, rv, osmo_hexdump(ts->tx_buf, rv)); ts->id, rv, osmo_hexdump(ts->tx_buf, rv));
ts->tx_len = rv; ts->tx_len = rv;
ts->tx_ofs = 0; ts->tx_ofs = 0;
} } else if (rv < 0)
return rv;
} }
/* */ /* */
@ -234,9 +238,16 @@ e1_line_mux_out(struct e1_line *line, uint8_t *buf, int fts)
l = _e1_tx_hdlcfs(ts, buf_ts, fts); l = _e1_tx_hdlcfs(ts, buf_ts, fts);
break; break;
default: default:
OSMO_ASSERT(0);
continue; continue;
} }
if (l < 0 && errno != EAGAIN) {
LOGP(DE1D, LOGL_ERROR, "dead socket during read: %s\n",
strerror(errno));
e1_ts_stop(ts);
}
if (l <= 0) if (l <= 0)
continue; continue;
@ -269,6 +280,7 @@ e1_line_demux_in(struct e1_line *line, const uint8_t *buf, int size)
{ {
struct e1_ts *ts = &line->ts[tsn]; struct e1_ts *ts = &line->ts[tsn];
uint8_t buf_ts[ftr]; uint8_t buf_ts[ftr];
int rv;
if (ts->mode == E1_TS_MODE_OFF) if (ts->mode == E1_TS_MODE_OFF)
continue; continue;
@ -278,14 +290,21 @@ e1_line_demux_in(struct e1_line *line, const uint8_t *buf, int size)
switch (ts->mode) { switch (ts->mode) {
case E1_TS_MODE_RAW: case E1_TS_MODE_RAW:
write(ts->fd, buf_ts, ftr); rv = write(ts->fd, buf_ts, ftr);
break; break;
case E1_TS_MODE_HDLCFCS: case E1_TS_MODE_HDLCFCS:
_e1_rx_hdlcfs(ts, buf_ts, ftr); rv = _e1_rx_hdlcfs(ts, buf_ts, ftr);
break; break;
default: default:
OSMO_ASSERT(0);
continue; continue;
} }
if (rv < 0 && errno != EAGAIN) {
LOGP(DE1D, LOGL_ERROR, "dead socket during write: %s\n",
strerror(errno));
e1_ts_stop(ts);
}
} }
return 0; return 0;