From owner-svn-src-stable@FreeBSD.ORG Thu Oct 20 14:45:17 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 27D7B1065674; Thu, 20 Oct 2011 14:45:17 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1704A8FC12; Thu, 20 Oct 2011 14:45:17 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9KEjGT6078880; Thu, 20 Oct 2011 14:45:16 GMT (envelope-from hselasky@svn.freebsd.org) Received: (from hselasky@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9KEjG2h078878; Thu, 20 Oct 2011 14:45:16 GMT (envelope-from hselasky@svn.freebsd.org) Message-Id: <201110201445.p9KEjG2h078878@svn.freebsd.org> From: Hans Petter Selasky Date: Thu, 20 Oct 2011 14:45:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r226565 - stable/9/usr.sbin/usbdump X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Oct 2011 14:45:17 -0000 Author: hselasky Date: Thu Oct 20 14:45:16 2011 New Revision: 226565 URL: http://svn.freebsd.org/changeset/base/226565 Log: MFC r226474: Make the usbdump utility work again by using the correct BPF structures. Approved by: re (kib) Modified: stable/9/usr.sbin/usbdump/usbdump.c Directory Properties: stable/9/usr.sbin/usbdump/ (props changed) Modified: stable/9/usr.sbin/usbdump/usbdump.c ============================================================================== --- stable/9/usr.sbin/usbdump/usbdump.c Thu Oct 20 13:41:37 2011 (r226564) +++ stable/9/usr.sbin/usbdump/usbdump.c Thu Oct 20 14:45:16 2011 (r226565) @@ -283,7 +283,7 @@ hexdump(const uint8_t *region, uint32_t } 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 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 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) {