NDOize NFS decoder

[tcpdump] / tcpdump.c

diff --git a/tcpdump.c b/tcpdump.c
index daee688ee65653fa4aa359faefa84a7f14ad3660..9b016f4743fb42cad70b61190efdf2b0cb595c84 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -167,18 +167,6 @@ struct ndo_printer {
 
 
 static const struct printer printers[] = {
 
 
 static const struct printer printers[] = {

-       { arcnet_if_print,      DLT_ARCNET },
-#ifdef DLT_ARCNET_LINUX
-       { arcnet_linux_if_print, DLT_ARCNET_LINUX },
-#endif
-       { token_if_print,       DLT_IEEE802 },
-#ifdef DLT_LANE8023
-       { lane_if_print,        DLT_LANE8023 },
-#endif
-       { sl_if_print,          DLT_SLIP },
-#ifdef DLT_SLIP_BSDOS
-       { sl_bsdos_if_print,    DLT_SLIP_BSDOS },
-#endif

        { ppp_if_print,         DLT_PPP },
 #ifdef DLT_PPP_WITHDIRECTION
        { ppp_if_print,         DLT_PPP_WITHDIRECTION },
        { ppp_if_print,         DLT_PPP },
 #ifdef DLT_PPP_WITHDIRECTION
        { ppp_if_print,         DLT_PPP_WITHDIRECTION },


@@ -186,36 +174,95 @@ static const struct printer printers[] = {
 #ifdef DLT_PPP_BSDOS
        { ppp_bsdos_if_print,   DLT_PPP_BSDOS },
 #endif
 #ifdef DLT_PPP_BSDOS
        { ppp_bsdos_if_print,   DLT_PPP_BSDOS },
 #endif

-       { fddi_if_print,        DLT_FDDI },
+#ifdef DLT_PPP_SERIAL
+       { ppp_hdlc_if_print,    DLT_PPP_SERIAL },
+#endif
+       { NULL,                 0 },
+};
+
+static const struct ndo_printer ndo_printers[] = {
+       { ether_if_print,       DLT_EN10MB },
+#ifdef DLT_IPNET
+       { ipnet_if_print,       DLT_IPNET },
+#endif
+#ifdef DLT_IEEE802_15_4
+       { ieee802_15_4_if_print, DLT_IEEE802_15_4 },
+#endif
+#ifdef DLT_IEEE802_15_4_NOFCS
+       { ieee802_15_4_if_print, DLT_IEEE802_15_4_NOFCS },
+#endif
+#ifdef DLT_PPI
+       { ppi_if_print,         DLT_PPI },
+#endif
+#ifdef DLT_NETANALYZER
+       { netanalyzer_if_print, DLT_NETANALYZER },
+#endif
+#ifdef DLT_NETANALYZER_TRANSPARENT
+       { netanalyzer_transparent_if_print, DLT_NETANALYZER_TRANSPARENT },
+#endif
+#if defined(DLT_NFLOG) && defined(HAVE_PCAP_NFLOG_H)
+       { nflog_if_print,       DLT_NFLOG},
+#endif
+#ifdef DLT_CIP
+       { cip_if_print,         DLT_CIP },
+#endif
+#ifdef DLT_ATM_CLIP
+       { cip_if_print,         DLT_ATM_CLIP },
+#endif
+#ifdef DLT_IP_OVER_FC
+       { ipfc_if_print,        DLT_IP_OVER_FC },
+#endif

        { null_if_print,        DLT_NULL },
 #ifdef DLT_LOOP
        { null_if_print,        DLT_LOOP },
        { null_if_print,        DLT_NULL },
 #ifdef DLT_LOOP
        { null_if_print,        DLT_LOOP },

+#endif
+#ifdef DLT_APPLE_IP_OVER_IEEE1394
+       { ap1394_if_print,      DLT_APPLE_IP_OVER_IEEE1394 },
+#endif
+#if defined(DLT_BLUETOOTH_HCI_H4_WITH_PHDR) && defined(HAVE_PCAP_BLUETOOTH_H)
+       { bt_if_print,          DLT_BLUETOOTH_HCI_H4_WITH_PHDR},
+#endif
+#ifdef DLT_LANE8023
+       { lane_if_print,        DLT_LANE8023 },
+#endif
+       { arcnet_if_print,      DLT_ARCNET },
+#ifdef DLT_ARCNET_LINUX
+       { arcnet_linux_if_print, DLT_ARCNET_LINUX },

 #endif
        { raw_if_print,         DLT_RAW },
 #endif
        { raw_if_print,         DLT_RAW },

-       { atm_if_print,         DLT_ATM_RFC1483 },
+#ifdef DLT_IPV4
+       { raw_if_print,         DLT_IPV4 },
+#endif
+#ifdef DLT_IPV6
+       { raw_if_print,         DLT_IPV6 },
+#endif
+#ifdef HAVE_PCAP_USB_H
+#ifdef DLT_USB_LINUX
+       { usb_linux_48_byte_print, DLT_USB_LINUX},
+#endif /* DLT_USB_LINUX */
+#ifdef DLT_USB_LINUX_MMAPPED
+       { usb_linux_64_byte_print, DLT_USB_LINUX_MMAPPED},
+#endif /* DLT_USB_LINUX_MMAPPED */
+#endif /* HAVE_PCAP_USB_H */
+#ifdef DLT_SYMANTEC_FIREWALL
+       { symantec_if_print,    DLT_SYMANTEC_FIREWALL },
+#endif

 #ifdef DLT_C_HDLC
        { chdlc_if_print,       DLT_C_HDLC },
 #endif
 #ifdef DLT_HDLC
        { chdlc_if_print,       DLT_HDLC },
 #endif
 #ifdef DLT_C_HDLC
        { chdlc_if_print,       DLT_C_HDLC },
 #endif
 #ifdef DLT_HDLC
        { chdlc_if_print,       DLT_HDLC },
 #endif

-#ifdef DLT_PPP_SERIAL
-       { ppp_hdlc_if_print,    DLT_PPP_SERIAL },
-#endif

 #ifdef DLT_PPP_ETHER
        { pppoe_if_print,       DLT_PPP_ETHER },
 #endif
 #ifdef DLT_PPP_ETHER
        { pppoe_if_print,       DLT_PPP_ETHER },
 #endif

-#ifdef DLT_LINUX_SLL
-       { sll_if_print,         DLT_LINUX_SLL },
-#endif
-#ifdef DLT_IEEE802_11
-       { ieee802_11_if_print,  DLT_IEEE802_11},
-#endif
-#ifdef DLT_LTALK
-       { ltalk_if_print,       DLT_LTALK },
-#endif

 #if defined(DLT_PFLOG) && defined(HAVE_NET_PFVAR_H)
        { pflog_if_print,       DLT_PFLOG },
 #if defined(DLT_PFLOG) && defined(HAVE_NET_PFVAR_H)
        { 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
 #ifdef DLT_FR
        { fr_if_print,          DLT_FR },
 #endif
 #ifdef DLT_FR
        { fr_if_print,          DLT_FR },


@@ -223,26 +270,22 @@ static const struct printer printers[] = {
 #ifdef DLT_FRELAY
        { fr_if_print,          DLT_FRELAY },
 #endif
 #ifdef DLT_FRELAY
        { fr_if_print,          DLT_FRELAY },
 #endif

+#ifdef DLT_MFR
+       { mfr_if_print,         DLT_MFR },
+#endif
+       { atm_if_print,         DLT_ATM_RFC1483 },

 #ifdef DLT_SUNATM
        { sunatm_if_print,      DLT_SUNATM },
 #endif
 #ifdef DLT_SUNATM
        { sunatm_if_print,      DLT_SUNATM },
 #endif

-#ifdef DLT_PRISM_HEADER
-       { prism_if_print,       DLT_PRISM_HEADER },
-#endif
-#ifdef DLT_IEEE802_11_RADIO
-       { ieee802_11_radio_if_print,    DLT_IEEE802_11_RADIO },
-#endif

 #ifdef DLT_ENC
        { enc_if_print,         DLT_ENC },
 #endif
 #ifdef DLT_ENC
        { enc_if_print,         DLT_ENC },
 #endif

-#ifdef DLT_SYMANTEC_FIREWALL
-       { symantec_if_print,    DLT_SYMANTEC_FIREWALL },
-#endif
-#ifdef DLT_APPLE_IP_OVER_IEEE1394
-       { ap1394_if_print,      DLT_APPLE_IP_OVER_IEEE1394 },
+       { sl_if_print,          DLT_SLIP },
+#ifdef DLT_SLIP_BSDOS
+       { sl_bsdos_if_print,    DLT_SLIP_BSDOS },

 #endif
 #endif

-#ifdef DLT_IEEE802_11_RADIO_AVS
-       { ieee802_11_radio_avs_if_print,        DLT_IEEE802_11_RADIO_AVS },
+#ifdef DLT_LTALK
+       { ltalk_if_print,       DLT_LTALK },

 #endif
 #ifdef DLT_JUNIPER_ATM1
        { juniper_atm1_print,   DLT_JUNIPER_ATM1 },
 #endif
 #ifdef DLT_JUNIPER_ATM1
        { juniper_atm1_print,   DLT_JUNIPER_ATM1 },


@@ -289,60 +332,20 @@ static const struct printer printers[] = {
 #ifdef DLT_JUNIPER_CHDLC
        { juniper_chdlc_print,  DLT_JUNIPER_CHDLC },
 #endif
 #ifdef DLT_JUNIPER_CHDLC
        { juniper_chdlc_print,  DLT_JUNIPER_CHDLC },
 #endif

-#ifdef DLT_MFR
-       { mfr_if_print,         DLT_MFR },
-#endif
-#if defined(DLT_BLUETOOTH_HCI_H4_WITH_PHDR) && defined(HAVE_PCAP_BLUETOOTH_H)
-       { bt_if_print,          DLT_BLUETOOTH_HCI_H4_WITH_PHDR},
-#endif
-#ifdef HAVE_PCAP_USB_H
-#ifdef DLT_USB_LINUX
-       { usb_linux_48_byte_print, DLT_USB_LINUX},
-#endif /* DLT_USB_LINUX */
-#ifdef DLT_USB_LINUX_MMAPPED
-       { usb_linux_64_byte_print, DLT_USB_LINUX_MMAPPED},
-#endif /* DLT_USB_LINUX_MMAPPED */
-#endif /* HAVE_PCAP_USB_H */
-#ifdef DLT_IPV4
-       { raw_if_print,         DLT_IPV4 },
-#endif
-#ifdef DLT_IPV6
-       { raw_if_print,         DLT_IPV6 },
+#ifdef DLT_PKTAP
+       { pktap_if_print,       DLT_PKTAP },

 #endif
 #endif

-       { NULL,                 0 },
-};
-
-static const struct ndo_printer ndo_printers[] = {
-       { ether_if_print,       DLT_EN10MB },
-#ifdef DLT_IPNET
-       { ipnet_if_print,       DLT_IPNET },
-#endif
-#ifdef DLT_IEEE802_15_4
-       { ieee802_15_4_if_print, DLT_IEEE802_15_4 },
-#endif
-#ifdef DLT_IEEE802_15_4_NOFCS
-       { ieee802_15_4_if_print, DLT_IEEE802_15_4_NOFCS },
-#endif
-#ifdef DLT_PPI
-       { ppi_if_print,         DLT_PPI },
-#endif
-#ifdef DLT_NETANALYZER
-       { netanalyzer_if_print, DLT_NETANALYZER },
-#endif
-#ifdef DLT_NETANALYZER_TRANSPARENT
-       { netanalyzer_transparent_if_print, DLT_NETANALYZER_TRANSPARENT },
-#endif
-#if defined(DLT_NFLOG) && defined(HAVE_PCAP_NFLOG_H)
-       { nflog_if_print,       DLT_NFLOG},
+#ifdef DLT_IEEE802_11_RADIO
+       { ieee802_11_radio_if_print,    DLT_IEEE802_11_RADIO },

 #endif
 #endif

-#ifdef DLT_CIP
-       { cip_if_print,         DLT_CIP },
+#ifdef DLT_IEEE802_11
+       { ieee802_11_if_print,  DLT_IEEE802_11},

 #endif
 #endif

-#ifdef DLT_ATM_CLIP
-       { cip_if_print,         DLT_ATM_CLIP },
+#ifdef DLT_IEEE802_11_RADIO_AVS
+       { ieee802_11_radio_avs_if_print,        DLT_IEEE802_11_RADIO_AVS },

 #endif
 #endif

-#ifdef DLT_IP_OVER_FC
-       { ipfc_if_print,        DLT_IP_OVER_FC },
+#ifdef DLT_PRISM_HEADER
+       { prism_if_print,       DLT_PRISM_HEADER },

 #endif
        { NULL,                 0 },
 };
 #endif
        { NULL,                 0 },
 };


@@ -380,6 +383,30 @@ lookup_ndo_printer(int type)
                if (type == p->type)
                        return p->f;
 
                if (type == p->type)
                        return p->f;
 

+#if defined(DLT_USER2) && defined(DLT_PKTAP)
+       /*
+        * Apple incorrectly chose to use DLT_USER2 for their PKTAP
+        * header.
+        *
+        * We map DLT_PKTAP, whether it's DLT_USER2 as it is on Darwin-
+        * based OSes or the same value as LINKTYPE_PKTAP as it is on
+        * other OSes, to LINKTYPE_PKTAP, so files written with
+        * this version of libpcap for a DLT_PKTAP capture have a link-
+        * layer header type of LINKTYPE_PKTAP.
+        *
+        * However, files written on OS X Mavericks for a DLT_PKTAP
+        * capture have a link-layer header type of LINKTYPE_USER2.
+        * If we don't have a printer for DLT_USER2, and type is
+        * DLT_USER2, we look up the printer for DLT_PKTAP and use
+        * that.
+        */
+       if (type == DLT_USER2) {
+               for (p = ndo_printers; p->f; ++p)
+                       if (DLT_PKTAP == p->type)
+                               return p->f;
+       }
+#endif
+

        return NULL;
        /* NOTREACHED */
 }
        return NULL;
        /* NOTREACHED */
 }


@@ -1995,7 +2022,7 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
                        /*
                         * Include the link-layer header.
                         */
                        /*
                         * Include the link-layer header.
                         */

-                       hex_and_ascii_print("\n\t", sp, h->caplen);
+                       hex_and_ascii_print(ndo, "\n\t", sp, h->caplen);

                } else {
                        /*
                         * Don't include the link-layer header - and if
                } else {
                        /*
                         * Don't include the link-layer header - and if


@@ -2003,7 +2030,7 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
                         * print nothing.
                         */
                        if (h->caplen > hdrlen)
                         * print nothing.
                         */
                        if (h->caplen > hdrlen)

-                               hex_and_ascii_print("\n\t", sp + hdrlen,
+                               hex_and_ascii_print(ndo, "\n\t", sp + hdrlen,

                                    h->caplen - hdrlen);
                }
        } else if (ndo->ndo_xflag) {
                                    h->caplen - hdrlen);
                }
        } else if (ndo->ndo_xflag) {


@@ -2083,9 +2110,9 @@ print_packet(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
  * By default, print the specified data out in hex and ASCII.
  */
 static void
  * By default, print the specified data out in hex and ASCII.
  */
 static void

-ndo_default_print(netdissect_options *ndo _U_, const u_char *bp, u_int length)
+ndo_default_print(netdissect_options *ndo, const u_char *bp, u_int length)

 {
 {

-       hex_and_ascii_print("\n\t", bp, length); /* pass on lf and identation string */
+       hex_and_ascii_print(ndo, "\n\t", bp, length); /* pass on lf and identation string */

 }
 
 void
 }
 
 void