Apple IPoIEEE1394: Update the link-layer dissector to a void function

Author: fxlb

netdissect.h

@@ -461,7 +461,7 @@ extern if_printer_t lookup_printer(netdissect_options *, int);
 
 /* The DLT printer routines */
 
-extern u_int ap1394_if_print IF_PRINTER_ARGS;
+extern void ap1394_if_print IF_PRINTER_ARGS;
 extern u_int arcnet_if_print IF_PRINTER_ARGS;
 extern u_int arcnet_linux_if_print IF_PRINTER_ARGS;
 extern u_int atm_if_print IF_PRINTER_ARGS;

print-ap1394.c

@@ -85,7 +85,7 @@ ap1394_hdr_print(netdissect_options *ndo, const u_char *bp, u_int length)
  * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
-u_int
+void
 ap1394_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
 {
 u_int length = h->len;
@@ -96,9 +96,11 @@ ap1394_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
 
 ndo->ndo_protocol = "ap1394_if";
 if (caplen < FIREWIRE_HDRLEN) {
+ndo->ndo_ll_header_length += caplen;
 nd_print_trunc(ndo);
-return FIREWIRE_HDRLEN;
+return;
 }
+ndo->ndo_ll_header_length += FIREWIRE_HDRLEN;
 
 if (ndo->ndo_eflag)
 ap1394_hdr_print(ndo, p, length);
@@ -122,5 +124,5 @@ ap1394_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
 ND_DEFAULTPRINT(p, caplen);
 }
 
-return FIREWIRE_HDRLEN;
+return;
 }

print.c

@@ -91,9 +91,6 @@ static const struct uint_printer uint_printers[] = {
 #ifdef DLT_LOOP
 { null_if_print,DLT_LOOP },
 #endif
-#ifdef DLT_APPLE_IP_OVER_IEEE1394
-{ ap1394_if_print,DLT_APPLE_IP_OVER_IEEE1394 },
-#endif
 #ifdef DLT_BLUETOOTH_HCI_H4_WITH_PHDR
 { bt_if_print,DLT_BLUETOOTH_HCI_H4_WITH_PHDR},
 #endif
@@ -255,6 +252,9 @@ static const struct uint_printer uint_printers[] = {
 };
 
 static const struct void_printer void_printers[] = {
+#ifdef DLT_APPLE_IP_OVER_IEEE1394
+{ ap1394_if_print,DLT_APPLE_IP_OVER_IEEE1394 },
+#endif
 { NULL, 0 },
 };