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

Moreover:
Remove trailing "_if" from the protocol name.

diff --git a/netdissect.h b/netdissect.h
index 8cee597c974e8b672dfd44e369b99ee88f809d9f..97ace620fa1b0312904b9656ff97775cab41e1f6 100644 (file)
--- a/netdissect.h
+++ b/netdissect.h
@@ -478,7 +478,7 @@ extern void dsa_if_print IF_PRINTER_ARGS;
 extern void edsa_if_print IF_PRINTER_ARGS;
 extern void enc_if_print IF_PRINTER_ARGS;
 extern void ether_if_print IF_PRINTER_ARGS;
-extern u_int fddi_if_print IF_PRINTER_ARGS;
+extern void fddi_if_print IF_PRINTER_ARGS;
 extern u_int fr_if_print IF_PRINTER_ARGS;
 extern void ieee802_11_if_print IF_PRINTER_ARGS;
 extern void ieee802_11_radio_avs_if_print IF_PRINTER_ARGS;

diff --git a/print-fddi.c b/print-fddi.c
index db5222f6ac274d7cbd2b41a1dc9d296f62cb4a9b..fb8d3ed57ca1e113ad270deff78c7c3c84cc7acb 100644 (file)
--- a/print-fddi.c
+++ b/print-fddi.c
@@ -342,9 +342,9 @@ fddi_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
  * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
-u_int
+void
 fddi_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
 {
-       ndo->ndo_protocol = "fddi_if";
-       return (fddi_print(ndo, p, h->len, h->caplen));
+       ndo->ndo_protocol = "fddi";
+       ndo->ndo_ll_hdr_len += fddi_print(ndo, p, h->len, h->caplen);
 }

diff --git a/print.c b/print.c
index 56438353b426dec8486d924d376a8b326d29b5e2..e5f39649e257a15aade51cda418db896f6a7ca73 100644 (file)
--- a/print.c
+++ b/print.c
@@ -69,7 +69,6 @@ static const struct uint_printer uint_printers[] = {
        { pflog_if_print,       DLT_PFLOG },
 #endif
        { token_if_print,       DLT_IEEE802 },
-       { fddi_if_print,        DLT_FDDI },
 #ifdef DLT_LINUX_SLL
        { sll_if_print,         DLT_LINUX_SLL },
 #endif
@@ -135,6 +134,7 @@ static const struct void_printer void_printers[] = {
        { enc_if_print,         DLT_ENC },
 #endif
        { ether_if_print,       DLT_EN10MB },
+       { fddi_if_print,        DLT_FDDI },
 #ifdef DLT_IEEE802_11
        { ieee802_11_if_print,  DLT_IEEE802_11},
 #endif