Skip to content

L
linux
Commit 8b0041db authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files
Options

[media] dvb-net: split the logic at dvb_net_ule() into other functions 

This function is too big and too complex, making really hard
to understand what's there.

Split it into sub-routines, in order to make it easier to be
understood, and to allow gcc to better parse it.

As a bonus, it gets rid of a goto in the middle of a routine.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent efb9ab67
Show whitespace changes
Inline Side-by-side
Showing with 467 additions and 361 deletions
drivers/media/dvb-core/dvb_net.c
View file @ 8b0041db
...@@ -332,438 +332,544 @@ struct dvb_net_ule_handle { ...@@ -332,438 +332,544 @@ struct dvb_net_ule_handle {
#endif #endif
}; };
static void dvb_net_ule(struct net_device *dev, const u8 *buf, size_t buf_len) static int dvb_net_ule_new_ts_cell(struct dvb_net_ule_handle *h)
{ {
struct dvb_net_ule_handle h = {
.dev = dev,
.buf = buf,
.buf_len = buf_len,
.skipped = 0L,
.ts = NULL,
.ts_end = NULL,
.from_where = NULL,
.ts_remain = 0,
.how_much = 0,
.new_ts = 1,
.ethh = NULL,
.error = false,
#ifdef ULE_DEBUG
.ule_where = ule_hist,
#endif
};
/* For all TS cells in current buffer.
* Appearently, we are called for every single TS cell.
*/
for (h.ts = h.buf, h.ts_end = h.buf + h.buf_len; h.ts < h.ts_end; /* no incr. */ ) {
if (h.new_ts) {
/* We are about to process a new TS cell. */ /* We are about to process a new TS cell. */
#ifdef ULE_DEBUG #ifdef ULE_DEBUG
if (h.ule_where >= &h.ule_hist[100*TS_SZ]) h.ule_where = h.ule_hist; if (h->ule_where >= &h->ule_hist[100*TS_SZ])
memcpy( h.ule_where, h.ts, TS_SZ ); h->ule_where = h->ule_hist;
if (h.ule_dump) { memcpy(h->ule_where, h->ts, TS_SZ);
hexdump( h.ule_where, TS_SZ ); if (h->ule_dump) {
h.ule_dump = 0; hexdump(h->ule_where, TS_SZ);
} h->ule_dump = 0;
h.ule_where += TS_SZ; }
h->ule_where += TS_SZ;
#endif #endif
/* Check TS h.error conditions: sync_byte, transport_error_indicator, scrambling_control . */ /*
if ((h.ts[0] != TS_SYNC) || (h.ts[1] & TS_TEI) || ((h.ts[3] & TS_SC) != 0)) { * Check TS h->error conditions: sync_byte, transport_error_indicator,
* scrambling_control .
*/
if ((h->ts[0] != TS_SYNC) || (h->ts[1] & TS_TEI) ||
((h->ts[3] & TS_SC) != 0)) {
pr_warn("%lu: Invalid TS cell: SYNC %#x, TEI %u, SC %#x.\n", pr_warn("%lu: Invalid TS cell: SYNC %#x, TEI %u, SC %#x.\n",
h.priv->ts_count, h.ts[0], h->priv->ts_count, h->ts[0],
(h.ts[1] & TS_TEI) >> 7, (h->ts[1] & TS_TEI) >> 7,
(h.ts[3] & TS_SC) >> 6); (h->ts[3] & TS_SC) >> 6);
/* Drop partly decoded SNDU, reset state, resync on PUSI. */ /* Drop partly decoded SNDU, reset state, resync on PUSI. */
if (h.priv->ule_skb) { if (h->priv->ule_skb) {
dev_kfree_skb( h.priv->ule_skb ); dev_kfree_skb(h->priv->ule_skb);
/* Prepare for next SNDU. */ /* Prepare for next SNDU. */
h.dev->stats.rx_errors++; h->dev->stats.rx_errors++;
h.dev->stats.rx_frame_errors++; h->dev->stats.rx_frame_errors++;
} }
reset_ule(h.priv); reset_ule(h->priv);
h.priv->need_pusi = 1; h->priv->need_pusi = 1;
/* Continue with next TS cell. */ /* Continue with next TS cell. */
h.ts += TS_SZ; h->ts += TS_SZ;
h.priv->ts_count++; h->priv->ts_count++;
continue; return 1;
} }
h.ts_remain = 184; h->ts_remain = 184;
h.from_where = h.ts + 4; h->from_where = h->ts + 4;
}
/* Synchronize on PUSI, if required. */ return 0;
if (h.priv->need_pusi) { }
if (h.ts[1] & TS_PUSI) {
static int dvb_net_ule_ts_pusi(struct dvb_net_ule_handle *h)
{
if (h->ts[1] & TS_PUSI) {
/* Find beginning of first ULE SNDU in current TS cell. */ /* Find beginning of first ULE SNDU in current TS cell. */
/* Synchronize continuity counter. */ /* Synchronize continuity counter. */
h.priv->tscc = h.ts[3] & 0x0F; h->priv->tscc = h->ts[3] & 0x0F;
/* There is a pointer field here. */ /* There is a pointer field here. */
if (h.ts[4] > h.ts_remain) { if (h->ts[4] > h->ts_remain) {
pr_err("%lu: Invalid ULE packet (pointer field %d)\n", pr_err("%lu: Invalid ULE packet (pointer field %d)\n",
h.priv->ts_count, h.ts[4]); h->priv->ts_count, h->ts[4]);
h.ts += TS_SZ; h->ts += TS_SZ;
h.priv->ts_count++; h->priv->ts_count++;
continue; return 1;
} }
/* Skip to destination of pointer field. */ /* Skip to destination of pointer field. */
h.from_where = &h.ts[5] + h.ts[4]; h->from_where = &h->ts[5] + h->ts[4];
h.ts_remain -= 1 + h.ts[4]; h->ts_remain -= 1 + h->ts[4];
h.skipped = 0; h->skipped = 0;
} else { } else {
h.skipped++; h->skipped++;
h.ts += TS_SZ; h->ts += TS_SZ;
h.priv->ts_count++; h->priv->ts_count++;
continue; return 1;
}
} }
if (h.new_ts) { return 0;
}
static int dvb_net_ule_new_ts(struct dvb_net_ule_handle *h)
{
/* Check continuity counter. */ /* Check continuity counter. */
if ((h.ts[3] & 0x0F) == h.priv->tscc) if ((h->ts[3] & 0x0F) == h->priv->tscc)
h.priv->tscc = (h.priv->tscc + 1) & 0x0F; h->priv->tscc = (h->priv->tscc + 1) & 0x0F;
else { else {
/* TS discontinuity handling: */ /* TS discontinuity handling: */
pr_warn("%lu: TS discontinuity: got %#x, expected %#x.\n", pr_warn("%lu: TS discontinuity: got %#x, expected %#x.\n",
h.priv->ts_count, h.ts[3] & 0x0F, h->priv->ts_count, h->ts[3] & 0x0F,
h.priv->tscc); h->priv->tscc);
/* Drop partly decoded SNDU, reset state, resync on PUSI. */ /* Drop partly decoded SNDU, reset state, resync on PUSI. */
if (h.priv->ule_skb) { if (h->priv->ule_skb) {
dev_kfree_skb( h.priv->ule_skb ); dev_kfree_skb(h->priv->ule_skb);
/* Prepare for next SNDU. */ /* Prepare for next SNDU. */
// reset_ule(h.priv); moved to below. // reset_ule(h->priv); moved to below.
h.dev->stats.rx_errors++; h->dev->stats.rx_errors++;
h.dev->stats.rx_frame_errors++; h->dev->stats.rx_frame_errors++;
} }
reset_ule(h.priv); reset_ule(h->priv);
/* skip to next PUSI. */ /* skip to next PUSI. */
h.priv->need_pusi = 1; h->priv->need_pusi = 1;
continue; return 1;
} }
/* If we still have an incomplete payload, but PUSI is /*
* If we still have an incomplete payload, but PUSI is
* set; some TS cells are missing. * set; some TS cells are missing.
* This is only possible here, if we missed exactly 16 TS * This is only possible here, if we missed exactly 16 TS
* cells (continuity counter wrap). */ * cells (continuity counter wrap).
if (h.ts[1] & TS_PUSI) { */
if (! h.priv->need_pusi) { if (h->ts[1] & TS_PUSI) {
if (!(*h.from_where < (h.ts_remain-1)) || *h.from_where != h.priv->ule_sndu_remain) { if (!h->priv->need_pusi) {
/* Pointer field is invalid. Drop this TS cell and any started ULE SNDU. */ if (!(*h->from_where < (h->ts_remain-1)) ||
*h->from_where != h->priv->ule_sndu_remain) {
/*
* Pointer field is invalid.
* Drop this TS cell and any started ULE SNDU.
*/
pr_warn("%lu: Invalid pointer field: %u.\n", pr_warn("%lu: Invalid pointer field: %u.\n",
h.priv->ts_count, h->priv->ts_count,
*h.from_where); *h->from_where);
/* Drop partly decoded SNDU, reset state, resync on PUSI. */ /*
if (h.priv->ule_skb) { * Drop partly decoded SNDU, reset state,
h.error = true; * resync on PUSI.
dev_kfree_skb(h.priv->ule_skb); */
if (h->priv->ule_skb) {
h->error = true;
dev_kfree_skb(h->priv->ule_skb);
} }
if (h.error || h.priv->ule_sndu_remain) { if (h->error || h->priv->ule_sndu_remain) {
h.dev->stats.rx_errors++; h->dev->stats.rx_errors++;
h.dev->stats.rx_frame_errors++; h->dev->stats.rx_frame_errors++;
h.error = false; h->error = false;
} }
reset_ule(h.priv); reset_ule(h->priv);
h.priv->need_pusi = 1; h->priv->need_pusi = 1;
continue; return 1;
} }
/* Skip pointer field (we're processing a /*
* packed payload). */ * Skip pointer field (we're processing a
h.from_where += 1; * packed payload).
h.ts_remain -= 1; */
h->from_where += 1;
h->ts_remain -= 1;
} else } else
h.priv->need_pusi = 0; h->priv->need_pusi = 0;
if (h.priv->ule_sndu_remain > 183) { if (h->priv->ule_sndu_remain > 183) {
/* Current SNDU lacks more data than there could be available in the /*
* current TS cell. */ * Current SNDU lacks more data than there
h.dev->stats.rx_errors++; * could be available in the current TS cell.
h.dev->stats.rx_length_errors++; */
pr_warn("%lu: Expected %d more SNDU bytes, but got PUSI (pf %d, h.ts_remain %d). Flushing incomplete payload.\n", h->dev->stats.rx_errors++;
h.priv->ts_count, h->dev->stats.rx_length_errors++;
h.priv->ule_sndu_remain, pr_warn("%lu: Expected %d more SNDU bytes, but got PUSI (pf %d, h->ts_remain %d). Flushing incomplete payload.\n",
h.ts[4], h.ts_remain); h->priv->ts_count,
dev_kfree_skb(h.priv->ule_skb); h->priv->ule_sndu_remain,
h->ts[4], h->ts_remain);
dev_kfree_skb(h->priv->ule_skb);
/* Prepare for next SNDU. */ /* Prepare for next SNDU. */
reset_ule(h.priv); reset_ule(h->priv);
/* Resync: go to where pointer field points to: start of next ULE SNDU. */ /*
h.from_where += h.ts[4]; * Resync: go to where pointer field points to:
h.ts_remain -= h.ts[4]; * start of next ULE SNDU.
} */
h->from_where += h->ts[4];
h->ts_remain -= h->ts[4];
} }
} }
return 0;
}
/* Check if new payload needs to be started. */
if (h.priv->ule_skb == NULL) { /*
/* Start a new payload with skb. * Start a new payload with skb.
* Find ULE header. It is only guaranteed that the * Find ULE header. It is only guaranteed that the
* length field (2 bytes) is contained in the current * length field (2 bytes) is contained in the current
* TS. * TS.
* Check h.ts_remain has to be >= 2 here. */ * Check h.ts_remain has to be >= 2 here.
if (h.ts_remain < 2) { */
static int dvb_net_ule_new_payload(struct dvb_net_ule_handle *h)
{
if (h->ts_remain < 2) {
pr_warn("Invalid payload packing: only %d bytes left in TS. Resyncing.\n", pr_warn("Invalid payload packing: only %d bytes left in TS. Resyncing.\n",
h.ts_remain); h->ts_remain);
h.priv->ule_sndu_len = 0; h->priv->ule_sndu_len = 0;
h.priv->need_pusi = 1; h->priv->need_pusi = 1;
h.ts += TS_SZ; h->ts += TS_SZ;
continue; return 1;
} }
if (! h.priv->ule_sndu_len) { if (!h->priv->ule_sndu_len) {
/* Got at least two bytes, thus extrace the SNDU length. */ /* Got at least two bytes, thus extrace the SNDU length. */
h.priv->ule_sndu_len = h.from_where[0] << 8 | h.from_where[1]; h->priv->ule_sndu_len = h->from_where[0] << 8 |
if (h.priv->ule_sndu_len & 0x8000) { h->from_where[1];
if (h->priv->ule_sndu_len & 0x8000) {
/* D-Bit is set: no dest mac present. */ /* D-Bit is set: no dest mac present. */
h.priv->ule_sndu_len &= 0x7FFF; h->priv->ule_sndu_len &= 0x7FFF;
h.priv->ule_dbit = 1; h->priv->ule_dbit = 1;
} else } else
h.priv->ule_dbit = 0; h->priv->ule_dbit = 0;
if (h.priv->ule_sndu_len < 5) { if (h->priv->ule_sndu_len < 5) {
pr_warn("%lu: Invalid ULE SNDU length %u. Resyncing.\n", pr_warn("%lu: Invalid ULE SNDU length %u. Resyncing.\n",
h.priv->ts_count, h->priv->ts_count,
h.priv->ule_sndu_len); h->priv->ule_sndu_len);
h.dev->stats.rx_errors++; h->dev->stats.rx_errors++;
h.dev->stats.rx_length_errors++; h->dev->stats.rx_length_errors++;
h.priv->ule_sndu_len = 0; h->priv->ule_sndu_len = 0;
h.priv->need_pusi = 1; h->priv->need_pusi = 1;
h.new_ts = 1; h->new_ts = 1;
h.ts += TS_SZ; h->ts += TS_SZ;
h.priv->ts_count++; h->priv->ts_count++;
continue; return 1;
} }
h.ts_remain -= 2; /* consume the 2 bytes SNDU length. */ h->ts_remain -= 2; /* consume the 2 bytes SNDU length. */
h.from_where += 2; h->from_where += 2;
} }
h.priv->ule_sndu_remain = h.priv->ule_sndu_len + 2; h->priv->ule_sndu_remain = h->priv->ule_sndu_len + 2;
/* /*
* State of current TS: * State of current TS:
* h.ts_remain (remaining bytes in the current TS cell) * h->ts_remain (remaining bytes in the current TS cell)
* 0 ule_type is not available now, we need the next TS cell * 0 ule_type is not available now, we need the next TS cell
* 1 the first byte of the ule_type is present * 1 the first byte of the ule_type is present
* >=2 full ULE header present, maybe some payload data as well. * >=2 full ULE header present, maybe some payload data as well.
*/ */
switch (h.ts_remain) { switch (h->ts_remain) {
case 1: case 1:
h.priv->ule_sndu_remain--; h->priv->ule_sndu_remain--;
h.priv->ule_sndu_type = h.from_where[0] << 8; h->priv->ule_sndu_type = h->from_where[0] << 8;
h.priv->ule_sndu_type_1 = 1; /* first byte of ule_type is set. */
h.ts_remain -= 1; h.from_where += 1; /* first byte of ule_type is set. */
/* Continue w/ next TS. */ h->priv->ule_sndu_type_1 = 1;
h->ts_remain -= 1;
h->from_where += 1;
/* fallthrough */
case 0: case 0:
h.new_ts = 1; h->new_ts = 1;
h.ts += TS_SZ; h->ts += TS_SZ;
h.priv->ts_count++; h->priv->ts_count++;
continue; return 1;
default: /* complete ULE header is present in current TS. */ default: /* complete ULE header is present in current TS. */
/* Extract ULE type field. */ /* Extract ULE type field. */
if (h.priv->ule_sndu_type_1) { if (h->priv->ule_sndu_type_1) {
h.priv->ule_sndu_type_1 = 0; h->priv->ule_sndu_type_1 = 0;
h.priv->ule_sndu_type |= h.from_where[0]; h->priv->ule_sndu_type |= h->from_where[0];
h.from_where += 1; /* points to payload start. */ h->from_where += 1; /* points to payload start. */
h.ts_remain -= 1; h->ts_remain -= 1;
} else { } else {
/* Complete type is present in new TS. */ /* Complete type is present in new TS. */
h.priv->ule_sndu_type = h.from_where[0] << 8 | h.from_where[1]; h->priv->ule_sndu_type = h->from_where[0] << 8 |
h.from_where += 2; /* points to payload start. */ h->from_where[1];
h.ts_remain -= 2; h->from_where += 2; /* points to payload start. */
h->ts_remain -= 2;
} }
break; break;
} }
/* Allocate the skb (decoder target buffer) with the correct size, as follows: /*
* prepare for the largest case: bridged SNDU with MAC address (dbit = 0). */ * Allocate the skb (decoder target buffer) with the correct size,
h.priv->ule_skb = dev_alloc_skb( h.priv->ule_sndu_len + ETH_HLEN + ETH_ALEN ); * as follows:
if (h.priv->ule_skb == NULL) { *
* prepare for the largest case: bridged SNDU with MAC address
* (dbit = 0).
*/
h->priv->ule_skb = dev_alloc_skb(h->priv->ule_sndu_len +
ETH_HLEN + ETH_ALEN);
if (!h->priv->ule_skb) {
pr_notice("%s: Memory squeeze, dropping packet.\n", pr_notice("%s: Memory squeeze, dropping packet.\n",
h.dev->name); h->dev->name);
h.dev->stats.rx_dropped++; h->dev->stats.rx_dropped++;
return; return -1;
} }
/* This includes the CRC32 _and_ dest mac, if !dbit. */ /* This includes the CRC32 _and_ dest mac, if !dbit. */
h.priv->ule_sndu_remain = h.priv->ule_sndu_len; h->priv->ule_sndu_remain = h->priv->ule_sndu_len;
h.priv->ule_skb->dev = h.dev; h->priv->ule_skb->dev = h->dev;
/* Leave space for Ethernet or bridged SNDU header (eth hdr plus one MAC addr). */ /*
skb_reserve( h.priv->ule_skb, ETH_HLEN + ETH_ALEN ); * Leave space for Ethernet or bridged SNDU header
} * (eth hdr plus one MAC addr).
*/
/* Copy data into our current skb. */ skb_reserve(h->priv->ule_skb, ETH_HLEN + ETH_ALEN);
h.how_much = min(h.priv->ule_sndu_remain, (int)h.ts_remain);
memcpy(skb_put(h.priv->ule_skb, h.how_much), h.from_where, h.how_much);
h.priv->ule_sndu_remain -= h.how_much;
h.ts_remain -= h.how_much;
h.from_where += h.how_much;
/* Check for complete payload. */
if (h.priv->ule_sndu_remain <= 0) {
/* Check CRC32, we've got it in our skb already. */
__be16 ulen = htons(h.priv->ule_sndu_len);
__be16 utype = htons(h.priv->ule_sndu_type);
const u8 *tail;
struct kvec iov[3] = {
{ &ulen, sizeof ulen },
{ &utype, sizeof utype },
{ h.priv->ule_skb->data, h.priv->ule_skb->len - 4 }
};
u32 ule_crc = ~0L, expected_crc;
if (h.priv->ule_dbit) {
/* Set D-bit for CRC32 verification,
* if it was set originally. */
ulen |= htons(0x8000);
}
ule_crc = iov_crc32(ule_crc, iov, 3);
tail = skb_tail_pointer(h.priv->ule_skb);
expected_crc = *(tail - 4) << 24 |
*(tail - 3) << 16 |
*(tail - 2) << 8 |
*(tail - 1);
if (ule_crc != expected_crc) {
pr_warn("%lu: CRC32 check FAILED: %08x / %08x, SNDU len %d type %#x, h.ts_remain %d, next 2: %x.\n",
h.priv->ts_count, ule_crc, expected_crc,
h.priv->ule_sndu_len, h.priv->ule_sndu_type,
h.ts_remain,
h.ts_remain > 2 ? *(unsigned short *)h.from_where : 0);
#ifdef ULE_DEBUG return 0;
hexdump( iov[0].iov_base, iov[0].iov_len ); }
hexdump( iov[1].iov_base, iov[1].iov_len );
hexdump( iov[2].iov_base, iov[2].iov_len );
if (h.ule_where == h.ule_hist) {
hexdump( &h.ule_hist[98*TS_SZ], TS_SZ );
hexdump( &h.ule_hist[99*TS_SZ], TS_SZ );
} else if (h.ule_where == &h.ule_hist[TS_SZ]) {
hexdump( &h.ule_hist[99*TS_SZ], TS_SZ );
hexdump( h.ule_hist, TS_SZ );
} else {
hexdump( h.ule_where - TS_SZ - TS_SZ, TS_SZ );
hexdump( h.ule_where - TS_SZ, TS_SZ );
}
h.ule_dump = 1;
#endif
h.dev->stats.rx_errors++;
h.dev->stats.rx_crc_errors++;
dev_kfree_skb(h.priv->ule_skb);
} else {
/* CRC32 verified OK. */
u8 dest_addr[ETH_ALEN];
static const u8 bc_addr[ETH_ALEN] =
{ [ 0 ... ETH_ALEN-1] = 0xff };
/* CRC32 was OK. Remove it from skb. */ static int dvb_net_ule_should_drop(struct dvb_net_ule_handle *h)
h.priv->ule_skb->tail -= 4; {
h.priv->ule_skb->len -= 4; static const u8 bc_addr[ETH_ALEN] = { [0 ... ETH_ALEN - 1] = 0xff };
if (!h.priv->ule_dbit) {
/* /*
* The destination MAC address is the * The destination MAC address is the next data in the skb. It comes
* next data in the skb. It comes
* before any extension headers. * before any extension headers.
* *
* Check if the payload of this SNDU * Check if the payload of this SNDU should be passed up the stack.
* should be passed up the stack.
*/ */
register int drop = 0; if (h->priv->rx_mode == RX_MODE_PROMISC)
if (h.priv->rx_mode != RX_MODE_PROMISC) { return 0;
if (h.priv->ule_skb->data[0] & 0x01) {
if (h->priv->ule_skb->data[0] & 0x01) {
/* multicast or broadcast */ /* multicast or broadcast */
if (!ether_addr_equal(h.priv->ule_skb->data, bc_addr)) { if (!ether_addr_equal(h->priv->ule_skb->data, bc_addr)) {
/* multicast */ /* multicast */
if (h.priv->rx_mode == RX_MODE_MULTI) { if (h->priv->rx_mode == RX_MODE_MULTI) {
int i; int i;
for(i = 0; i < h.priv->multi_num &&
!ether_addr_equal(h.priv->ule_skb->data, for (i = 0; i < h->priv->multi_num &&
h.priv->multi_macs[i]); i++) !ether_addr_equal(h->priv->ule_skb->data,
h->priv->multi_macs[i]);
i++)
; ;
if (i == h.priv->multi_num) if (i == h->priv->multi_num)
drop = 1; return 1;
} else if (h.priv->rx_mode != RX_MODE_ALL_MULTI) } else if (h->priv->rx_mode != RX_MODE_ALL_MULTI)
drop = 1; /* no broadcast; */ return 1; /* no broadcast; */
/* else: all multicast mode: accept all multicast packets */ /*
* else:
* all multicast mode: accept all multicast packets
*/
} }
/* else: broadcast */ /* else: broadcast */
} else if (!ether_addr_equal(h->priv->ule_skb->data, h->dev->dev_addr))
return 1;
return 0;
}
static void dvb_net_ule_check_crc(struct dvb_net_ule_handle *h,
u32 ule_crc, u32 expected_crc)
{
u8 dest_addr[ETH_ALEN];
if (ule_crc != expected_crc) {
pr_warn("%lu: CRC32 check FAILED: %08x / %08x, SNDU len %d type %#x, ts_remain %d, next 2: %x.\n",
h->priv->ts_count, ule_crc, expected_crc,
h->priv->ule_sndu_len, h->priv->ule_sndu_type,
h->ts_remain,
h->ts_remain > 2 ?
*(unsigned short *)h->from_where : 0);
#ifdef ULE_DEBUG
hexdump(iov[0].iov_base, iov[0].iov_len);
hexdump(iov[1].iov_base, iov[1].iov_len);
hexdump(iov[2].iov_base, iov[2].iov_len);
if (h->ule_where == h->ule_hist) {
hexdump(&h->ule_hist[98*TS_SZ], TS_SZ);
hexdump(&h->ule_hist[99*TS_SZ], TS_SZ);
} else if (h->ule_where == &h->ule_hist[TS_SZ]) {
hexdump(&h->ule_hist[99*TS_SZ], TS_SZ);
hexdump(h->ule_hist, TS_SZ);
} else {
hexdump(h->ule_where - TS_SZ - TS_SZ, TS_SZ);
hexdump(h->ule_where - TS_SZ, TS_SZ);
} }
else if (!ether_addr_equal(h.priv->ule_skb->data, h.dev->dev_addr)) h->ule_dump = 1;
drop = 1; #endif
/* else: destination address matches the MAC address of our receiver device */
h->dev->stats.rx_errors++;
h->dev->stats.rx_crc_errors++;
dev_kfree_skb(h->priv->ule_skb);
return;
} }
/* else: promiscuous mode; pass everything up the stack */
if (drop) { /* CRC32 verified OK. */
/* CRC32 was OK, so remove it from skb. */
h->priv->ule_skb->tail -= 4;
h->priv->ule_skb->len -= 4;
if (!h->priv->ule_dbit) {
if (dvb_net_ule_should_drop(h)) {
#ifdef ULE_DEBUG #ifdef ULE_DEBUG
netdev_dbg(h.dev, "Dropping SNDU: MAC destination address does not match: dest addr: %pM, h.dev addr: %pM\n", netdev_dbg(h->dev,
h.priv->ule_skb->data, h.dev->dev_addr); "Dropping SNDU: MAC destination address does not match: dest addr: %pM, h->dev addr: %pM\n",
h->priv->ule_skb->data, h->dev->dev_addr);
#endif #endif
dev_kfree_skb(h.priv->ule_skb); dev_kfree_skb(h->priv->ule_skb);
goto sndu_done; return;
} }
else
{ skb_copy_from_linear_data(h->priv->ule_skb, dest_addr,
skb_copy_from_linear_data(h.priv->ule_skb,
dest_addr,
ETH_ALEN); ETH_ALEN);
skb_pull(h.priv->ule_skb, ETH_ALEN); skb_pull(h->priv->ule_skb, ETH_ALEN);
}
} }
/* Handle ULE Extension Headers. */ /* Handle ULE Extension Headers. */
if (h.priv->ule_sndu_type < ETH_P_802_3_MIN) { if (h->priv->ule_sndu_type < ETH_P_802_3_MIN) {
/* There is an extension header. Handle it accordingly. */ /* There is an extension header. Handle it accordingly. */
int l = handle_ule_extensions(h.priv); int l = handle_ule_extensions(h->priv);
if (l < 0) { if (l < 0) {
/* Mandatory extension header unknown or TEST SNDU. Drop it. */ /*
* Mandatory extension header unknown or TEST SNDU.
* Drop it.
*/
// pr_warn("Dropping SNDU, extension headers.\n" ); // pr_warn("Dropping SNDU, extension headers.\n" );
dev_kfree_skb(h.priv->ule_skb); dev_kfree_skb(h->priv->ule_skb);
goto sndu_done; return;
} }
skb_pull(h.priv->ule_skb, l); skb_pull(h->priv->ule_skb, l);
} }
/* /*
* Construct/assure correct ethernet header. * Construct/assure correct ethernet header.
* Note: in bridged mode (h.priv->ule_bridged != * Note: in bridged mode (h->priv->ule_bridged != 0)
* 0) we already have the (original) ethernet * we already have the (original) ethernet
* header at the start of the payload (after * header at the start of the payload (after
* optional dest. address and any extension * optional dest. address and any extension
* headers). * headers).
*/ */
if (!h->priv->ule_bridged) {
skb_push(h->priv->ule_skb, ETH_HLEN);
h->ethh = (struct ethhdr *)h->priv->ule_skb->data;
if (!h->priv->ule_dbit) {
/*
* dest_addr buffer is only valid if
* h->priv->ule_dbit == 0
*/
memcpy(h->ethh->h_dest, dest_addr, ETH_ALEN);
eth_zero_addr(h->ethh->h_source);
} else /* zeroize source and dest */
memset(h->ethh, 0, ETH_ALEN * 2);
if (!h.priv->ule_bridged) { h->ethh->h_proto = htons(h->priv->ule_sndu_type);
skb_push(h.priv->ule_skb, ETH_HLEN);
h.ethh = (struct ethhdr *)h.priv->ule_skb->data;
if (!h.priv->ule_dbit) {
/* dest_addr buffer is only valid if h.priv->ule_dbit == 0 */
memcpy(h.ethh->h_dest, dest_addr, ETH_ALEN);
eth_zero_addr(h.ethh->h_source);
}
else /* zeroize source and dest */
memset( h.ethh, 0, ETH_ALEN*2 );
h.ethh->h_proto = htons(h.priv->ule_sndu_type);
} }
/* else: skb is in correct state; nothing to do. */ /* else: skb is in correct state; nothing to do. */
h.priv->ule_bridged = 0; h->priv->ule_bridged = 0;
/* Stuff into kernel's protocol stack. */ /* Stuff into kernel's protocol stack. */
h.priv->ule_skb->protocol = dvb_net_eth_type_trans(h.priv->ule_skb, h.dev); h->priv->ule_skb->protocol = dvb_net_eth_type_trans(h->priv->ule_skb,
/* If D-bit is set (i.e. destination MAC address not present), h->dev);
* receive the packet anyhow. */ /*
/* if (h.priv->ule_dbit && skb->pkt_type == PACKET_OTHERHOST) * If D-bit is set (i.e. destination MAC address not present),
h.priv->ule_skb->pkt_type = PACKET_HOST; */ * receive the packet anyhow.
h.dev->stats.rx_packets++; */
h.dev->stats.rx_bytes += h.priv->ule_skb->len; #if 0
netif_rx(h.priv->ule_skb); if (h->priv->ule_dbit && skb->pkt_type == PACKET_OTHERHOST)
} h->priv->ule_skb->pkt_type = PACKET_HOST;
sndu_done: #endif
h->dev->stats.rx_packets++;
h->dev->stats.rx_bytes += h->priv->ule_skb->len;
netif_rx(h->priv->ule_skb);
}
static void dvb_net_ule(struct net_device *dev, const u8 *buf, size_t buf_len)
{
int ret;
struct dvb_net_ule_handle h = {
.dev = dev,
.buf = buf,
.buf_len = buf_len,
.skipped = 0L,
.ts = NULL,
.ts_end = NULL,
.from_where = NULL,
.ts_remain = 0,
.how_much = 0,
.new_ts = 1,
.ethh = NULL,
.error = false,
#ifdef ULE_DEBUG
.ule_where = ule_hist,
#endif
};
/*
* For all TS cells in current buffer.
* Appearently, we are called for every single TS cell.
*/
for (h.ts = h.buf, h.ts_end = h.buf + h.buf_len;
h.ts < h.ts_end; /* no incr. */) {
if (h.new_ts) {
/* We are about to process a new TS cell. */
if (dvb_net_ule_new_ts_cell(&h))
continue;
}
/* Synchronize on PUSI, if required. */
if (h.priv->need_pusi) {
if (dvb_net_ule_ts_pusi(&h))
continue;
}
if (h.new_ts) {
if (dvb_net_ule_new_ts(&h))
continue;
}
/* Check if new payload needs to be started. */
if (h.priv->ule_skb == NULL) {
ret = dvb_net_ule_new_payload(&h);
if (ret < 0)
return;
if (ret)
continue;
}
/* Copy data into our current skb. */
h.how_much = min(h.priv->ule_sndu_remain, (int)h.ts_remain);
memcpy(skb_put(h.priv->ule_skb, h.how_much),
h.from_where, h.how_much);
h.priv->ule_sndu_remain -= h.how_much;
h.ts_remain -= h.how_much;
h.from_where += h.how_much;
/* Check for complete payload. */
if (h.priv->ule_sndu_remain <= 0) {
/* Check CRC32, we've got it in our skb already. */
__be16 ulen = htons(h.priv->ule_sndu_len);
__be16 utype = htons(h.priv->ule_sndu_type);
const u8 *tail;
struct kvec iov[3] = {
{ &ulen, sizeof ulen },
{ &utype, sizeof utype },
{ h.priv->ule_skb->data,
h.priv->ule_skb->len - 4 }
};
u32 ule_crc = ~0L, expected_crc;
if (h.priv->ule_dbit) {
/* Set D-bit for CRC32 verification,
* if it was set originally. */
ulen |= htons(0x8000);
}
ule_crc = iov_crc32(ule_crc, iov, 3);
tail = skb_tail_pointer(h.priv->ule_skb);
expected_crc = *(tail - 4) << 24 |
*(tail - 3) << 16 |
*(tail - 2) << 8 |
*(tail - 1);
dvb_net_ule_check_crc(&h, ule_crc, expected_crc);
/* Prepare for next SNDU. */ /* Prepare for next SNDU. */
reset_ule(h.priv); reset_ule(h.priv);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7