Revert partially the commit 21b1273

[tcpdump] / print.c

diff --git a/print.c b/print.c
index 4a03d6502f7ae6e72a438f6c96c1a248ecf8b06e..6e4cf8937a31fc7b3caa2b05bc44bdcad34533b3 100644 (file)
--- a/print.c
+++ b/print.c
@@ -42,21 +42,12 @@
 
 #include "pcap-missing.h"
 
-struct uint_printer {
-       uint_if_printer f;
+struct printer {
+       if_printer f;
        int type;
 };
 
-struct void_printer {
-       void_if_printer f;
-       int type;
-};
-
-static const struct uint_printer uint_printers[] = {
-       { NULL,                 0 },
-};
-
-static const struct void_printer void_printers[] = {
+static const struct printer printers[] = {
 #ifdef DLT_APPLE_IP_OVER_IEEE1394
        { ap1394_if_print,      DLT_APPLE_IP_OVER_IEEE1394 },
 #endif
@@ -210,8 +201,8 @@ static const struct void_printer void_printers[] = {
        { ppp_hdlc_if_print,    DLT_PPP_SERIAL },
 #endif
        { ppp_if_print,         DLT_PPP },
-#ifdef DLT_PPP_WITHDIRECTION
-       { ppp_if_print,         DLT_PPP_WITHDIRECTION },
+#ifdef DLT_PPP_PPPD
+       { ppp_if_print,         DLT_PPP_PPPD },
 #endif
 #ifdef DLT_PPP_ETHER
        { pppoe_if_print,       DLT_PPP_ETHER },
@@ -278,49 +269,12 @@ init_print(netdissect_options *ndo, uint32_t localnet, uint32_t mask)
        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;
 
@@ -342,7 +296,7 @@ lookup_void_printer(int type)
         * 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;
        }
@@ -352,35 +306,20 @@ lookup_void_printer(int type)
        /* 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)
 {
-       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;
 }
 
@@ -388,7 +327,7 @@ void
 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)
@@ -461,16 +400,12 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
        ndo->ndo_ll_hdr_len = 0;
        if (setjmp(ndo->ndo_truncated) == 0) {
                /* 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);
+               (ndo->ndo_if_printer)(ndo, h, sp);
        } else {
                /* 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);
        }
+       hdrlen = ndo->ndo_ll_hdr_len;
 
        /*
         * Empty the stack of packet information, freeing all pushed buffers;