<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-e1d/+/21801">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">e1_line.c: Split multiplex + demultiplex into separate mux_demux.c<br><br>The remaining intf_line.c really only manages the data structures.<br><br>This is useful for building other programs than osmo-e1d, such as<br>an upcoming E1 test utility called osmo-e1gen which will also use<br>the USB interface and icE1usb hardware, but not any of the mux/demux/ctl<br>code.<br><br>Change-Id: I1ceaea85a15e2fae1d2e041173be9d758c6d0b78<br>---<br>M src/Makefile.am<br>M src/intf_line.c<br>A src/mux_demux.c<br>3 files changed, 378 insertions(+), 334 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/01/21801/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/Makefile.am b/src/Makefile.am</span><br><span>index d9d8236..09cf0e4 100644</span><br><span>--- a/src/Makefile.am</span><br><span>+++ b/src/Makefile.am</span><br><span>@@ -35,6 +35,7 @@</span><br><span> ctl.c \</span><br><span> intf_line.c \</span><br><span> log.c \</span><br><span style="color: hsl(120, 100%, 40%);">+ mux_demux.c \</span><br><span> osmo-e1d.c \</span><br><span> usb.c \</span><br><span> vpair.c \</span><br><span>diff --git a/src/intf_line.c b/src/intf_line.c</span><br><span>index 2ed9e66..3aebf9c 100644</span><br><span>--- a/src/intf_line.c</span><br><span>+++ b/src/intf_line.c</span><br><span>@@ -166,338 +166,4 @@</span><br><span> }</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-// ---------------------------------------------------------------------------</span><br><span style="color: hsl(0, 100%, 40%);">-// data transfer</span><br><span style="color: hsl(0, 100%, 40%);">-// ---------------------------------------------------------------------------</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int</span><br><span style="color: hsl(0, 100%, 40%);">-_e1_rx_hdlcfs(struct e1_ts *ts, const uint8_t *buf, int len)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int rv, cl, oi;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- oi = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- while (oi < len) {</span><br><span style="color: hsl(0, 100%, 40%);">- rv = osmo_isdnhdlc_decode(&ts->hdlc.rx,</span><br><span style="color: hsl(0, 100%, 40%);">- &buf[oi], len-oi, &cl,</span><br><span style="color: hsl(0, 100%, 40%);">- ts->hdlc.rx_buf, sizeof(ts->hdlc.rx_buf)</span><br><span style="color: hsl(0, 100%, 40%);">- );</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (rv > 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- int bytes_to_write = rv;</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPTS(ts, DXFR, LOGL_DEBUG, "RX Message: %d [ %s]\n",</span><br><span style="color: hsl(0, 100%, 40%);">- rv, osmo_hexdump(ts->hdlc.rx_buf, rv));</span><br><span style="color: hsl(0, 100%, 40%);">- rv = write(ts->fd, ts->hdlc.rx_buf, bytes_to_write);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rv < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- return rv;</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (rv < 0 && ts->id == 4) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPTS(ts, DXFR, LOGL_ERROR, "ERR RX: %d %d %d [ %s]\n",</span><br><span style="color: hsl(0, 100%, 40%);">- rv,oi,cl, osmo_hexdump(buf, len));</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- oi += cl;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return len;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static int</span><br><span style="color: hsl(0, 100%, 40%);">-_e1_tx_hdlcfs(struct e1_ts *ts, uint8_t *buf, int len)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int rv, oo, cl;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- oo = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- while (oo < len) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* Pending message ? */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ts->hdlc.tx_len) {</span><br><span style="color: hsl(0, 100%, 40%);">- rv = recv(ts->fd, ts->hdlc.tx_buf, sizeof(ts->hdlc.tx_buf), MSG_TRUNC);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rv > 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (rv > sizeof(ts->hdlc.tx_buf)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPTS(ts, DXFR, LOGL_ERROR, "Truncated message: Client tried to "</span><br><span style="color: hsl(0, 100%, 40%);">- "send %d bytes but our buffer is limited to %lu\n",</span><br><span style="color: hsl(0, 100%, 40%);">- rv, sizeof(ts->hdlc.tx_buf));</span><br><span style="color: hsl(0, 100%, 40%);">- rv = sizeof(ts->hdlc.tx_buf);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPTS(ts, DXFR, LOGL_DEBUG, "TX Message: %d [ %s]\n",</span><br><span style="color: hsl(0, 100%, 40%);">- rv, osmo_hexdump(ts->hdlc.tx_buf, rv));</span><br><span style="color: hsl(0, 100%, 40%);">- ts->hdlc.tx_len = rv;</span><br><span style="color: hsl(0, 100%, 40%);">- ts->hdlc.tx_ofs = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (rv < 0 && errno != EAGAIN)</span><br><span style="color: hsl(0, 100%, 40%);">- return rv;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* */</span><br><span style="color: hsl(0, 100%, 40%);">- rv = osmo_isdnhdlc_encode(&ts->hdlc.tx,</span><br><span style="color: hsl(0, 100%, 40%);">- &ts->hdlc.tx_buf[ts->hdlc.tx_ofs], ts->hdlc.tx_len - ts->hdlc.tx_ofs, &cl,</span><br><span style="color: hsl(0, 100%, 40%);">- &buf[oo], len - oo</span><br><span style="color: hsl(0, 100%, 40%);">- );</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (rv < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPTS(ts, DXFR, LOGL_ERROR, "ERR TX: %d\n", rv);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (ts->hdlc.tx_ofs < ts->hdlc.tx_len) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPTS(ts, DXFR, LOGL_DEBUG, "TX chunk %d/%d %d [ %s]\n",</span><br><span style="color: hsl(0, 100%, 40%);">- ts->hdlc.tx_ofs, ts->hdlc.tx_len, cl, osmo_hexdump(&buf[ts->hdlc.tx_ofs], rv));</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (rv > 0)</span><br><span style="color: hsl(0, 100%, 40%);">- oo += rv;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ts->hdlc.tx_ofs += cl;</span><br><span style="color: hsl(0, 100%, 40%);">- if (ts->hdlc.tx_ofs >= ts->hdlc.tx_len) {</span><br><span style="color: hsl(0, 100%, 40%);">- ts->hdlc.tx_len = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- ts->hdlc.tx_ofs = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return len;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* read from a timeslot-FD (direction application -> hardware) */</span><br><span style="color: hsl(0, 100%, 40%);">-static int</span><br><span style="color: hsl(0, 100%, 40%);">-_e1_ts_read(struct e1_ts *ts, uint8_t *buf, size_t len)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int l;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch (ts->mode) {</span><br><span style="color: hsl(0, 100%, 40%);">- case E1_TS_MODE_RAW:</span><br><span style="color: hsl(0, 100%, 40%);">- l = read(ts->fd, buf, len);</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: handle underflow */</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case E1_TS_MODE_HDLCFCS:</span><br><span style="color: hsl(0, 100%, 40%);">- l = _e1_tx_hdlcfs(ts, buf, len);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(0);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (l < 0 && errno != EAGAIN) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPTS(ts, DE1D, LOGL_ERROR, "dead socket during read: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- strerror(errno));</span><br><span style="color: hsl(0, 100%, 40%);">- e1_ts_stop(ts);</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (l < len) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPTS(ts, DE1D, LOGL_NOTICE, "TS read underflow: We had %zu bytes to read, "</span><br><span style="color: hsl(0, 100%, 40%);">- "but socket returned only %d\n", len, l);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return l;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static void</span><br><span style="color: hsl(0, 100%, 40%);">-_e1_line_mux_out_channelized(struct e1_line *line, uint8_t *buf, int fts)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(line->mode == E1_LINE_MODE_CHANNELIZED);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Scan timeslots */</span><br><span style="color: hsl(0, 100%, 40%);">- for (int tsn=1; tsn<32; tsn++)</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- struct e1_ts *ts = &line->ts[tsn];</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t buf_ts[fts];</span><br><span style="color: hsl(0, 100%, 40%);">- int l;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (ts->mode == E1_TS_MODE_OFF)</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- l = _e1_ts_read(ts, buf_ts, sizeof(buf_ts));</span><br><span style="color: hsl(0, 100%, 40%);">- if (l <= 0)</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (int i=0; i<l; i++)</span><br><span style="color: hsl(0, 100%, 40%);">- buf[tsn+(i*32)] = buf_ts[i];</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static void</span><br><span style="color: hsl(0, 100%, 40%);">-_e1_line_mux_out_superchan(struct e1_line *line, uint8_t *buf, int fts)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct e1_ts *ts = &line->superchan;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t sc_buf[31*fts];</span><br><span style="color: hsl(0, 100%, 40%);">- int l;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(line->mode == E1_LINE_MODE_SUPERCHANNEL);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (ts->mode == E1_TS_MODE_OFF)</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* first pull all we need out of the source */</span><br><span style="color: hsl(0, 100%, 40%);">- l = _e1_ts_read(ts, sc_buf, sizeof(sc_buf));</span><br><span style="color: hsl(0, 100%, 40%);">- if (l <= 0)</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* then form E1 frames from it, sprinkling in some gaps for TS0 */</span><br><span style="color: hsl(0, 100%, 40%);">- for (int i = 0; i < fts; i++)</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(buf + i*32 + 1, sc_buf + i*31, 31);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/*! generate (multiplex) output data for the specified e1_line</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] line E1 line for which to genrate output data</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] buf caller-allocated output buffer for multiplexed data</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] fts number of E1 frames (32 bytes each) to generate</span><br><span style="color: hsl(0, 100%, 40%);">- * \return number of bytes written to buf */</span><br><span style="color: hsl(0, 100%, 40%);">-int</span><br><span style="color: hsl(0, 100%, 40%);">-e1_line_mux_out(struct e1_line *line, uint8_t *buf, int fts)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int tsz;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Prepare */</span><br><span style="color: hsl(0, 100%, 40%);">- tsz = 32 * fts;</span><br><span style="color: hsl(0, 100%, 40%);">- memset(buf, 0xff, tsz);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch (line->mode) {</span><br><span style="color: hsl(0, 100%, 40%);">- case E1_LINE_MODE_CHANNELIZED:</span><br><span style="color: hsl(0, 100%, 40%);">- _e1_line_mux_out_channelized(line, buf, fts);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case E1_LINE_MODE_SUPERCHANNEL:</span><br><span style="color: hsl(0, 100%, 40%);">- _e1_line_mux_out_superchan(line, buf, fts);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(0);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return tsz;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* append data to the per-timeslot buffer; flush to socket every time buffer is full */</span><br><span style="color: hsl(0, 100%, 40%);">-static int</span><br><span style="color: hsl(0, 100%, 40%);">-_e1_rx_raw(struct e1_ts *ts, const uint8_t *buf, unsigned int len)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int appended = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- int rv;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(ts->mode == E1_TS_MODE_RAW);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* we don't keep a larger set of buffers but simply assume that whenever</span><br><span style="color: hsl(0, 100%, 40%);">- * we received one full chunk/buffer size, we are able to push the data</span><br><span style="color: hsl(0, 100%, 40%);">- * into the underlying unix domain socket. Kernel socket buffering should</span><br><span style="color: hsl(0, 100%, 40%);">- * be far sufficient in terms of buffering capacity of voice data (which</span><br><span style="color: hsl(0, 100%, 40%);">- * is typically consumed reasonably low latency and hence buffer size) */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- while (appended < len) {</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int ts_buf_tailroom = ts->raw.rx_buf_size - ts->raw.rx_buf_used;</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int chunk_len;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* determine size of chunk we can write at this point */</span><br><span style="color: hsl(0, 100%, 40%);">- chunk_len = len - appended;</span><br><span style="color: hsl(0, 100%, 40%);">- if (chunk_len > ts_buf_tailroom)</span><br><span style="color: hsl(0, 100%, 40%);">- chunk_len = ts_buf_tailroom;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* actually copy the chunk */</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(ts->raw.rx_buf + ts->raw.rx_buf_used, buf + appended, chunk_len);</span><br><span style="color: hsl(0, 100%, 40%);">- ts->raw.rx_buf_used += chunk_len;</span><br><span style="color: hsl(0, 100%, 40%);">- appended += chunk_len;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* if ts_buf is full: flush + rewind */</span><br><span style="color: hsl(0, 100%, 40%);">- if (ts->raw.rx_buf_used >= ts->raw.rx_buf_size) {</span><br><span style="color: hsl(0, 100%, 40%);">- rv = write(ts->fd, ts->raw.rx_buf, ts->raw.rx_buf_size);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rv < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- return rv;</span><br><span style="color: hsl(0, 100%, 40%);">- /* FIXME: count overflows */</span><br><span style="color: hsl(0, 100%, 40%);">- ts->raw.rx_buf_used = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return appended;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* write data to a timeslot (hardware -> application direction) */</span><br><span style="color: hsl(0, 100%, 40%);">-static int</span><br><span style="color: hsl(0, 100%, 40%);">-_e1_ts_write(struct e1_ts *ts, const uint8_t *buf, size_t len)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int rv;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch (ts->mode) {</span><br><span style="color: hsl(0, 100%, 40%);">- case E1_TS_MODE_RAW:</span><br><span style="color: hsl(0, 100%, 40%);">- rv = _e1_rx_raw(ts, buf, len);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case E1_TS_MODE_HDLCFCS:</span><br><span style="color: hsl(0, 100%, 40%);">- rv = _e1_rx_hdlcfs(ts, buf, len);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(0);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (rv < 0 && errno != EAGAIN) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPTS(ts, DE1D, LOGL_ERROR, "dead socket during write: %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- strerror(errno));</span><br><span style="color: hsl(0, 100%, 40%);">- e1_ts_stop(ts);</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (rv < len) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPTS(ts, DE1D, LOGL_NOTICE, "TS write overflow: We had %zu bytes to send, "</span><br><span style="color: hsl(0, 100%, 40%);">- "but write returned only %d\n", len, rv);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return rv;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static int</span><br><span style="color: hsl(0, 100%, 40%);">-_e1_line_demux_in_superchan(struct e1_line *line, const uint8_t *buf, int ftr)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct e1_ts *ts = &line->superchan;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t sc_buf[ftr*31];</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(line->mode == E1_LINE_MODE_SUPERCHANNEL);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (ts->mode == E1_TS_MODE_OFF)</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* first gather input data from multiple frames*/</span><br><span style="color: hsl(0, 100%, 40%);">- for (int i = 0; i < ftr; i++)</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(sc_buf + (i*31), buf + (i*32) + 1, 31);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* then dispatch to appropriate action */</span><br><span style="color: hsl(0, 100%, 40%);">- _e1_ts_write(ts, sc_buf, ftr*31);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static int</span><br><span style="color: hsl(0, 100%, 40%);">-_e1_line_demux_in_channelized(struct e1_line *line, const uint8_t *buf, int ftr)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(line->mode == E1_LINE_MODE_CHANNELIZED);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (int tsn=1; tsn<32; tsn++)</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- struct e1_ts *ts = &line->ts[tsn];</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t buf_ts[ftr];</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (ts->mode == E1_TS_MODE_OFF)</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (int i=0; i<ftr; i++)</span><br><span style="color: hsl(0, 100%, 40%);">- buf_ts[i] = buf[tsn+(i*32)];</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- _e1_ts_write(ts, buf_ts, ftr);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/*! de-multiplex E1 line data to the individual timeslots.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] line E1 line on which we operate.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] buf buffer containing multiplexed frame-aligned E1 data.</span><br><span style="color: hsl(0, 100%, 40%);">- * \param[in] size size of 'buf' in octets; assumed to be multiple of E1 frame size (32).</span><br><span style="color: hsl(0, 100%, 40%);">- * \returns 0 on success; negative on error */</span><br><span style="color: hsl(0, 100%, 40%);">-int</span><br><span style="color: hsl(0, 100%, 40%);">-e1_line_demux_in(struct e1_line *line, const uint8_t *buf, int size)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int ftr;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (size <= 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPLI(line, DXFR, LOGL_ERROR, "IN ERROR: %d\n", size);</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ftr = size / 32;</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(size % 32 == 0);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch (line->mode) {</span><br><span style="color: hsl(0, 100%, 40%);">- case E1_LINE_MODE_CHANNELIZED:</span><br><span style="color: hsl(0, 100%, 40%);">- return _e1_line_demux_in_channelized(line, buf, ftr);</span><br><span style="color: hsl(0, 100%, 40%);">- case E1_LINE_MODE_SUPERCHANNEL:</span><br><span style="color: hsl(0, 100%, 40%);">- return _e1_line_demux_in_superchan(line, buf, ftr);</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(0);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span>diff --git a/src/mux_demux.c b/src/mux_demux.c</span><br><span>new file mode 100644</span><br><span>index 0000000..ed7bf3b</span><br><span>--- /dev/null</span><br><span>+++ b/src/mux_demux.c</span><br><span>@@ -0,0 +1,377 @@</span><br><span style="color: hsl(120, 100%, 40%);">+/*</span><br><span style="color: hsl(120, 100%, 40%);">+ * mux_demux.c</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * (C) 2019 by Sylvain Munaut <tnt@246tNt.com></span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * All Rights Reserved</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * SPDX-License-Identifier: GPL-2.0+</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+ * it under the terms of the GNU General Public License as published by</span><br><span style="color: hsl(120, 100%, 40%);">+ * the Free Software Foundation; either version 2 of the License, or</span><br><span style="color: hsl(120, 100%, 40%);">+ * (at your option) any later version.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+ * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+ * GNU General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * You should have received a copy of the GNU General Public License along</span><br><span style="color: hsl(120, 100%, 40%);">+ * with this program; if not, write to the Free Software Foundation, Inc.,</span><br><span style="color: hsl(120, 100%, 40%);">+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <errno.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <unistd.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <stdint.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <string.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <sys/types.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <sys/socket.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <talloc.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/isdnhdlc.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/utils.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/stats.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/rate_ctr.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/e1d/proto.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include "e1d.h"</span><br><span style="color: hsl(120, 100%, 40%);">+#include "log.h"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+// ---------------------------------------------------------------------------</span><br><span style="color: hsl(120, 100%, 40%);">+// data transfer</span><br><span style="color: hsl(120, 100%, 40%);">+// ---------------------------------------------------------------------------</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static int</span><br><span style="color: hsl(120, 100%, 40%);">+_e1_rx_hdlcfs(struct e1_ts *ts, const uint8_t *buf, int len)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int rv, cl, oi;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ oi = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ while (oi < len) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rv = osmo_isdnhdlc_decode(&ts->hdlc.rx,</span><br><span style="color: hsl(120, 100%, 40%);">+ &buf[oi], len-oi, &cl,</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->hdlc.rx_buf, sizeof(ts->hdlc.rx_buf)</span><br><span style="color: hsl(120, 100%, 40%);">+ );</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rv > 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ int bytes_to_write = rv;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPTS(ts, DXFR, LOGL_DEBUG, "RX Message: %d [ %s]\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ rv, osmo_hexdump(ts->hdlc.rx_buf, rv));</span><br><span style="color: hsl(120, 100%, 40%);">+ rv = write(ts->fd, ts->hdlc.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 style="color: hsl(120, 100%, 40%);">+ } else if (rv < 0 && ts->id == 4) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPTS(ts, DXFR, LOGL_ERROR, "ERR RX: %d %d %d [ %s]\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ rv,oi,cl, osmo_hexdump(buf, len));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ oi += cl;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return len;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static int</span><br><span style="color: hsl(120, 100%, 40%);">+_e1_tx_hdlcfs(struct e1_ts *ts, uint8_t *buf, int len)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int rv, oo, cl;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ oo = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ while (oo < len) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Pending message ? */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ts->hdlc.tx_len) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rv = recv(ts->fd, ts->hdlc.tx_buf, sizeof(ts->hdlc.tx_buf), MSG_TRUNC);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rv > 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rv > sizeof(ts->hdlc.tx_buf)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPTS(ts, DXFR, LOGL_ERROR, "Truncated message: Client tried to "</span><br><span style="color: hsl(120, 100%, 40%);">+ "send %d bytes but our buffer is limited to %lu\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ rv, sizeof(ts->hdlc.tx_buf));</span><br><span style="color: hsl(120, 100%, 40%);">+ rv = sizeof(ts->hdlc.tx_buf);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPTS(ts, DXFR, LOGL_DEBUG, "TX Message: %d [ %s]\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ rv, osmo_hexdump(ts->hdlc.tx_buf, rv));</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->hdlc.tx_len = rv;</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->hdlc.tx_ofs = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (rv < 0 && errno != EAGAIN)</span><br><span style="color: hsl(120, 100%, 40%);">+ return rv;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* */</span><br><span style="color: hsl(120, 100%, 40%);">+ rv = osmo_isdnhdlc_encode(&ts->hdlc.tx,</span><br><span style="color: hsl(120, 100%, 40%);">+ &ts->hdlc.tx_buf[ts->hdlc.tx_ofs], ts->hdlc.tx_len - ts->hdlc.tx_ofs, &cl,</span><br><span style="color: hsl(120, 100%, 40%);">+ &buf[oo], len - oo</span><br><span style="color: hsl(120, 100%, 40%);">+ );</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rv < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPTS(ts, DXFR, LOGL_ERROR, "ERR TX: %d\n", rv);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ts->hdlc.tx_ofs < ts->hdlc.tx_len) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPTS(ts, DXFR, LOGL_DEBUG, "TX chunk %d/%d %d [ %s]\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->hdlc.tx_ofs, ts->hdlc.tx_len, cl, osmo_hexdump(&buf[ts->hdlc.tx_ofs], rv));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rv > 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ oo += rv;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->hdlc.tx_ofs += cl;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ts->hdlc.tx_ofs >= ts->hdlc.tx_len) {</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->hdlc.tx_len = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->hdlc.tx_ofs = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return len;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* read from a timeslot-FD (direction application -> hardware) */</span><br><span style="color: hsl(120, 100%, 40%);">+static int</span><br><span style="color: hsl(120, 100%, 40%);">+_e1_ts_read(struct e1_ts *ts, uint8_t *buf, size_t len)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int l;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (ts->mode) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case E1_TS_MODE_RAW:</span><br><span style="color: hsl(120, 100%, 40%);">+ l = read(ts->fd, buf, len);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* FIXME: handle underflow */</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case E1_TS_MODE_HDLCFCS:</span><br><span style="color: hsl(120, 100%, 40%);">+ l = _e1_tx_hdlcfs(ts, buf, len);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</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 style="color: hsl(120, 100%, 40%);">+ e1_ts_stop(ts);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (l < len) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPTS(ts, DE1D, LOGL_NOTICE, "TS read underflow: We had %zu bytes to read, "</span><br><span style="color: hsl(120, 100%, 40%);">+ "but socket returned only %d\n", len, l);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return l;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void</span><br><span style="color: hsl(120, 100%, 40%);">+_e1_line_mux_out_channelized(struct e1_line *line, uint8_t *buf, int fts)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(line->mode == E1_LINE_MODE_CHANNELIZED);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Scan timeslots */</span><br><span style="color: hsl(120, 100%, 40%);">+ for (int tsn=1; tsn<32; tsn++)</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct e1_ts *ts = &line->ts[tsn];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t buf_ts[fts];</span><br><span style="color: hsl(120, 100%, 40%);">+ int l;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ts->mode == E1_TS_MODE_OFF)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ l = _e1_ts_read(ts, buf_ts, sizeof(buf_ts));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (l <= 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (int i=0; i<l; i++)</span><br><span style="color: hsl(120, 100%, 40%);">+ buf[tsn+(i*32)] = buf_ts[i];</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void</span><br><span style="color: hsl(120, 100%, 40%);">+_e1_line_mux_out_superchan(struct e1_line *line, uint8_t *buf, int fts)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct e1_ts *ts = &line->superchan;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t sc_buf[31*fts];</span><br><span style="color: hsl(120, 100%, 40%);">+ int l;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(line->mode == E1_LINE_MODE_SUPERCHANNEL);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ts->mode == E1_TS_MODE_OFF)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* first pull all we need out of the source */</span><br><span style="color: hsl(120, 100%, 40%);">+ l = _e1_ts_read(ts, sc_buf, sizeof(sc_buf));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (l <= 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* then form E1 frames from it, sprinkling in some gaps for TS0 */</span><br><span style="color: hsl(120, 100%, 40%);">+ for (int i = 0; i < fts; i++)</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(buf + i*32 + 1, sc_buf + i*31, 31);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! generate (multiplex) output data for the specified e1_line</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] line E1 line for which to genrate output data</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] buf caller-allocated output buffer for multiplexed data</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] fts number of E1 frames (32 bytes each) to generate</span><br><span style="color: hsl(120, 100%, 40%);">+ * \return number of bytes written to buf */</span><br><span style="color: hsl(120, 100%, 40%);">+int</span><br><span style="color: hsl(120, 100%, 40%);">+e1_line_mux_out(struct e1_line *line, uint8_t *buf, int fts)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int tsz;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Prepare */</span><br><span style="color: hsl(120, 100%, 40%);">+ tsz = 32 * fts;</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(buf, 0xff, tsz);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (line->mode) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case E1_LINE_MODE_CHANNELIZED:</span><br><span style="color: hsl(120, 100%, 40%);">+ _e1_line_mux_out_channelized(line, buf, fts);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case E1_LINE_MODE_SUPERCHANNEL:</span><br><span style="color: hsl(120, 100%, 40%);">+ _e1_line_mux_out_superchan(line, buf, fts);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return tsz;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* append data to the per-timeslot buffer; flush to socket every time buffer is full */</span><br><span style="color: hsl(120, 100%, 40%);">+static int</span><br><span style="color: hsl(120, 100%, 40%);">+_e1_rx_raw(struct e1_ts *ts, const uint8_t *buf, unsigned int len)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int appended = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rv;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(ts->mode == E1_TS_MODE_RAW);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* we don't keep a larger set of buffers but simply assume that whenever</span><br><span style="color: hsl(120, 100%, 40%);">+ * we received one full chunk/buffer size, we are able to push the data</span><br><span style="color: hsl(120, 100%, 40%);">+ * into the underlying unix domain socket. Kernel socket buffering should</span><br><span style="color: hsl(120, 100%, 40%);">+ * be far sufficient in terms of buffering capacity of voice data (which</span><br><span style="color: hsl(120, 100%, 40%);">+ * is typically consumed reasonably low latency and hence buffer size) */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ while (appended < len) {</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int ts_buf_tailroom = ts->raw.rx_buf_size - ts->raw.rx_buf_used;</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int chunk_len;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* determine size of chunk we can write at this point */</span><br><span style="color: hsl(120, 100%, 40%);">+ chunk_len = len - appended;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (chunk_len > ts_buf_tailroom)</span><br><span style="color: hsl(120, 100%, 40%);">+ chunk_len = ts_buf_tailroom;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* actually copy the chunk */</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(ts->raw.rx_buf + ts->raw.rx_buf_used, buf + appended, chunk_len);</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->raw.rx_buf_used += chunk_len;</span><br><span style="color: hsl(120, 100%, 40%);">+ appended += chunk_len;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* if ts_buf is full: flush + rewind */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ts->raw.rx_buf_used >= ts->raw.rx_buf_size) {</span><br><span style="color: hsl(120, 100%, 40%);">+ rv = write(ts->fd, ts->raw.rx_buf, ts->raw.rx_buf_size);</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 style="color: hsl(120, 100%, 40%);">+ /* FIXME: count overflows */</span><br><span style="color: hsl(120, 100%, 40%);">+ ts->raw.rx_buf_used = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return appended;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/* write data to a timeslot (hardware -> application direction) */</span><br><span style="color: hsl(120, 100%, 40%);">+static int</span><br><span style="color: hsl(120, 100%, 40%);">+_e1_ts_write(struct e1_ts *ts, const uint8_t *buf, size_t len)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int rv;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (ts->mode) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case E1_TS_MODE_RAW:</span><br><span style="color: hsl(120, 100%, 40%);">+ rv = _e1_rx_raw(ts, buf, len);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case E1_TS_MODE_HDLCFCS:</span><br><span style="color: hsl(120, 100%, 40%);">+ rv = _e1_rx_hdlcfs(ts, buf, len);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</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 style="color: hsl(120, 100%, 40%);">+ e1_ts_stop(ts);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (rv < len) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPTS(ts, DE1D, LOGL_NOTICE, "TS write overflow: We had %zu bytes to send, "</span><br><span style="color: hsl(120, 100%, 40%);">+ "but write returned only %d\n", len, rv);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return rv;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static int</span><br><span style="color: hsl(120, 100%, 40%);">+_e1_line_demux_in_superchan(struct e1_line *line, const uint8_t *buf, int ftr)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct e1_ts *ts = &line->superchan;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t sc_buf[ftr*31];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(line->mode == E1_LINE_MODE_SUPERCHANNEL);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ts->mode == E1_TS_MODE_OFF)</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* first gather input data from multiple frames*/</span><br><span style="color: hsl(120, 100%, 40%);">+ for (int i = 0; i < ftr; i++)</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(sc_buf + (i*31), buf + (i*32) + 1, 31);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* then dispatch to appropriate action */</span><br><span style="color: hsl(120, 100%, 40%);">+ _e1_ts_write(ts, sc_buf, ftr*31);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static int</span><br><span style="color: hsl(120, 100%, 40%);">+_e1_line_demux_in_channelized(struct e1_line *line, const uint8_t *buf, int ftr)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(line->mode == E1_LINE_MODE_CHANNELIZED);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (int tsn=1; tsn<32; tsn++)</span><br><span style="color: hsl(120, 100%, 40%);">+ {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct e1_ts *ts = &line->ts[tsn];</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t buf_ts[ftr];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ts->mode == E1_TS_MODE_OFF)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (int i=0; i<ftr; i++)</span><br><span style="color: hsl(120, 100%, 40%);">+ buf_ts[i] = buf[tsn+(i*32)];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ _e1_ts_write(ts, buf_ts, ftr);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+/*! de-multiplex E1 line data to the individual timeslots.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] line E1 line on which we operate.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] buf buffer containing multiplexed frame-aligned E1 data.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] size size of 'buf' in octets; assumed to be multiple of E1 frame size (32).</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns 0 on success; negative on error */</span><br><span style="color: hsl(120, 100%, 40%);">+int</span><br><span style="color: hsl(120, 100%, 40%);">+e1_line_demux_in(struct e1_line *line, const uint8_t *buf, int size)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int ftr;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (size <= 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLI(line, DXFR, LOGL_ERROR, "IN ERROR: %d\n", size);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ftr = size / 32;</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(size % 32 == 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (line->mode) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case E1_LINE_MODE_CHANNELIZED:</span><br><span style="color: hsl(120, 100%, 40%);">+ return _e1_line_demux_in_channelized(line, buf, ftr);</span><br><span style="color: hsl(120, 100%, 40%);">+ case E1_LINE_MODE_SUPERCHANNEL:</span><br><span style="color: hsl(120, 100%, 40%);">+ return _e1_line_demux_in_superchan(line, buf, ftr);</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(0);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-e1d/+/21801">change 21801</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/+/21801"/><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: I1ceaea85a15e2fae1d2e041173be9d758c6d0b78 </div>
<div style="display:none"> Gerrit-Change-Number: 21801 </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>