d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the usbdump utility work again by using the correct BPF structures.

Browse Source 
MFC after:	3 days
This commit is contained in:
Hans Petter Selasky 2011-10-17 15:54:20 +00:00
parent 8d68b75b54
commit 6a3b2e7773
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
usr.sbin/usbdump/usbdump.c
View File

@ -283,7 +283,7 @@ hexdump(const uint8_t *region, uint32_t len)
}
static void
print_apacket(const struct bpf_xhdr *hdr, const uint8_t *ptr, int ptr_len)
print_apacket(const struct bpf_hdr *hdr, const uint8_t *ptr, int ptr_len)
{
struct tm *tm;
struct usbpf_pkthdr up_temp;
@ -318,8 +318,8 @@ print_apacket(const struct bpf_xhdr *hdr, const uint8_t *ptr, int ptr_len)
up->up_packet_count = le32toh(up->up_packet_count);
up->up_endpoint = le32toh(up->up_endpoint);
tv.tv_sec = hdr->bh_tstamp.bt_sec;
tv.tv_usec = hdr->bh_tstamp.bt_frac;
tv.tv_sec = hdr->bh_tstamp.tv_sec;
tv.tv_usec = hdr->bh_tstamp.tv_usec;
tm = localtime(&tv.tv_sec);
len = strftime(buf, sizeof(buf), "%H:%M:%S", tm);
@ -386,12 +386,12 @@ print_apacket(const struct bpf_xhdr *hdr, const uint8_t *ptr, int ptr_len)
static void
print_packets(uint8_t *data, const int datalen)
{
const struct bpf_xhdr *hdr;
const struct bpf_hdr *hdr;
uint8_t *ptr;
uint8_t *next;
for (ptr = data; ptr < (data + datalen); ptr = next) {
hdr = (const struct bpf_xhdr *)ptr;
hdr = (const struct bpf_hdr *)ptr;
next = ptr + BPF_WORDALIGN(hdr->bh_hdrlen + hdr->bh_caplen);
if (w_arg == NULL) {