CI: Add warning exemptions for Sun C (suncc-5.14) on Solaris 10

[tcpdump] / print.c

diff --git a/print.c b/print.c
index b783e40d96a4606c62cd974f1f9b0464e87374be..f67597e3a51a3aaeeb1d1e4cd1f1c851ef7463eb 100644 (file)
--- a/print.c
+++ b/print.c
@@ -25,9 +25,7 @@
  *     Seth Webster <[email protected]>
  */
 
  *     Seth Webster <[email protected]>
  */
 

-#ifdef HAVE_CONFIG_H

 #include <config.h>
 #include <config.h>

-#endif

 
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>


@@ -40,62 +38,12 @@
 #include "print.h"
 #include "netdissect-alloc.h"
 
 #include "print.h"
 #include "netdissect-alloc.h"
 

-#include "pcap-missing.h"
-
-struct uint_printer {
-       uint_if_printer f;
-       int type;
-};
-
-struct void_printer {
-       void_if_printer f;
+struct printer {
+       if_printer f;

        int type;
 };
 
        int type;
 };
 

-static const struct uint_printer uint_printers[] = {
-#ifdef DLT_IP_OVER_FC
-       { ipfc_if_print,        DLT_IP_OVER_FC },
-#endif
-#ifdef DLT_LANE8023
-       { lane_if_print,        DLT_LANE8023 },
-#endif
-#ifdef DLT_C_HDLC
-       { chdlc_if_print,       DLT_C_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 },
-#endif
-       { token_if_print,       DLT_IEEE802 },
-#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
-       { 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[] = {
+static const struct printer printers[] = {

 #ifdef DLT_APPLE_IP_OVER_IEEE1394
        { ap1394_if_print,      DLT_APPLE_IP_OVER_IEEE1394 },
 #endif
 #ifdef DLT_APPLE_IP_OVER_IEEE1394
        { ap1394_if_print,      DLT_APPLE_IP_OVER_IEEE1394 },
 #endif


@@ -103,6 +51,7 @@ static const struct void_printer void_printers[] = {
 #ifdef DLT_ARCNET_LINUX
        { arcnet_linux_if_print, DLT_ARCNET_LINUX },
 #endif
 #ifdef DLT_ARCNET_LINUX
        { arcnet_linux_if_print, DLT_ARCNET_LINUX },
 #endif

+       { atm_if_print,         DLT_ATM_RFC1483 },

 #ifdef DLT_DSA_TAG_BRCM
        { brcm_tag_if_print,    DLT_DSA_TAG_BRCM },
 #endif
 #ifdef DLT_DSA_TAG_BRCM
        { brcm_tag_if_print,    DLT_DSA_TAG_BRCM },
 #endif


@@ -112,6 +61,12 @@ static const struct void_printer void_printers[] = {
 #ifdef DLT_BLUETOOTH_HCI_H4_WITH_PHDR
        { bt_if_print,          DLT_BLUETOOTH_HCI_H4_WITH_PHDR},
 #endif
 #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_HDLC
+       { chdlc_if_print,       DLT_HDLC },
+#endif

 #ifdef DLT_ATM_CLIP
        { cip_if_print,         DLT_ATM_CLIP },
 #endif
 #ifdef DLT_ATM_CLIP
        { cip_if_print,         DLT_ATM_CLIP },
 #endif


@@ -129,6 +84,12 @@ static const struct void_printer void_printers[] = {
 #endif
        { ether_if_print,       DLT_EN10MB },
        { fddi_if_print,        DLT_FDDI },
 #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_IEEE802_11
        { ieee802_11_if_print,  DLT_IEEE802_11},
 #endif
 #ifdef DLT_IEEE802_11
        { ieee802_11_if_print,  DLT_IEEE802_11},
 #endif


@@ -147,6 +108,9 @@ static const struct void_printer void_printers[] = {
 #ifdef DLT_IEEE802_15_4_TAP
        { ieee802_15_4_tap_if_print, DLT_IEEE802_15_4_TAP },
 #endif
 #ifdef DLT_IEEE802_15_4_TAP
        { ieee802_15_4_tap_if_print, DLT_IEEE802_15_4_TAP },
 #endif

+#ifdef DLT_IP_OVER_FC
+       { ipfc_if_print,        DLT_IP_OVER_FC },
+#endif

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


@@ -198,6 +162,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


@@ -211,12 +181,22 @@ 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

+#ifdef DLT_PFLOG
+       { 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_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 },
 #endif
 #ifdef DLT_PPP_ETHER
        { pppoe_if_print,       DLT_PPP_ETHER },
 #endif


@@ -246,6 +226,7 @@ static const struct void_printer void_printers[] = {
 #ifdef DLT_SYMANTEC_FIREWALL
        { symantec_if_print,    DLT_SYMANTEC_FIREWALL },
 #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 */


@@ -258,72 +239,19 @@ static const struct void_printer void_printers[] = {
        { NULL,                 0 },
 };
 
        { NULL,                 0 },
 };
 

-static void    ndo_default_print(netdissect_options *ndo, const u_char *bp,
-                   u_int length);
-
-static void NORETURN ndo_error(netdissect_options *ndo,
-                    status_exit_codes_t status,
-                    FORMAT_STRING(const char *fmt), ...)
-                    PRINTFLIKE(3, 4);
-static void    ndo_warning(netdissect_options *ndo,
-                   FORMAT_STRING(const char *fmt), ...)
-                   PRINTFLIKE(2, 3);
-
-static int     ndo_printf(netdissect_options *ndo,
-                    FORMAT_STRING(const char *fmt), ...)
-                    PRINTFLIKE(2, 3);
-
+// Both localnet and mask are in network byte order.

 void
 init_print(netdissect_options *ndo, uint32_t localnet, uint32_t mask)
 {
 void
 init_print(netdissect_options *ndo, uint32_t localnet, uint32_t mask)
 {

-

        init_addrtoname(ndo, localnet, mask);
        init_addrtoname(ndo, localnet, 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;
 
                if (type == p->type)
                        return p->f;
 


@@ -345,7 +273,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,48 +283,49 @@ 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;
 }
 

+#ifdef ENABLE_INSTRUMENT_FUNCTIONS
+extern int profile_func_level;
+static int pretty_print_packet_level = -1;
+#endif
+

 void
 pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
                    const u_char *sp, u_int packets_captured)
 {
 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;
 
        int invalid_header = 0;
 

+       if (ndo->ndo_print_sampling && packets_captured % ndo->ndo_print_sampling != 0)
+               return;
+
+#ifdef ENABLE_INSTRUMENT_FUNCTIONS
+       if (pretty_print_packet_level == -1)
+               pretty_print_packet_level = profile_func_level;
+#endif
+

        if (ndo->ndo_packet_number)
                ND_PRINT("%5u  ", packets_captured);
 
        if (ndo->ndo_packet_number)
                ND_PRINT("%5u  ", packets_captured);
 

+       if (ndo->ndo_lengths)
+               ND_PRINT("caplen %u len %u ", h->caplen, h->len);
+

        /* Sanity checks on packet length / capture length */
        if (h->caplen == 0) {
                invalid_header = 1;
        /* Sanity checks on packet length / capture length */
        if (h->caplen == 0) {
                invalid_header = 1;


@@ -450,7 +379,16 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
         * bigger lengths.
         */
 
         * bigger lengths.
         */
 

-       ts_print(ndo, &h->ts);
+       /*
+        * The header /usr/include/pcap/pcap.h in OpenBSD declares h->ts as
+        * struct bpf_timeval, not struct timeval. The former comes from
+        * /usr/include/net/bpf.h and uses 32-bit unsigned types instead of
+        * the types used in struct timeval.
+        */
+       struct timeval tvbuf;
+       tvbuf.tv_sec = h->ts.tv_sec;
+       tvbuf.tv_usec = h->ts.tv_usec;
+       ts_print(ndo, &tvbuf);

 
        /*
         * Printers must check that they're not walking off the end of
 
        /*
         * Printers must check that they're not walking off the end of


@@ -459,21 +397,27 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
         * of the netdissect_options structure.
         */
        ndo->ndo_snapend = sp + h->caplen;
         * of the netdissect_options structure.
         */
        ndo->ndo_snapend = sp + h->caplen;

+       ndo->ndo_packetp = sp;

 
        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);
+               /* Print the full packet */
+               ndo->ndo_ll_hdr_len = 0;
+#ifdef ENABLE_INSTRUMENT_FUNCTIONS
+               /* truncation => reassignment */
+               profile_func_level = pretty_print_packet_level;
+#endif
+               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;


@@ -484,10 +428,14 @@ pretty_print_packet(netdissect_options *ndo, const struct pcap_pkthdr *h,
        nd_pop_all_packet_info(ndo);
 
        /*
        nd_pop_all_packet_info(ndo);
 
        /*

-        * Restore the original snapend, as a printer might have
-        * changed it.
+        * Restore the originals snapend and packetp, as a printer
+        * might have changed them.
+        *
+        * XXX - nd_pop_all_packet_info() should have restored the
+        * original values, but, just in case....

         */
        ndo->ndo_snapend = sp + h->caplen;
         */
        ndo->ndo_snapend = sp + h->caplen;

+       ndo->ndo_packetp = sp;

        if (ndo->ndo_Xflag) {
                /*
                 * Print the raw packet data in hex and ASCII.
        if (ndo->ndo_Xflag) {
                /*
                 * Print the raw packet data in hex and ASCII.


@@ -560,9 +508,9 @@ ndo_default_print(netdissect_options *ndo, const u_char *bp, u_int length)
 }
 
 /* VARARGS */
 }
 
 /* VARARGS */

-static void
+static void NORETURN PRINTFLIKE(3, 4)

 ndo_error(netdissect_options *ndo, status_exit_codes_t status,
 ndo_error(netdissect_options *ndo, status_exit_codes_t status,

-         const char *fmt, ...)
+          FORMAT_STRING(const char *fmt), ...)

 {
        va_list ap;
 
 {
        va_list ap;
 


@@ -582,8 +530,8 @@ ndo_error(netdissect_options *ndo, status_exit_codes_t status,
 }
 
 /* VARARGS */
 }
 
 /* VARARGS */

-static void
-ndo_warning(netdissect_options *ndo, const char *fmt, ...)
+static void PRINTFLIKE(2, 3)
+ndo_warning(netdissect_options *ndo, FORMAT_STRING(const char *fmt), ...)

 {
        va_list ap;
 
 {
        va_list ap;
 


@@ -600,8 +548,9 @@ ndo_warning(netdissect_options *ndo, const char *fmt, ...)
        }
 }
 
        }
 }
 

-static int
-ndo_printf(netdissect_options *ndo, const char *fmt, ...)
+/* VARARGS */
+static int PRINTFLIKE(2, 3)
+ndo_printf(netdissect_options *ndo, FORMAT_STRING(const char *fmt), ...)

 {
        va_list args;
        int ret;
 {
        va_list args;
        int ret;