CMake: Fix the comment about versions. [skip ci]

[tcpdump] / print-usb.c

diff --git a/print-usb.c b/print-usb.c
index d0ae440e6aa66804a6793e490073e2cf5b601434..98bd91b20fb3f633d6f5e437067683c6c8a16738 100644 (file)
--- a/print-usb.c
+++ b/print-usb.c
@@ -21,12 +21,11 @@
 
 /* \summary: USB printer */
 
 
 /* \summary: USB printer */
 

-#ifdef HAVE_CONFIG_H

 #include <config.h>
 #include <config.h>

-#endif

 
 #include "netdissect-stdinc.h"
 
 
 #include "netdissect-stdinc.h"
 

+#define ND_LONGJMP_FROM_TCHECK

 #include "netdissect.h"
 #include "extract.h"
 
 #include "netdissect.h"
 #include "extract.h"
 


@@ -147,8 +146,7 @@ get_direction(int transfer_type, int event_type)
        case URB_BULK:
        case URB_CONTROL:
        case URB_ISOCHRONOUS:
        case URB_BULK:
        case URB_CONTROL:
        case URB_ISOCHRONOUS:

-               switch(event_type)
-               {
+               switch(event_type) {

                case URB_SUBMIT:
                        direction = 2;
                        break;
                case URB_SUBMIT:
                        direction = 2;
                        break;


@@ -161,8 +159,7 @@ get_direction(int transfer_type, int event_type)
                }
                break;
        case URB_INTERRUPT:
                }
                break;
        case URB_INTERRUPT:

-               switch(event_type)
-               {
+               switch(event_type) {

                case URB_SUBMIT:
                        direction = 1;
                        break;
                case URB_SUBMIT:
                        direction = 1;
                        break;


@@ -187,9 +184,15 @@ usb_header_print(netdissect_options *ndo, const pcap_usb_header *uh)
        int direction;
        uint8_t transfer_type, event_type;
 
        int direction;
        uint8_t transfer_type, event_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);
        transfer_type = GET_U_1(uh->transfer_type);

-       switch(transfer_type)
-       {
+       switch(transfer_type) {

                case URB_ISOCHRONOUS:
                        ND_PRINT("ISOCHRONOUS");
                        break;
                case URB_ISOCHRONOUS:
                        ND_PRINT("ISOCHRONOUS");
                        break;


@@ -207,8 +210,7 @@ usb_header_print(netdissect_options *ndo, const pcap_usb_header *uh)
        }
 
        event_type = GET_U_1(uh->event_type);
        }
 
        event_type = GET_U_1(uh->event_type);

-       switch(event_type)
-       {
+       switch(event_type) {

                case URB_SUBMIT:
                        ND_PRINT(" SUBMIT");
                        break;
                case URB_SUBMIT:
                        ND_PRINT(" SUBMIT");
                        break;


@@ -240,19 +242,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.
  */
  * '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);
 
        usb_header_print(ndo, (const pcap_usb_header *) p);

-
-       return(sizeof(pcap_usb_header));

 }
 
 #ifdef DLT_USB_LINUX_MMAPPED
 }
 
 #ifdef DLT_USB_LINUX_MMAPPED


@@ -264,19 +262,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.
  */
  * '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);
 
        usb_header_print(ndo, (const pcap_usb_header *) p);

-
-       return(sizeof(pcap_usb_header_mmapped));

 }
 #endif /* DLT_USB_LINUX_MMAPPED */
 
 }
 #endif /* DLT_USB_LINUX_MMAPPED */