Makefile.in: don't remove configure and config.h.in in make distclean.

[tcpdump] / print-usb.c

diff --git a/print-usb.c b/print-usb.c
index 56e6dd4674b9d4ac186b0f6552ad3c95050830cf..3f5937ba16cab5037183b22ad9b2c45f8d74eb22 100644 (file)
--- a/print-usb.c
+++ b/print-usb.c
@@ -27,6 +27,7 @@
 
 #include "netdissect-stdinc.h"
 
+#define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "extract.h"
 
@@ -187,7 +188,14 @@ usb_header_print(netdissect_options *ndo, const pcap_usb_header *uh)
        int direction;
        uint8_t transfer_type, event_type;
 
-       transfer_type = EXTRACT_U_1(uh->transfer_type);
+       ndo->ndo_protocol = "usb";
+
+       nd_print_protocol_caps(ndo);
+       if (ndo->ndo_qflag)
+               return;
+
+       ND_PRINT(" ");
+       transfer_type = GET_U_1(uh->transfer_type);
        switch(transfer_type)
        {
                case URB_ISOCHRONOUS:
@@ -206,7 +214,7 @@ usb_header_print(netdissect_options *ndo, const pcap_usb_header *uh)
                        ND_PRINT(" ?");
        }
 
-       event_type = EXTRACT_U_1(uh->event_type);
+       event_type = GET_U_1(uh->event_type);
        switch(event_type)
        {
                case URB_SUBMIT:
@@ -227,7 +235,9 @@ usb_header_print(netdissect_options *ndo, const pcap_usb_header *uh)
                ND_PRINT(" from");
        else if(direction == 2)
                ND_PRINT(" to");
-       ND_PRINT(" %u:%u:%u", EXTRACT_HE_U_2(uh->bus_id), EXTRACT_U_1(uh->device_address), EXTRACT_U_1(uh->endpoint_number) & 0x7f);
+       ND_PRINT(" %u:%u:%u", GET_HE_U_2(uh->bus_id),
+                GET_U_1(uh->device_address),
+                GET_U_1(uh->endpoint_number) & 0x7f);
 }
 
 /*
@@ -238,19 +248,15 @@ usb_header_print(netdissect_options *ndo, const pcap_usb_header *uh)
  * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
-u_int
-usb_linux_48_byte_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
-                           const u_char *p)
+void
+usb_linux_48_byte_if_print(netdissect_options *ndo,
+                           const struct pcap_pkthdr *h _U_, const u_char *p)
 {
-       ndo->ndo_protocol = "usb_linux_48_byte_if";
-       if (h->caplen < sizeof(pcap_usb_header)) {
-               nd_print_trunc(ndo);
-               return(sizeof(pcap_usb_header));
-       }
+       ndo->ndo_protocol = "usb_linux_48_byte";
+       ND_TCHECK_LEN(p, sizeof(pcap_usb_header));
+       ndo->ndo_ll_hdr_len += sizeof (pcap_usb_header);
 
        usb_header_print(ndo, (const pcap_usb_header *) p);
-
-       return(sizeof(pcap_usb_header));
 }
 
 #ifdef DLT_USB_LINUX_MMAPPED
@@ -262,19 +268,15 @@ usb_linux_48_byte_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
  * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
-u_int
-usb_linux_64_byte_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
-                           const u_char *p)
+void
+usb_linux_64_byte_if_print(netdissect_options *ndo,
+                           const struct pcap_pkthdr *h _U_, const u_char *p)
 {
-       ndo->ndo_protocol = "usb_linux_64_byte_if";
-       if (h->caplen < sizeof(pcap_usb_header_mmapped)) {
-               nd_print_trunc(ndo);
-               return(sizeof(pcap_usb_header_mmapped));
-       }
+       ndo->ndo_protocol = "usb_linux_64_byte";
+       ND_TCHECK_LEN(p, sizeof(pcap_usb_header_mmapped));
+       ndo->ndo_ll_hdr_len += sizeof (pcap_usb_header_mmapped);
 
        usb_header_print(ndo, (const pcap_usb_header *) p);
-
-       return(sizeof(pcap_usb_header_mmapped));
 }
 #endif /* DLT_USB_LINUX_MMAPPED */