Mailing List archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[linux-dvb] Patch: ULE implementation, release 2, for Linux 2.4
Hi again,
so, here it is, the patch for the linux_2_4 branch of the dvb-kernel module,
checked out today (03 Dec 2004).
I did a 'cvs diff -up' this time... (bin ja lernfaehig ;-).
It compiles cleanly against a 2.4.27 kernel on a RH 9 system.
I tried on a FC3, 2.4.28 kernel, but there is a problem with the build
environment. Specifically, this is a problem related to gcc (FC3's gcc
version) and include processing, I think. I get the following compile error,
pasted in below.
regards,
-wolfi
Johannes Stezenbach wrote:
Hi,
Wolfram Stering wrote:
please find attached a revised and improved version of our ULE decoder
implementation, release 2.
Comitted to CVS. Thanks a lot!
Do you know if there are any ULE streams transmitted over public
networks somewhere?
diff -r1.52 dvb_net.c
Please next time use diff -up, it makes patches much more readable
and more likely to apply if there are concurrent changes.
If there is a demand to have this in the linux_2_4 branch, please
tell me, because the patch does not apply cleanly there (two rejects).
Johannes
--
Wolfram Stering, <wolfi@cosy.sbg.ac.at>
Department of Scientific Computing, Salzburg University
Tel: +43 (0)662 8044 6334 Fax: +43 (0)662 8044 172
"If we knew what it was we were doing
it would not be called research, would it?"
----------------------------------------
make -C /data/src/linuxtv/dvb-kernel-linux_2_4/build-2.4
CFLAGS="-D__KERNEL__ -I/data/KERNEL/linux-2.4.28/include -Wall
-Wstrict-prototypes -Wno-trigraphs -O2 -fno-strict-aliasing -fno-common -pipe
-mpreferred-stack-boundary=2 -march=i686 -fno-unit-at-a-time -DMODULE
-DMODVERSIONS -include /data/KERNEL/linux-2.4.28/include/linux/modversions.h"
MAKING_MODULES=1 modules
make[2]: Entering directory `/data/src/linuxtv/dvb-kernel-linux_2_4/build-2.4'
gcc -I/data/src/linuxtv/dvb-kernel-linux_2_4/build-2.4/include -D__KERNEL__
-I/data/KERNEL/linux-2.4.28/include -Wall -Wstrict-prototypes -Wno-trigraphs
-O2 -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2
-march=i686 -fno-unit-at-a-time -DMODULE -DMODVERSIONS -include
/data/KERNEL/linux-2.4.28/include/linux/modversions.h -MD -I ../linux/include
-I . -DCONFIG_DVB_AV7110_OSD -nostdinc -iwithprefix include
-DKBUILD_BASENAME=video_buf -DEXPORT_SYMTAB -c video-buf.c
In file included from
/data/src/linuxtv/dvb-kernel-linux_2_4/build-2.4/include/media/video-buf.h:19,
from video-buf.c:29:
/data/src/linuxtv/dvb-kernel-linux_2_4/build-2.4/include/linux/videodev.h:15:26:
linux/device.h: No such file or directory
In file included from
/data/src/linuxtv/dvb-kernel-linux_2_4/build-2.4/include/media/video-buf.h:19,
from video-buf.c:29:
/data/src/linuxtv/dvb-kernel-linux_2_4/build-2.4/include/linux/videodev.h:46:
error: field `class_dev' has incomplete type
/data/src/linuxtv/dvb-kernel-linux_2_4/build-2.4/include/linux/videodev.h:63:
warning: "struct class_device_attribute" declared inside parameter list
/data/src/linuxtv/dvb-kernel-linux_2_4/build-2.4/include/linux/videodev.h:63:
warning: its scope is only this definition or declaration, which is probably
not what you want
/data/src/linuxtv/dvb-kernel-linux_2_4/build-2.4/include/linux/videodev.h: In
function `video_device_create_file':
/data/src/linuxtv/dvb-kernel-linux_2_4/build-2.4/include/linux/videodev.h:65:
warning: implicit declaration of function `class_device_create_file'
/data/src/linuxtv/dvb-kernel-linux_2_4/build-2.4/include/linux/videodev.h: At
top level:
/data/src/linuxtv/dvb-kernel-linux_2_4/build-2.4/include/linux/videodev.h:69:
warning: "struct class_device_attribute" declared inside parameter list
/data/src/linuxtv/dvb-kernel-linux_2_4/build-2.4/include/linux/videodev.h: In
function `video_device_remove_file':
/data/src/linuxtv/dvb-kernel-linux_2_4/build-2.4/include/linux/videodev.h:71:
warning: implicit declaration of function `class_device_remove_file'
make[2]: *** [video-buf.o] Error 1
make[2]: Leaving directory `/data/src/linuxtv/dvb-kernel-linux_2_4/build-2.4'
make[1]: *** [_mod_/data/src/linuxtv/dvb-kernel-linux_2_4/build-2.4] Error 2
make[1]: Leaving directory `/data/KERNEL/linux-2.4.28'
make: *** [build] Error 2
----------------------------------------------------
Index: linux/drivers/media/dvb/dvb-core/dvb_net.c
===================================================================
RCS file: /cvs/linuxtv/dvb-kernel/linux/drivers/media/dvb/dvb-core/dvb_net.c,v
retrieving revision 1.43.2.2
diff -u -p -r1.43.2.2 dvb_net.c
--- linux/drivers/media/dvb/dvb-core/dvb_net.c 1 Dec 2004 16:31:49 -0000 1.43.2.2
+++ linux/drivers/media/dvb/dvb-core/dvb_net.c 3 Dec 2004 10:48:12 -0000
@@ -6,13 +6,13 @@
* Copyright (C) 2002 Ralph Metzler <rjkm@metzlerbros.de>
*
* ULE Decapsulation code:
- * Copyright (C) 2003 gcs - Global Communication & Services GmbH.
- * and Institute for Computer Sciences
- * Salzburg University.
- * Hilmar Linder <hlinder@cosy.sbg.ac.at>
- * and Wolfram Stering <wstering@cosy.sbg.ac.at>
+ * Copyright (C) 2003, 2004 gcs - Global Communication & Services GmbH.
+ * and Department of Scientific Computing
+ * Paris Lodron University of Salzburg.
+ * Hilmar Linder <hlinder@cosy.sbg.ac.at>
+ * and Wolfram Stering <wstering@cosy.sbg.ac.at>
*
- * ULE Decaps according to draft-fair-ipdvb-ule-01.txt.
+ * ULE Decaps according to draft-ietf-ipdvb-ule-03.txt.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -30,6 +30,30 @@
* Or, point your browser to http://www.gnu.org/copyleft/gpl.html
*/
+/*
+ * ULE ChangeLog:
+ * Feb 2004: hl/ws v1: Implementing draft-fair-ipdvb-ule-01.txt
+ *
+ * Dec 2004: hl/ws v2: Implementing draft-ietf-ipdvb-ule-03.txt:
+ * ULE Extension header handling.
+ * Bugreports by Moritz Vieth and Hanno Tersteegen,
+ * Fraunhofer Institute for Open Communication Systems
+ * Competence Center for Advanced Satellite Communications.
+ * Bugfixes and robustness improvements.
+ * Filtering on dest MAC addresses, if present (D-Bit = 0)
+ * ULE_DEBUG compile-time option.
+ */
+
+/*
+ * FIXME / TODO (dvb_net.c):
+ *
+ * Unloading does not work for 2.6.9 kernels: a refcount doesn't go to zero.
+ *
+ * TS_FEED callback is called once for every single TS cell although it is
+ * registered (in dvb_net_feed_start()) for 100 TS cells (used for dvb_net_ule()).
+ *
+ */
+
#include <linux/kernel.h>
#include <linux/netdevice.h>
#include <linux/etherdevice.h>
@@ -61,6 +85,10 @@ static inline __u32 iov_crc32( __u32 c,
#define DVB_NET_MULTICAST_MAX 10
+#undef ULE_DEBUG
+
+#ifdef ULE_DEBUG
+
#define isprint(c) ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9'))
static void hexdump( const unsigned char *buf, unsigned short len )
@@ -90,6 +118,7 @@ static void hexdump( const unsigned char
}
}
+#endif
struct dvb_net_priv {
int in_use;
@@ -111,18 +140,19 @@ struct dvb_net_priv {
#define RX_MODE_PROMISC 3
struct work_struct set_multicast_list_wq;
struct work_struct restart_net_feed_wq;
- unsigned char feedtype;
- int need_pusi;
- unsigned char tscc; /* TS continuity counter after sync. */
- struct sk_buff *ule_skb;
- unsigned short ule_sndu_len;
- unsigned short ule_sndu_type;
- unsigned char ule_sndu_type_1;
- unsigned char ule_dbit; /* whether the DestMAC address present
- * bit is set or not. */
- unsigned char ule_ethhdr_complete; /* whether we have completed the Ethernet
- * header for the current ULE SNDU. */
- int ule_sndu_remain;
+ unsigned char feedtype; /* Either FEED_TYPE_SECTION or FEED_TYPE_ULE */
+ int need_pusi; /* Set to 1, if synchronization on PUSI required. */
+ unsigned char tscc; /* TS continuity counter after sync on PUSI. */
+ struct sk_buff *ule_skb; /* ULE SNDU decodes into this buffer. */
+ unsigned char *ule_next_hdr; /* Pointer into skb to next ULE extension header. */
+ unsigned short ule_sndu_len; /* ULE SNDU length in bytes, w/o D-Bit. */
+ unsigned short ule_sndu_type; /* ULE SNDU type field, complete. */
+ unsigned char ule_sndu_type_1; /* ULE SNDU type field, if split across 2 TS cells. */
+ unsigned char ule_dbit; /* Whether the DestMAC address present
+ * or not (bit is set). */
+ unsigned char ule_bridged; /* Whether the ULE_BRIDGED extension header was found. */
+ int ule_sndu_remain; /* Nr. of bytes still required for current ULE SNDU. */
+ unsigned long ts_count; /* Current ts cell counter. */
};
@@ -174,78 +204,190 @@ static unsigned short dvb_net_eth_type_t
#define TS_SZ 188
#define TS_SYNC 0x47
#define TS_TEI 0x80
+#define TS_SC 0xC0
#define TS_PUSI 0x40
#define TS_AF_A 0x20
#define TS_AF_D 0x10
#define ULE_TEST 0
#define ULE_BRIDGED 1
-#define ULE_LLC 2
+
+int ule_test_sndu( struct dvb_net_priv *p )
+{
+ return -1;
+}
+
+int ule_bridged_sndu( struct dvb_net_priv *p )
+{
+ /* BRIDGE SNDU handling sucks in draft-ietf-ipdvb-ule-03.txt.
+ * This has to be the last extension header, otherwise it won't work.
+ * Blame the authors!
+ */
+ p->ule_bridged = 1;
+ return 0;
+}
+
+
+/** Handle ULE extension headers.
+ * Function is called after a successful CRC32 verification of an ULE SNDU to complete its decoding.
+ * Returns: >= 0: nr. of bytes consumed by next extension header
+ * -1: Mandatory extension header that is not recognized or TEST SNDU; discard.
+ */
+static int handle_one_ule_extension( struct dvb_net_priv *p )
+{
+ /* Table of mandatory extension header handlers. The header type is the index. */
+ static int (*ule_mandatory_ext_handlers[255])( struct dvb_net_priv *p ) =
+ { [0] = ule_test_sndu, [1] = ule_bridged_sndu, [2] = NULL, };
+
+ /* Table of optional extension header handlers. The header type is the index. */
+ static int (*ule_optional_ext_handlers[255])( struct dvb_net_priv *p ) = { NULL, };
+
+ int ext_len = 0;
+ unsigned char hlen = (p->ule_sndu_type & 0x0700) >> 8;
+ unsigned char htype = p->ule_sndu_type & 0x00FF;
+
+ /* Discriminate mandatory and optional extension headers. */
+ if (hlen == 0) {
+ /* Mandatory extension header */
+ if (ule_mandatory_ext_handlers[htype]) {
+ ext_len = ule_mandatory_ext_handlers[htype]( p );
+ p->ule_next_hdr += ext_len;
+ if (! p->ule_bridged) {
+ p->ule_sndu_type = ntohs( *(unsigned short *)p->ule_next_hdr );
+ p->ule_next_hdr += 2;
+ } else {
+ p->ule_sndu_type = ntohs( *(unsigned short *)(p->ule_next_hdr + ((p->ule_dbit ? 2 : 3) * ETH_ALEN)) );
+ /* This assures the extension handling loop will terminate. */
+ }
+ } else
+ ext_len = -1; /* SNDU has to be discarded. */
+ } else {
+ /* Optional extension header. Calculate the length. */
+ ext_len = hlen << 2;
+ /* Process the optional extension header according to its type. */
+ if (ule_optional_ext_handlers[htype])
+ (void)ule_optional_ext_handlers[htype]( p );
+ p->ule_next_hdr += ext_len;
+ p->ule_sndu_type = ntohs( *(unsigned short *)p->ule_next_hdr );
+ p->ule_next_hdr += 2;
+ }
+
+ return ext_len;
+}
+
+static int handle_ule_extensions( struct dvb_net_priv *p )
+{
+ int total_ext_len = 0, l;
+
+ p->ule_next_hdr = p->ule_skb->data;
+ do {
+ l = handle_one_ule_extension( p );
+ if (l == -1) return -1; /* Stop extension header processing and discard SNDU. */
+ total_ext_len += l;
+
+ } while (p->ule_sndu_type < 1536);
+
+ return total_ext_len;
+}
static inline void reset_ule( struct dvb_net_priv *p )
{
p->ule_skb = NULL;
+ p->ule_next_hdr = NULL;
p->ule_sndu_len = 0;
p->ule_sndu_type = 0;
p->ule_sndu_type_1 = 0;
p->ule_sndu_remain = 0;
p->ule_dbit = 0xFF;
- p->ule_ethhdr_complete = 0;
+ p->ule_bridged = 0;
}
-static const char eth_dest_addr[] = { 0x0b, 0x0a, 0x09, 0x08, 0x04, 0x03 };
-
+/**
+ * Decode ULE SNDUs according to draft-ietf-ipdvb-ule-03.txt from a sequence of
+ * TS cells of a single PID.
+ */
static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )
{
struct dvb_net_priv *priv = (struct dvb_net_priv *)dev->priv;
- unsigned long skipped = 0L, skblen = 0L;
+ unsigned long skipped = 0L;
u8 *ts, *ts_end, *from_where = NULL, ts_remain = 0, how_much = 0, new_ts = 1;
struct ethhdr *ethh = NULL;
- unsigned int emergency_count = 0;
+
+#ifdef ULE_DEBUG
+ /* The code inside ULE_DEBUG keeps a history of the last 100 TS cells processed. */
+ static unsigned char ule_hist[100*TS_SZ];
+ static unsigned char *ule_where = ule_hist, ule_dump = 0;
+#endif
if (dev == NULL) {
printk( KERN_ERR "NO netdev struct!\n" );
return;
}
- for (ts = (char *)buf, ts_end = (char *)buf + buf_len; ts < ts_end; ) {
-
- if (emergency_count++ > 200) {
- /* Huh?? */
- hexdump(ts, TS_SZ);
- printk(KERN_WARNING "*** LOOP ALERT! ts %p ts_remain %u "
- "how_much %u, ule_skb %p, ule_len %u, ule_remain %u\n",
- ts, ts_remain, how_much, priv->ule_skb,
- priv->ule_sndu_len, priv->ule_sndu_remain);
- break;
- }
+ /* For all TS cells in current buffer.
+ * Appearently, we are called for every single TS cell.
+ */
+ for (ts = (char *)buf, ts_end = (char *)buf + buf_len; ts < ts_end; /* no default incr. */ ) {
if (new_ts) {
- if ((ts[0] != TS_SYNC) || (ts[1] & TS_TEI)) {
- printk(KERN_WARNING "Invalid TS cell: SYNC %#x, TEI %u.\n",
- ts[0], ts[1] & TS_TEI >> 7);
+ /* We are about to process a new TS cell. */
+
+#ifdef ULE_DEBUG
+ if (ule_where >= &ule_hist[100*TS_SZ]) ule_where = ule_hist;
+ memcpy( ule_where, ts, TS_SZ );
+ if (ule_dump) {
+ hexdump( ule_where, TS_SZ );
+ ule_dump = 0;
+ }
+ ule_where += TS_SZ;
+#endif
+
+ /* Check TS error conditions: sync_byte, transport_error_indicator, scrambling_control . */
+ if ((ts[0] != TS_SYNC) || (ts[1] & TS_TEI) || ((ts[3] & TS_SC) != 0)) {
+ printk(KERN_WARNING "%lu: Invalid TS cell: SYNC %#x, TEI %u, SC %#x.\n",
+ priv->ts_count, ts[0], ts[1] & TS_TEI >> 7, ts[3] & 0xC0 >> 6);
+
+ /* Drop partly decoded SNDU, reset state, resync on PUSI. */
+ if (priv->ule_skb) {
+ dev_kfree_skb( priv->ule_skb );
+ /* Prepare for next SNDU. */
+ ((struct dvb_net_priv *) dev->priv)->stats.rx_errors++;
+ ((struct dvb_net_priv *) dev->priv)->stats.rx_frame_errors++;
+ }
+ reset_ule(priv);
+ priv->need_pusi = 1;
+
+ /* Continue with next TS cell. */
+ ts += TS_SZ;
+ priv->ts_count++;
continue;
}
+
ts_remain = 184;
from_where = ts + 4;
}
/* Synchronize on PUSI, if required. */
if (priv->need_pusi) {
if (ts[1] & TS_PUSI) {
- /* Find beginning of first ULE SNDU in current TS cell.
- * priv->need_pusi = 0; */
+ /* Find beginning of first ULE SNDU in current TS cell. */
+ /* Synchronize continuity counter. */
priv->tscc = ts[3] & 0x0F;
/* There is a pointer field here. */
if (ts[4] > ts_remain) {
- printk(KERN_ERR "Invalid ULE packet "
- "(pointer field %d)\n", ts[4]);
+ printk(KERN_ERR "%lu: Invalid ULE packet "
+ "(pointer field %d)\n", priv->ts_count, ts[4]);
+ ts += TS_SZ;
+ priv->ts_count++;
continue;
}
+ /* Skip to destination of pointer field. */
from_where = &ts[5] + ts[4];
ts_remain -= 1 + ts[4];
skipped = 0;
} else {
skipped++;
+ ts += TS_SZ;
+ priv->ts_count++;
continue;
}
}
@@ -256,32 +398,45 @@ static void dvb_net_ule( struct net_devi
priv->tscc = (priv->tscc + 1) & 0x0F;
else {
/* TS discontinuity handling: */
+ printk(KERN_WARNING "%lu: TS discontinuity: got %#x, "
+ "exptected %#x.\n", priv->ts_count, ts[3] & 0x0F, priv->tscc);
+ /* Drop partly decoded SNDU, reset state, resync on PUSI. */
if (priv->ule_skb) {
dev_kfree_skb( priv->ule_skb );
/* Prepare for next SNDU. */
- reset_ule(priv);
+ // reset_ule(priv); moved to below.
((struct dvb_net_priv *) dev->priv)->stats.rx_errors++;
((struct dvb_net_priv *) dev->priv)->stats.rx_frame_errors++;
}
+ reset_ule(priv);
/* skip to next PUSI. */
- printk(KERN_WARNING "TS discontinuity: got %#x, "
- "exptected %#x.\n", ts[3] & 0x0F, priv->tscc);
priv->need_pusi = 1;
+ ts += TS_SZ;
+ priv->ts_count++;
continue;
}
/* 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
- * cells (continuity counter). */
+ * cells (continuity counter wrap). */
if (ts[1] & TS_PUSI) {
if (! priv->need_pusi) {
- /* printk(KERN_WARNING "Skipping pointer field %u.\n", *from_where); */
if (*from_where > 181) {
- printk(KERN_WARNING "*** Invalid pointer "
- "field: %u. Current TS cell "
- "follows:\n", *from_where);
- hexdump( ts, TS_SZ );
- printk(KERN_WARNING "-------------------\n");
+ /* Pointer field is invalid. Drop this TS cell and any started ULE SNDU. */
+ printk(KERN_WARNING "%lu: Invalid pointer "
+ "field: %u.\n", priv->ts_count, *from_where);
+
+ /* Drop partly decoded SNDU, reset state, resync on PUSI. */
+ if (priv->ule_skb) {
+ dev_kfree_skb( priv->ule_skb );
+ ((struct dvb_net_priv *) dev->priv)->stats.rx_errors++;
+ ((struct dvb_net_priv *) dev->priv)->stats.rx_frame_errors++;
+ }
+ reset_ule(priv);
+ priv->need_pusi = 1;
+ ts += TS_SZ;
+ priv->ts_count++;
+ continue;
}
/* Skip pointer field (we're processing a
* packed payload). */
@@ -291,21 +446,26 @@ static void dvb_net_ule( struct net_devi
priv->need_pusi = 0;
if (priv->ule_sndu_remain > 183) {
+ /* Current SNDU lacks more data than there could be available in the
+ * current TS cell. */
((struct dvb_net_priv *) dev->priv)->stats.rx_errors++;
((struct dvb_net_priv *) dev->priv)->stats.rx_length_errors++;
- printk(KERN_WARNING "Expected %d more SNDU bytes, but "
- "got PUSI. Flushing incomplete payload.\n",
- priv->ule_sndu_remain);
+ printk(KERN_WARNING "%lu: Expected %d more SNDU bytes, but "
+ "got PUSI (pf %d, ts_remain %d). Flushing incomplete payload.\n",
+ priv->ts_count, priv->ule_sndu_remain, ts[4], ts_remain);
dev_kfree_skb(priv->ule_skb);
/* Prepare for next SNDU. */
reset_ule(priv);
+ /* Resync: go to where pointer field points to: start of next ULE SNDU. */
+ from_where += ts[4];
+ ts_remain -= ts[4];
}
}
}
/* Check if new payload needs to be started. */
if (priv->ule_skb == NULL) {
- /* Start a new payload w/ skb.
+ /* Start a new payload with skb.
* Find ULE header. It is only guaranteed that the
* length field (2 bytes) is contained in the current
* TS.
@@ -319,6 +479,7 @@ static void dvb_net_ule( struct net_devi
}
if (! priv->ule_sndu_len) {
+ /* Got at least two bytes, thus extrace the SNDU length. */
priv->ule_sndu_len = from_where[0] << 8 | from_where[1];
if (priv->ule_sndu_len & 0x8000) {
/* D-Bit is set: no dest mac present. */
@@ -327,17 +488,14 @@ static void dvb_net_ule( struct net_devi
} else
priv->ule_dbit = 0;
- /* printk(KERN_WARNING "ULE D-Bit: %d, SNDU len %u.\n",
- priv->ule_dbit, priv->ule_sndu_len); */
-
if (priv->ule_sndu_len > 32763) {
- printk(KERN_WARNING "Invalid ULE SNDU length %u. "
- "Resyncing.\n", priv->ule_sndu_len);
- hexdump(ts, TS_SZ);
+ printk(KERN_WARNING "%lu: Invalid ULE SNDU length %u. "
+ "Resyncing.\n", priv->ts_count, priv->ule_sndu_len);
priv->ule_sndu_len = 0;
priv->need_pusi = 1;
new_ts = 1;
ts += TS_SZ;
+ priv->ts_count++;
continue;
}
ts_remain -= 2; /* consume the 2 bytes SNDU length. */
@@ -355,11 +513,12 @@ static void dvb_net_ule( struct net_devi
case 1:
priv->ule_sndu_type = from_where[0] << 8;
priv->ule_sndu_type_1 = 1; /* first byte of ule_type is set. */
- /* ts_remain -= 1; from_where += 1;
- * here not necessary, because we continue. */
+ ts_remain -= 1; from_where += 1;
+ /* Continue w/ next TS. */
case 0:
new_ts = 1;
ts += TS_SZ;
+ priv->ts_count++;
continue;
default: /* complete ULE header is present in current TS. */
@@ -377,24 +536,9 @@ static void dvb_net_ule( struct net_devi
break;
}
- if (priv->ule_sndu_type == ULE_TEST) {
- /* Test SNDU, discarded by the receiver. */
- printk(KERN_WARNING "Discarding ULE Test SNDU (%d bytes). "
- "Resyncing.\n", priv->ule_sndu_len);
- priv->ule_sndu_len = 0;
- priv->need_pusi = 1;
- continue;
- }
-
- skblen = priv->ule_sndu_len; /* Including CRC32 */
- if (priv->ule_sndu_type != ULE_BRIDGED) {
- skblen += ETH_HLEN;
-#if 1
- if (! priv->ule_dbit)
- skblen -= ETH_ALEN;
-#endif
- }
- priv->ule_skb = dev_alloc_skb(skblen);
+ /* Allocate the skb (decoder target buffer) with the correct size, as follows:
+ * prepare for the largest case: bridged SNDU with MAC address (dbit = 0). */
+ priv->ule_skb = dev_alloc_skb( priv->ule_sndu_len + ETH_HLEN + ETH_ALEN );
if (priv->ule_skb == NULL) {
printk(KERN_NOTICE "%s: Memory squeeze, dropping packet.\n",
dev->name);
@@ -402,130 +546,129 @@ static void dvb_net_ule( struct net_devi
return;
}
-#if 0
- if (priv->ule_sndu_type != ULE_BRIDGED) {
- // skb_reserve(priv->ule_skb, 2); /* longword align L3 header */
- // Create Ethernet header.
- ethh = (struct ethhdr *)skb_put( priv->ule_skb, ETH_HLEN );
- memset( ethh->h_source, 0x00, ETH_ALEN );
- if (priv->ule_dbit) {
- // Dest MAC address not present --> generate our own.
- memcpy( ethh->h_dest, eth_dest_addr, ETH_ALEN );
- } else {
- // Dest MAC address could be split across two TS cells.
- // FIXME: implement.
-
- printk( KERN_WARNING "%s: got destination MAC "
- "address.\n", dev->name );
- memcpy( ethh->h_dest, eth_dest_addr, ETH_ALEN );
- }
- ethh->h_proto = htons(priv->ule_sndu_type == ULE_LLC ?
- priv->ule_sndu_len : priv->ule_sndu_type);
- }
-#endif
- /* this includes the CRC32 _and_ dest mac, if !dbit! */
+ /* This includes the CRC32 _and_ dest mac, if !dbit. */
priv->ule_sndu_remain = priv->ule_sndu_len;
priv->ule_skb->dev = dev;
+ /* Leave space for Ethernet or bridged SNDU header (eth hdr plus one MAC addr). */
+ skb_reserve( priv->ule_skb, ETH_HLEN + ETH_ALEN );
}
/* Copy data into our current skb. */
how_much = min(priv->ule_sndu_remain, (int)ts_remain);
- if ((priv->ule_ethhdr_complete < ETH_ALEN) &&
- (priv->ule_sndu_type != ULE_BRIDGED)) {
- ethh = (struct ethhdr *)priv->ule_skb->data;
- if (! priv->ule_dbit) {
- if (how_much >= (ETH_ALEN - priv->ule_ethhdr_complete)) {
- /* copy dest mac address. */
- memcpy(skb_put(priv->ule_skb,
- (ETH_ALEN - priv->ule_ethhdr_complete)),
- from_where,
- (ETH_ALEN - priv->ule_ethhdr_complete));
- memset(ethh->h_source, 0x00, ETH_ALEN);
- ethh->h_proto = htons(priv->ule_sndu_type == ULE_LLC ?
- priv->ule_sndu_len :
- priv->ule_sndu_type);
- skb_put(priv->ule_skb, ETH_ALEN + 2);
-
- how_much -= (ETH_ALEN - priv->ule_ethhdr_complete);
- priv->ule_sndu_remain -= (ETH_ALEN -
- priv->ule_ethhdr_complete);
- ts_remain -= (ETH_ALEN - priv->ule_ethhdr_complete);
- from_where += (ETH_ALEN - priv->ule_ethhdr_complete);
- priv->ule_ethhdr_complete = ETH_ALEN;
- }
- } else {
- /* Generate whole Ethernet header. */
- memcpy(ethh->h_dest, eth_dest_addr, ETH_ALEN);
- memset(ethh->h_source, 0x00, ETH_ALEN);
- ethh->h_proto = htons(priv->ule_sndu_type == ULE_LLC ?
- priv->ule_sndu_len : priv->ule_sndu_type);
- skb_put(priv->ule_skb, ETH_HLEN);
- priv->ule_ethhdr_complete = ETH_ALEN;
- }
- }
- /* printk(KERN_WARNING "Copying %u bytes, ule_sndu_remain = %u, "
- "ule_sndu_len = %u.\n", how_much, priv->ule_sndu_remain,
- priv->ule_sndu_len); */
memcpy(skb_put(priv->ule_skb, how_much), from_where, how_much);
priv->ule_sndu_remain -= how_much;
ts_remain -= how_much;
from_where += how_much;
- if ((priv->ule_ethhdr_complete < ETH_ALEN) &&
- (priv->ule_sndu_type != ULE_BRIDGED)) {
- priv->ule_ethhdr_complete += how_much;
- }
-
/* Check for complete payload. */
if (priv->ule_sndu_remain <= 0) {
/* Check CRC32, we've got it in our skb already. */
unsigned short ulen = htons(priv->ule_sndu_len);
unsigned short utype = htons(priv->ule_sndu_type);
- struct iovec iov[4] = {
+ struct iovec iov[3] = {
{ &ulen, sizeof ulen },
{ &utype, sizeof utype },
- { NULL, 0 },
- { priv->ule_skb->data + ETH_HLEN,
- priv->ule_skb->len - ETH_HLEN - 4 }
+ { priv->ule_skb->data, priv->ule_skb->len - 4 }
};
unsigned long ule_crc = ~0L, expected_crc;
if (priv->ule_dbit) {
/* Set D-bit for CRC32 verification,
* if it was set originally. */
ulen |= 0x0080;
- } else {
- iov[2].iov_base = priv->ule_skb->data;
- iov[2].iov_len = ETH_ALEN;
}
- ule_crc = iov_crc32(ule_crc, iov, 4);
+
+ ule_crc = iov_crc32(ule_crc, iov, 3);
expected_crc = *((u8 *)priv->ule_skb->tail - 4) << 24 |
- *((u8 *)priv->ule_skb->tail - 3) << 16 |
- *((u8 *)priv->ule_skb->tail - 2) << 8 |
- *((u8 *)priv->ule_skb->tail - 1);
+ *((u8 *)priv->ule_skb->tail - 3) << 16 |
+ *((u8 *)priv->ule_skb->tail - 2) << 8 |
+ *((u8 *)priv->ule_skb->tail - 1);
if (ule_crc != expected_crc) {
- printk(KERN_WARNING "CRC32 check %s: %#lx / %#lx.\n",
- ule_crc != expected_crc ? "FAILED" : "OK",
- ule_crc, expected_crc);
- hexdump(priv->ule_skb->data + ETH_HLEN,
- priv->ule_skb->len - ETH_HLEN);
+ printk(KERN_WARNING "%lu: CRC32 check FAILED: %#lx / %#lx, SNDU len %d type %#x, ts_remain %d, next 2: %x.\n",
+ priv->ts_count, ule_crc, expected_crc, priv->ule_sndu_len, priv->ule_sndu_type, ts_remain, ts_remain > 2 ? *(unsigned short *)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 (ule_where == ule_hist) {
+ hexdump( &ule_hist[98*TS_SZ], TS_SZ );
+ hexdump( &ule_hist[99*TS_SZ], TS_SZ );
+ } else if (ule_where == &ule_hist[TS_SZ]) {
+ hexdump( &ule_hist[99*TS_SZ], TS_SZ );
+ hexdump( ule_hist, TS_SZ );
+ } else {
+ hexdump( ule_where - TS_SZ - TS_SZ, TS_SZ );
+ hexdump( ule_where - TS_SZ, TS_SZ );
+ }
+ ule_dump = 1;
+#endif
((struct dvb_net_priv *) dev->priv)->stats.rx_errors++;
((struct dvb_net_priv *) dev->priv)->stats.rx_crc_errors++;
dev_kfree_skb(priv->ule_skb);
} else {
+ /* CRC32 verified OK. */
+ /* Handle ULE Extension Headers. */
+ if (priv->ule_sndu_type < 1536) {
+ /* There is an extension header. Handle it accordingly. */
+ int l = handle_ule_extensions( priv );
+ if (l < 0) {
+ /* Mandatory extension header unknown or TEST SNDU. Drop it. */
+ // printk( KERN_WARNING "Dropping SNDU, extension headers.\n" );
+ dev_kfree_skb( priv->ule_skb );
+ goto sndu_done;
+ }
+ skb_pull( priv->ule_skb, l );
+ }
+
/* CRC32 was OK. Remove it from skb. */
priv->ule_skb->tail -= 4;
priv->ule_skb->len -= 4;
+
+ /* Filter on receiver's destination MAC address, if present. */
+ if (!priv->ule_dbit) {
+ /* The destination MAC address is the next data in the skb. */
+ if (memcmp( priv->ule_skb->data, dev->dev_addr, ETH_ALEN )) {
+ /* MAC addresses don't match. Drop SNDU. */
+ // printk( KERN_WARNING "Dropping SNDU, MAC address.\n" );
+ dev_kfree_skb( priv->ule_skb );
+ goto sndu_done;
+ }
+ if (! priv->ule_bridged) {
+ skb_push( priv->ule_skb, ETH_ALEN + 2 );
+ ethh = (struct ethhdr *)priv->ule_skb->data;
+ memcpy( ethh->h_dest, ethh->h_source, ETH_ALEN );
+ memset( ethh->h_source, 0, ETH_ALEN );
+ ethh->h_proto = htons( priv->ule_sndu_type );
+ } else {
+ /* Skip the Receiver destination MAC address. */
+ skb_pull( priv->ule_skb, ETH_ALEN );
+ }
+ } else {
+ if (! priv->ule_bridged) {
+ skb_push( priv->ule_skb, ETH_HLEN );
+ ethh = (struct ethhdr *)priv->ule_skb->data;
+ memcpy( ethh->h_dest, dev->dev_addr, ETH_ALEN );
+ memset( ethh->h_source, 0, ETH_ALEN );
+ ethh->h_proto = htons( priv->ule_sndu_type );
+ } else {
+ /* skb is in correct state; nothing to do. */
+ }
+ }
+ priv->ule_bridged = 0;
+
/* Stuff into kernel's protocol stack. */
priv->ule_skb->protocol = dvb_net_eth_type_trans(priv->ule_skb, dev);
/* If D-bit is set (i.e. destination MAC address not present),
- * receive the packet anyhw. */
- /* if (priv->ule_dbit && skb->pkt_type == PACKET_OTHERHOST) */
- priv->ule_skb->pkt_type = PACKET_HOST;
+ * receive the packet anyhow. */
+ /* if (priv->ule_dbit && skb->pkt_type == PACKET_OTHERHOST)
+ priv->ule_skb->pkt_type = PACKET_HOST; */
((struct dvb_net_priv *) dev->priv)->stats.rx_packets++;
((struct dvb_net_priv *) dev->priv)->stats.rx_bytes += priv->ule_skb->len;
netif_rx(priv->ule_skb);
}
+ sndu_done:
/* Prepare for next SNDU. */
reset_ule(priv);
}
@@ -545,6 +688,7 @@ static void dvb_net_ule( struct net_devi
} else {
new_ts = 1;
ts += TS_SZ;
+ priv->ts_count++;
if (priv->ule_skb == NULL) {
priv->need_pusi = 1;
priv->ule_sndu_type_1 = 0;
Home |
Main Index |
Thread Index