Package: libpcap
Version: 1.0.0-6
Severity: normal
Tags: patch
Hi,
the packet header used by usbmon has changed, leading to garbage data in
recorded packets and missing information at the end. This patch
rectifies the latter problem; individual users need to fix their
expectations on packet format as well.
Simon
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-trunk-amd64 (SMP w/2 CPU cores)
Locale: LANG=ja_JP.UTF-8, LC_CTYPE=ja_JP.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru libpcap-1.0.0/debian/changelog libpcap-1.0.0/debian/changelog
--- libpcap-1.0.0/debian/changelog 2009-12-12 18:03:47.000000000 +0100
+++ libpcap-1.0.0/debian/changelog 2010-02-22 22:53:51.000000000 +0100
@@ -1,3 +1,9 @@
+libpcap (1.0.0-7) unstable; urgency=low
+
+ * debian/patches/60_update_usbmon_header.diff: There are now 16 extra bytes
+
+ -- Simon Richter <s...@debian.org> Mon, 22 Feb 2010 22:52:46 +0100
+
libpcap (1.0.0-6) unstable; urgency=low
* debian/patches/50_kfreebsd.diff: Disable zerocopy BPF detection
diff -Nru libpcap-1.0.0/debian/patches/60_update_usbmon_header.diff libpcap-1.0.0/debian/patches/60_update_usbmon_header.diff
--- libpcap-1.0.0/debian/patches/60_update_usbmon_header.diff 1970-01-01 01:00:00.000000000 +0100
+++ libpcap-1.0.0/debian/patches/60_update_usbmon_header.diff 2010-02-22 23:05:09.000000000 +0100
@@ -0,0 +1,30 @@
+Description: Update usbmon header definition
+ The usbmon interface added a few additional fields. While the exact definition
+ is unimportant, this changes the size of the header structure, so the entire
+ packet is copied to the output.
+Author: Simon Richter <s...@debian.org>
+Last-Update: 2010-02-22
+
+---
+
+--- libpcap-1.0.0.orig/pcap/usb.h
++++ libpcap-1.0.0/pcap/usb.h
+@@ -83,7 +83,17 @@ typedef struct _usb_header {
+ int32_t status;
+ u_int32_t urb_len;
+ u_int32_t data_len; /* amount of urb data really present in this event*/
+- pcap_usb_setup setup;
++ union {
++ pcap_usb_setup setup;
++ struct iso_rec {
++ u_int32_t error_count;
++ u_int32_t numdesc;
++ } iso;
++ };
++ u_int32_t interval;
++ u_int32_t start_frame;
++ u_int32_t xfer_flags;
++ u_int32_t ndesc; /* Actual number of ISO descriptors */
+ } pcap_usb_header;
+
+
diff -Nru libpcap-1.0.0/debian/patches/series libpcap-1.0.0/debian/patches/series
--- libpcap-1.0.0/debian/patches/series 2009-11-29 14:29:55.000000000 +0100
+++ libpcap-1.0.0/debian/patches/series 2010-02-22 22:52:38.000000000 +0100
@@ -7,3 +7,4 @@
40_fix_bus_usb_path.diff
50_kfreebsd.diff
50_autotools-dev.diff
+60_update_usbmon_header.diff
