<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-e1d/+/21808">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;">Evaluate received E and A bits in TS0<br><br>Related: OS#4917<br>Change-Id: I7e1c919518b3418e973b7ae5bedd5a6dd1c2adec<br>---<br>M src/e1d.h<br>M src/intf_line.c<br>M src/mux_demux.c<br>M src/usb.c<br>M src/vpair.c<br>M src/vty.c<br>6 files changed, 85 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/e1d.h b/src/e1d.h</span><br><span>index 9848df4..7cb5335 100644</span><br><span>--- a/src/e1d.h</span><br><span>+++ b/src/e1d.h</span><br><span>@@ -27,6 +27,7 @@</span><br><span> #include <osmocom/core/isdnhdlc.h></span><br><span> #include <osmocom/core/linuxlist.h></span><br><span> #include <osmocom/core/rate_ctr.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/timer.h></span><br><span> #include <osmocom/vty/command.h></span><br><span> </span><br><span> enum e1d_vty_node {</span><br><span>@@ -42,6 +43,8 @@</span><br><span> LINE_CTR_CRC_ERR,</span><br><span> LINE_CTR_RX_OVFL,</span><br><span> LINE_CTR_TX_UNFL,</span><br><span style="color: hsl(120, 100%, 40%);">+ LINE_CTR_RX_REMOTE_E,</span><br><span style="color: hsl(120, 100%, 40%);">+ LINE_CTR_RX_REMOTE_A,</span><br><span> };</span><br><span> </span><br><span> enum e1_ts_mode {</span><br><span>@@ -88,6 +91,9 @@</span><br><span> E1_LINE_MODE_SUPERCHANNEL,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define E1L_TS0_RX_CRC4_ERR 0x01</span><br><span style="color: hsl(120, 100%, 40%);">+#define E1L_TS0_RX_ALARM 0x02</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct e1_line {</span><br><span> struct llist_head list;</span><br><span> </span><br><span>@@ -103,6 +109,17 @@</span><br><span> struct e1_ts ts[32];</span><br><span> /* superchannel */</span><br><span> struct e1_ts superchan;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ struct {</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! buffer where we aggregate the E bits each multi-frame */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t e_bits;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! did we receive CRC4 / ALARM error reports this second (timer tick) */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t cur_errmask;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! did we receive CRC4 / ALARM error reports previous second (timer tick) */</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t prev_errmask;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! timer to re-set the rx_crc4_err and rx_alarm above */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_timer_list timer;</span><br><span style="color: hsl(120, 100%, 40%);">+ } ts0;</span><br><span> };</span><br><span> </span><br><span> enum e1_driver {</span><br><span>@@ -160,7 +177,7 @@</span><br><span> e1_line_mux_out(struct e1_line *line, uint8_t *buf, int fts);</span><br><span> </span><br><span> 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(120, 100%, 40%);">+e1_line_demux_in(struct e1_line *line, const uint8_t *buf, int size, int frame_base);</span><br><span> </span><br><span> void</span><br><span> e1_ts_stop(struct e1_ts *ts);</span><br><span>diff --git a/src/intf_line.c b/src/intf_line.c</span><br><span>index ccd7645..5143e45 100644</span><br><span>--- a/src/intf_line.c</span><br><span>+++ b/src/intf_line.c</span><br><span>@@ -52,6 +52,8 @@</span><br><span> [LINE_CTR_CRC_ERR] = { "rx:crc_errors", "E1 Rx CRC Errors" },</span><br><span> [LINE_CTR_RX_OVFL] = { "rx:overflow", "E1 Rx Overflow" },</span><br><span> [LINE_CTR_TX_UNFL] = { "tx:underflow", "E1 Tx Underflow" },</span><br><span style="color: hsl(120, 100%, 40%);">+ [LINE_CTR_RX_REMOTE_E] ={ "rx:remote_crc_errors", "Rx Frames Reporting Remote CRC Error"},</span><br><span style="color: hsl(120, 100%, 40%);">+ [LINE_CTR_RX_REMOTE_A] ={ "rx:remote_alarm", "Rx Frames Reporting Remote Alarm"},</span><br><span> };</span><br><span> </span><br><span> static const struct rate_ctr_group_desc line_ctrg_desc = {</span><br><span>@@ -134,6 +136,28 @@</span><br><span> }</span><br><span> </span><br><span> static void</span><br><span style="color: hsl(120, 100%, 40%);">+_ts0_tmr_cb(void *_line)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct e1_line *line = (struct e1_line *) _line;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if ((line->ts0.cur_errmask & E1L_TS0_RX_CRC4_ERR) !=</span><br><span style="color: hsl(120, 100%, 40%);">+ (line->ts0.prev_errmask & E1L_TS0_RX_CRC4_ERR)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLI(line, DE1D, LOGL_NOTICE, "Remote CRC4 Error report %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ line->ts0.cur_errmask & E1L_TS0_RX_CRC4_ERR ? "STARTED" : "CEASED");</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 ((line->ts0.cur_errmask & E1L_TS0_RX_ALARM) !=</span><br><span style="color: hsl(120, 100%, 40%);">+ (line->ts0.prev_errmask & E1L_TS0_RX_ALARM)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPLI(line, DE1D, LOGL_NOTICE, "Remote ALARM condition %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ line->ts0.cur_errmask & E1L_TS0_RX_ALARM ? "STARTED" : "CEASED");</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%);">+ line->ts0.prev_errmask = line->ts0.cur_errmask;</span><br><span style="color: hsl(120, 100%, 40%);">+ line->ts0.cur_errmask = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_schedule(&line->ts0.timer, 1, 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 void</span><br><span> _ts_init(struct e1_ts *ts, struct e1_line *line, int id)</span><br><span> {</span><br><span> ts->line = line;</span><br><span>@@ -167,6 +191,9 @@</span><br><span> line->ctrs = rate_ctr_group_alloc(line, &line_ctrg_desc, line->id);</span><br><span> OSMO_ASSERT(line->ctrs);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_setup(&line->ts0.timer, _ts0_tmr_cb, line);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_timer_schedule(&line->ts0.timer, 1, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> llist_add_tail(&line->list, &intf->lines);</span><br><span> </span><br><span> LOGPLI(line, DE1D, LOGL_NOTICE, "Created\n");</span><br><span>diff --git a/src/mux_demux.c b/src/mux_demux.c</span><br><span>index ed7bf3b..dffc798 100644</span><br><span>--- a/src/mux_demux.c</span><br><span>+++ b/src/mux_demux.c</span><br><span>@@ -348,13 +348,41 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void</span><br><span style="color: hsl(120, 100%, 40%);">+_e1_line_demux_in_ts0(struct e1_line *line, const uint8_t *buf, int ftr, uint8_t frame_base)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int i;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < ftr; i++) {</span><br><span style="color: hsl(120, 100%, 40%);">+ const uint8_t *frame = buf + i*32;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t frame_nr = (frame_base + i) & 0xf;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* A bit is present in each odd frame */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (frame_nr % 2) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (frame[0] & 0x20)</span><br><span style="color: hsl(120, 100%, 40%);">+ line->ts0.cur_errmask |= E1L_TS0_RX_ALARM;</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%);">+ /* E bits are present in frame 13 + 15 */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (frame_nr == 13)</span><br><span style="color: hsl(120, 100%, 40%);">+ line->ts0.e_bits = frame[0] & 0x80 ? 2 : 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (frame_nr == 15) {</span><br><span style="color: hsl(120, 100%, 40%);">+ line->ts0.e_bits |= frame[0] & 0x80 ? 1 : 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (line->ts0.e_bits != 3)</span><br><span style="color: hsl(120, 100%, 40%);">+ line->ts0.cur_errmask |= E1L_TS0_RX_CRC4_ERR;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* cur_errmask is being cleared once per second via line->ts0.timer */</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> /*! de-multiplex E1 line data to the individual timeslots.</span><br><span> * \param[in] line E1 line on which we operate.</span><br><span> * \param[in] buf buffer containing multiplexed frame-aligned E1 data.</span><br><span> * \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%);">+ * \param[in] frame_base frame number (in multiframe) of first frame in 'buf'. -1 to disable TS0.</span><br><span> * \returns 0 on success; negative on error */</span><br><span> 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(120, 100%, 40%);">+e1_line_demux_in(struct e1_line *line, const uint8_t *buf, int size, int frame_base)</span><br><span> {</span><br><span> int ftr;</span><br><span> </span><br><span>@@ -366,6 +394,9 @@</span><br><span> ftr = size / 32;</span><br><span> OSMO_ASSERT(size % 32 == 0);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (frame_base >= 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ _e1_line_demux_in_ts0(line, buf, ftr, frame_base);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> switch (line->mode) {</span><br><span> case E1_LINE_MODE_CHANNELIZED:</span><br><span> return _e1_line_demux_in_channelized(line, buf, ftr);</span><br><span>diff --git a/src/usb.c b/src/usb.c</span><br><span>index 326a2b2..3ec793f 100644</span><br><span>--- a/src/usb.c</span><br><span>+++ b/src/usb.c</span><br><span>@@ -118,7 +118,7 @@</span><br><span> {</span><br><span> if (size == 0)</span><br><span> return 0;</span><br><span style="color: hsl(0, 100%, 40%);">- return e1_line_demux_in(flow->line, buf + 4, size - 4);</span><br><span style="color: hsl(120, 100%, 40%);">+ return e1_line_demux_in(flow->line, buf + 4, size - 4, buf[3] & 0xf);</span><br><span> }</span><br><span> </span><br><span> static int</span><br><span>diff --git a/src/vpair.c b/src/vpair.c</span><br><span>index df14026..8484be0 100644</span><br><span>--- a/src/vpair.c</span><br><span>+++ b/src/vpair.c</span><br><span>@@ -132,14 +132,14 @@</span><br><span> rc = e1_line_mux_out(line, buf, frames_expired);</span><br><span> OSMO_ASSERT(rc >= 0);</span><br><span> /* write data to peer */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = e1_line_demux_in(peer, buf, rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = e1_line_demux_in(peer, buf, rc, 0);</span><br><span> OSMO_ASSERT(rc >= 0);</span><br><span> </span><br><span> /* generate data on peer line */</span><br><span> rc = e1_line_mux_out(peer, buf, frames_expired);</span><br><span> OSMO_ASSERT(rc >= 0);</span><br><span> /* write data to current line */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = e1_line_demux_in(line, buf, rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = e1_line_demux_in(line, buf, rc, 0);</span><br><span> OSMO_ASSERT(rc >= 0);</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/vty.c b/src/vty.c</span><br><span>index da3d005..0d8ab2b 100644</span><br><span>--- a/src/vty.c</span><br><span>+++ b/src/vty.c</span><br><span>@@ -109,8 +109,11 @@</span><br><span> {</span><br><span> int tn;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "Interface #%u, Line #%u, Mode %s:%s", line->intf->id, line->id,</span><br><span style="color: hsl(0, 100%, 40%);">- get_value_string(e1_line_mode_names, line->mode), VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "Interface #%u, Line #%u, Mode %s%s%s:%s", line->intf->id, line->id,</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(e1_line_mode_names, line->mode),</span><br><span style="color: hsl(120, 100%, 40%);">+ line->ts0.cur_errmask & E1L_TS0_RX_ALARM ? " [REMOTE-ALARM]" : "",</span><br><span style="color: hsl(120, 100%, 40%);">+ line->ts0.cur_errmask & E1L_TS0_RX_CRC4_ERR ? " [REMOTE-CRC-ERROR]" : "",</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span> </span><br><span> for (tn = 0; tn < ARRAY_SIZE(line->ts); tn++) {</span><br><span> const struct e1_ts *ts = &line->ts[tn];</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-e1d/+/21808">change 21808</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/+/21808"/><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: I7e1c919518b3418e973b7ae5bedd5a6dd1c2adec </div>
<div style="display:none"> Gerrit-Change-Number: 21808 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </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>