USB: Update the link-layer dissector to a void function

Moreover:
Remove trailing "_if" from protocol names.

Author: fxlb

netdissect.h

@@ -522,8 +522,8 @@ extern u_int sll2_if_print IF_PRINTER_ARGS;
 extern u_int sunatm_if_print IF_PRINTER_ARGS;
 extern void symantec_if_print IF_PRINTER_ARGS;
 extern u_int token_if_print IF_PRINTER_ARGS;
-extern u_int usb_linux_48_byte_if_print IF_PRINTER_ARGS;
-extern u_int usb_linux_64_byte_if_print IF_PRINTER_ARGS;
+extern void usb_linux_48_byte_if_print IF_PRINTER_ARGS;
+extern void usb_linux_64_byte_if_print IF_PRINTER_ARGS;
 extern u_int vsock_if_print IF_PRINTER_ARGS;
 
 /*

print-usb.c

@@ -247,19 +247,21 @@ 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
+void
 usb_linux_48_byte_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
                            const u_char *p)
 {
-	ndo->ndo_protocol = "usb_linux_48_byte_if";
+	ndo->ndo_protocol = "usb_linux_48_byte";
 	if (h->caplen < sizeof(pcap_usb_header)) {
+		ndo->ndo_ll_header_length += h->caplen;
 		nd_print_trunc(ndo);
-		return(sizeof(pcap_usb_header));
+		return;
 	}
+	ndo->ndo_ll_header_length += sizeof (pcap_usb_header);
 
 	usb_header_print(ndo, (const pcap_usb_header *) p);
 
-	return(sizeof(pcap_usb_header));
+	return;
 }
 
 #ifdef DLT_USB_LINUX_MMAPPED
@@ -271,19 +273,21 @@ 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
+void
 usb_linux_64_byte_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
                            const u_char *p)
 {
-	ndo->ndo_protocol = "usb_linux_64_byte_if";
+	ndo->ndo_protocol = "usb_linux_64_byte";
 	if (h->caplen < sizeof(pcap_usb_header_mmapped)) {
+		ndo->ndo_ll_header_length += h->caplen;
 		nd_print_trunc(ndo);
-		return(sizeof(pcap_usb_header_mmapped));
+		return;
 	}
+	ndo->ndo_ll_header_length += sizeof (pcap_usb_header_mmapped);
 
 	usb_header_print(ndo, (const pcap_usb_header *) p);
 
-	return(sizeof(pcap_usb_header_mmapped));
+	return;
 }
 #endif /* DLT_USB_LINUX_MMAPPED */
 

print.c

@@ -108,12 +108,6 @@ static const struct uint_printer uint_printers[] = {
 #ifdef DLT_IPOIB
 	{ ipoib_if_print,       DLT_IPOIB },
 #endif
-#ifdef DLT_USB_LINUX
-	{ usb_linux_48_byte_if_print, DLT_USB_LINUX},
-#endif /* DLT_USB_LINUX */
-#ifdef DLT_USB_LINUX_MMAPPED
-	{ usb_linux_64_byte_if_print, DLT_USB_LINUX_MMAPPED},
-#endif /* DLT_USB_LINUX_MMAPPED */
 #ifdef DLT_C_HDLC
 	{ chdlc_if_print,	DLT_C_HDLC },
 #endif
@@ -255,6 +249,12 @@ static const struct void_printer void_printers[] = {
 #ifdef DLT_SYMANTEC_FIREWALL
 	{ symantec_if_print,	DLT_SYMANTEC_FIREWALL },
 #endif
+#ifdef DLT_USB_LINUX
+	{ usb_linux_48_byte_if_print, DLT_USB_LINUX},
+#endif /* DLT_USB_LINUX */
+#ifdef DLT_USB_LINUX_MMAPPED
+	{ usb_linux_64_byte_if_print, DLT_USB_LINUX_MMAPPED},
+#endif /* DLT_USB_LINUX_MMAPPED */
 	{ NULL,                 0 },
 };