remove redundant ND_TCHECK, let GET_ routines handle checks

[tcpdump] / print.c

diff --git a/print.c b/print.c
index 0eef3bb0dc42dfc4ec4512c2eb4670c8da3f6872..864e9ddde2920e50d2fa20e4b52844e2634d6876 100644 (file)
--- a/print.c
+++ b/print.c
@@ -42,37 +42,28 @@
 
 #include "pcap-missing.h"
 
 
 #include "pcap-missing.h"
 

-struct uint_printer {
-       uint_if_printer f;
+struct printer {
+       if_printer f;

        int type;
 };
 
        int type;
 };
 

-struct void_printer {
-       void_if_printer f;
-       int type;
-};
-
-static const struct uint_printer uint_printers[] = {
-#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_IEEE802_15_4_TAP
-       { ieee802_15_4_tap_if_print, DLT_IEEE802_15_4_TAP },
+static const struct printer printers[] = {
+#ifdef DLT_APPLE_IP_OVER_IEEE1394
+       { ap1394_if_print,      DLT_APPLE_IP_OVER_IEEE1394 },

 #endif
 #endif

-#ifdef DLT_CIP
-       { cip_if_print,         DLT_CIP },
+       { arcnet_if_print,      DLT_ARCNET },
+#ifdef DLT_ARCNET_LINUX
+       { arcnet_linux_if_print, DLT_ARCNET_LINUX },

 #endif
 #endif

-#ifdef DLT_ATM_CLIP
-       { cip_if_print,         DLT_ATM_CLIP },
+       { atm_if_print,         DLT_ATM_RFC1483 },
+#ifdef DLT_DSA_TAG_BRCM
+       { brcm_tag_if_print,    DLT_DSA_TAG_BRCM },

 #endif
 #endif

-#ifdef DLT_IP_OVER_FC
-       { ipfc_if_print,        DLT_IP_OVER_FC },
+#ifdef DLT_DSA_TAG_BRCM_PREPEND
+       { brcm_tag_prepend_if_print, DLT_DSA_TAG_BRCM_PREPEND },

 #endif
 #endif

-#ifdef DLT_LANE8023
-       { lane_if_print,        DLT_LANE8023 },
+#ifdef DLT_BLUETOOTH_HCI_H4_WITH_PHDR
+       { bt_if_print,          DLT_BLUETOOTH_HCI_H4_WITH_PHDR},

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


@@ -80,82 +71,50 @@ static const struct uint_printer uint_printers[] = {
 #ifdef DLT_HDLC
        { chdlc_if_print,       DLT_HDLC },
 #endif
 #ifdef DLT_HDLC
        { chdlc_if_print,       DLT_HDLC },
 #endif

-#if defined(DLT_PFLOG) && defined(HAVE_NET_IF_PFLOG_H)
-       { pflog_if_print,       DLT_PFLOG },
+#ifdef DLT_ATM_CLIP
+       { cip_if_print,         DLT_ATM_CLIP },

 #endif
 #endif

-       { token_if_print,       DLT_IEEE802 },
-       { fddi_if_print,        DLT_FDDI },
-#ifdef DLT_LINUX_SLL
-       { sll_if_print,         DLT_LINUX_SLL },
+#ifdef DLT_CIP
+       { cip_if_print,         DLT_CIP },

 #endif
 #endif

-#ifdef DLT_LINUX_SLL2
-       { sll2_if_print,        DLT_LINUX_SLL2 },
+#ifdef DLT_DSA_TAG_DSA
+       { dsa_if_print,         DLT_DSA_TAG_DSA },

 #endif
 #endif

+#ifdef DLT_DSA_TAG_EDSA
+       { edsa_if_print,        DLT_DSA_TAG_EDSA },
+#endif
+#ifdef DLT_ENC
+       { enc_if_print,         DLT_ENC },
+#endif
+       { ether_if_print,       DLT_EN10MB },
+       { fddi_if_print,        DLT_FDDI },

 #ifdef DLT_FR
        { fr_if_print,          DLT_FR },
 #endif
 #ifdef DLT_FRELAY
        { fr_if_print,          DLT_FRELAY },
 #endif
 #ifdef DLT_FR
        { fr_if_print,          DLT_FR },
 #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_LTALK
-       { ltalk_if_print,       DLT_LTALK },
-#endif
-#ifdef DLT_IEEE802_11_RADIO
-       { ieee802_11_radio_if_print,    DLT_IEEE802_11_RADIO },
-#endif

 #ifdef DLT_IEEE802_11
        { ieee802_11_if_print,  DLT_IEEE802_11},
 #endif
 #ifdef DLT_IEEE802_11_RADIO_AVS
 #ifdef DLT_IEEE802_11
        { ieee802_11_if_print,  DLT_IEEE802_11},
 #endif
 #ifdef DLT_IEEE802_11_RADIO_AVS

-       { ieee802_11_radio_avs_if_print,        DLT_IEEE802_11_RADIO_AVS },
+       { ieee802_11_radio_avs_if_print, DLT_IEEE802_11_RADIO_AVS },

 #endif
 #endif

-#ifdef DLT_PRISM_HEADER
-       { prism_if_print,       DLT_PRISM_HEADER },
-#endif
-       { ppp_if_print,         DLT_PPP },
-#ifdef DLT_PPP_WITHDIRECTION
-       { ppp_if_print,         DLT_PPP_WITHDIRECTION },
-#endif
-#ifdef DLT_PPP_BSDOS
-       { ppp_bsdos_if_print,   DLT_PPP_BSDOS },
-#endif
-#ifdef DLT_PPP_SERIAL
-       { ppp_hdlc_if_print,    DLT_PPP_SERIAL },
-#endif
-       { NULL,                 0 },
-};
-
-static const struct void_printer void_printers[] = {
-#ifdef DLT_APPLE_IP_OVER_IEEE1394
-       { ap1394_if_print,      DLT_APPLE_IP_OVER_IEEE1394 },
-#endif
-       { arcnet_if_print,      DLT_ARCNET },
-#ifdef DLT_ARCNET_LINUX
-       { arcnet_linux_if_print, DLT_ARCNET_LINUX },
-#endif
-#ifdef DLT_DSA_TAG_BRCM
-       { brcm_tag_if_print,    DLT_DSA_TAG_BRCM },
-#endif
-#ifdef DLT_DSA_TAG_BRCM_PREPEND
-       { brcm_tag_prepend_if_print, DLT_DSA_TAG_BRCM_PREPEND },
+#ifdef DLT_IEEE802_11_RADIO
+       { ieee802_11_radio_if_print,    DLT_IEEE802_11_RADIO },

 #endif
 #endif

-#ifdef DLT_BLUETOOTH_HCI_H4_WITH_PHDR
-       { bt_if_print,          DLT_BLUETOOTH_HCI_H4_WITH_PHDR},
+#ifdef DLT_IEEE802_15_4
+       { ieee802_15_4_if_print, DLT_IEEE802_15_4 },

 #endif
 #endif

-#ifdef DLT_DSA_TAG_DSA
-       { dsa_if_print,         DLT_DSA_TAG_DSA },
+#ifdef DLT_IEEE802_15_4_NOFCS
+       { ieee802_15_4_if_print, DLT_IEEE802_15_4_NOFCS },

 #endif
 #endif

-#ifdef DLT_DSA_TAG_EDSA
-       { edsa_if_print,        DLT_DSA_TAG_EDSA },
+#ifdef DLT_IEEE802_15_4_TAP
+       { ieee802_15_4_tap_if_print, DLT_IEEE802_15_4_TAP },

 #endif
 #endif

-#ifdef DLT_ENC
-       { enc_if_print,         DLT_ENC },
+#ifdef DLT_IP_OVER_FC
+       { ipfc_if_print,        DLT_IP_OVER_FC },

 #endif
 #endif

-       { ether_if_print,       DLT_EN10MB },

 #ifdef DLT_IPNET
        { ipnet_if_print,       DLT_IPNET },
 #endif
 #ifdef DLT_IPNET
        { ipnet_if_print,       DLT_IPNET },
 #endif


@@ -207,6 +166,12 @@ static const struct void_printer void_printers[] = {
 #ifdef DLT_JUNIPER_SERVICES
        { juniper_services_if_print, DLT_JUNIPER_SERVICES },
 #endif
 #ifdef DLT_JUNIPER_SERVICES
        { juniper_services_if_print, DLT_JUNIPER_SERVICES },
 #endif

+#ifdef DLT_LTALK
+       { ltalk_if_print,       DLT_LTALK },
+#endif
+#ifdef DLT_MFR
+       { mfr_if_print,         DLT_MFR },
+#endif

 #ifdef DLT_NETANALYZER
        { netanalyzer_if_print, DLT_NETANALYZER },
 #endif
 #ifdef DLT_NETANALYZER
        { netanalyzer_if_print, DLT_NETANALYZER },
 #endif


@@ -220,14 +185,30 @@ static const struct void_printer void_printers[] = {
 #ifdef DLT_LOOP
        { null_if_print,        DLT_LOOP },
 #endif
 #ifdef DLT_LOOP
        { null_if_print,        DLT_LOOP },
 #endif

+#if defined(DLT_PFLOG) && defined(HAVE_NET_IF_PFLOG_H)
+       { pflog_if_print,       DLT_PFLOG },
+#endif

 #ifdef DLT_PKTAP
        { pktap_if_print,       DLT_PKTAP },
 #endif
 #ifdef DLT_PPI
        { ppi_if_print,         DLT_PPI },
 #endif
 #ifdef DLT_PKTAP
        { pktap_if_print,       DLT_PKTAP },
 #endif
 #ifdef DLT_PPI
        { ppi_if_print,         DLT_PPI },
 #endif

+#ifdef DLT_PPP_BSDOS
+       { ppp_bsdos_if_print,   DLT_PPP_BSDOS },
+#endif
+#ifdef DLT_PPP_SERIAL
+       { ppp_hdlc_if_print,    DLT_PPP_SERIAL },
+#endif
+       { ppp_if_print,         DLT_PPP },
+#ifdef DLT_PPP_PPPD
+       { ppp_if_print,         DLT_PPP_PPPD },
+#endif

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

+#endif
+#ifdef DLT_PRISM_HEADER
+       { prism_if_print,       DLT_PRISM_HEADER },

 #endif
        { raw_if_print,         DLT_RAW },
 #ifdef DLT_IPV4
 #endif
        { raw_if_print,         DLT_RAW },
 #ifdef DLT_IPV4


@@ -240,12 +221,19 @@ static const struct void_printer void_printers[] = {
        { sl_bsdos_if_print,    DLT_SLIP_BSDOS },
 #endif
        { sl_if_print,          DLT_SLIP },
        { sl_bsdos_if_print,    DLT_SLIP_BSDOS },
 #endif
        { sl_if_print,          DLT_SLIP },

+#ifdef DLT_LINUX_SLL
+       { sll_if_print,         DLT_LINUX_SLL },
+#endif
+#ifdef DLT_LINUX_SLL2
+       { sll2_if_print,        DLT_LINUX_SLL2 },
+#endif

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

+       { token_if_print,       DLT_IEEE802 },

 #ifdef DLT_USB_LINUX
        { usb_linux_48_byte_if_print, DLT_USB_LINUX},
 #endif /* DLT_USB_LINUX */
 #ifdef DLT_USB_LINUX
        { usb_linux_48_byte_if_print, DLT_USB_LINUX},
 #endif /* DLT_USB_LINUX */


@@ -281,49 +269,12 @@ init_print(netdissect_options *ndo, uint32_t localnet, uint32_t mask)
        init_checksum();
 }
 
        init_checksum();
 }
 

-uint_if_printer
-lookup_uint_printer(int type)
-{
-       const struct uint_printer *p;
-
-       for (p = uint_printers; p->f; ++p)
-               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 = uint_printers; p->f; ++p)
-                       if (DLT_PKTAP == p->type)
-                               return p->f;
-       }
-#endif
-
-       return NULL;
-       /* NOTREACHED */
-}
-
-void_if_printer
-lookup_void_printer(int type)
+if_printer
+lookup_printer(int type)

 {
 {

-       const struct void_printer *p;
+       const struct printer *p;

 
 

-       for (p = void_printers; p->f; ++p)
+       for (p = printers; p->f; ++p)

                if (type == p->type)
                        return p->f;
 
                if (type == p->type)
                        return p->f;
 


@@ -345,7 +296,7 @@ lookup_void_printer(int type)
         * that.
         */
        if (type == DLT_USER2) {
         * that.
         */
        if (type == DLT_USER2) {

-               for (p = void_printers; p->f; ++p)
+               for (p = printers; p->f; ++p)

                        if (DLT_PKTAP == p->type)
                                return p->f;
        }
                        if (DLT_PKTAP == p->type)
                                return p->f;
        }


@@ -355,35 +306,20 @@ lookup_void_printer(int type)
        /* NOTREACHED */
 }
 
        /* NOTREACHED */
 }
 

-if_printer_t
-lookup_printer(netdissect_options *ndo, int type)
-{
-       if_printer_t printer;
-
-       printer.void_printer = lookup_void_printer(type);
-       ndo->ndo_void_printer = TRUE;
-       if (printer.void_printer == NULL) {
-               printer.uint_printer = lookup_uint_printer(type);
-               ndo->ndo_void_printer = FALSE;
-       }
-       return printer;
-}
-

 int
 has_printer(int type)
 {
 int
 has_printer(int type)
 {

-       return (lookup_void_printer(type) != NULL ||
-               lookup_uint_printer(type) != NULL);
+       return (lookup_printer(type) != NULL);

 }
 
 }
 

-if_printer_t
-get_if_printer(netdissect_options *ndo, int type)
+if_printer
+get_if_printer(int type)

 {
 {

-       if_printer_t printer;
+       if_printer printer;

 
 

-       printer = lookup_printer(ndo, type);
-       if (printer.printer == NULL)
-               printer.void_printer = unsupported_if_print;
+       printer = lookup_printer(type);
+       if (printer == NULL)
+               printer = unsupported_if_print;

        return printer;
 }
 
        return printer;
 }
 


@@ -391,7 +327,7 @@ void
 pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
                    const u_char *sp, u_int packets_captured)
 {
 pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
                    const u_char *sp, u_int packets_captured)
 {

-       u_int hdrlen;
+       u_int hdrlen = 0;

        int invalid_header = 0;
 
        if (ndo->ndo_packet_number)
        int invalid_header = 0;
 
        if (ndo->ndo_packet_number)


@@ -462,18 +398,17 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
 
        ndo->ndo_protocol = "";
        ndo->ndo_ll_hdr_len = 0;
 
        ndo->ndo_protocol = "";
        ndo->ndo_ll_hdr_len = 0;

-       if (setjmp(ndo->ndo_truncated) == 0) {
+       switch (setjmp(ndo->ndo_early_end)) {
+       case 0:

                /* Print the packet. */
                /* Print the packet. */

-               if (ndo->ndo_void_printer == TRUE) {
-                       (ndo->ndo_if_printer.void_printer)(ndo, h, sp);
-                       hdrlen = ndo->ndo_ll_hdr_len;
-               } else
-                       hdrlen = (ndo->ndo_if_printer.uint_printer)(ndo, h, sp);
-       } else {
+               (ndo->ndo_if_printer)(ndo, h, sp);
+               break;
+       case ND_TRUNCATED:

                /* A printer quit because the packet was truncated; report it */
                /* A printer quit because the packet was truncated; report it */

-               ND_PRINT(" [|%s]", ndo->ndo_protocol);
-               hdrlen = ndo->ndo_ll_hdr_len;
+               nd_print_trunc(ndo);
+               break;

        }
        }

+       hdrlen = ndo->ndo_ll_hdr_len;

 
        /*
         * Empty the stack of packet information, freeing all pushed buffers;
 
        /*
         * Empty the stack of packet information, freeing all pushed buffers;