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

[tcpdump] / print-null.c

diff --git a/print-null.c b/print-null.c
index bfdf3e41958e79608f737a22b37ae65eb32f5757..725d583939afbae752c0866cd96c6eed17e7460b 100644 (file)
--- a/print-null.c
+++ b/print-null.c
@@ -19,28 +19,17 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-null.c,v 1.53 2005-04-06 21:32:41 mcr Exp $ (LBL)";
-#endif
+/* \summary: BSD loopback device printer */

 
 

-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+#include <config.h>

 
 

-#include <tcpdump-stdinc.h>
+#include "netdissect-stdinc.h"

 
 

-#include <pcap.h>
-#include <stdio.h>
-#include <string.h>
+#define ND_LONGJMP_FROM_TCHECK
+#include "netdissect.h"
+#include "extract.h"
+#include "af.h"

 
 

-#include "interface.h"
-#include "addrtoname.h"
-
-#include "ip.h"
-#ifdef INET6
-#include "ip6.h"
-#endif

 
 /*
  * The DLT_NULL packet header is 4 bytes long. It contains a host-byte-order
 
 /*
  * The DLT_NULL packet header is 4 bytes long. It contains a host-byte-order


@@ -54,66 +43,6 @@ static const char rcsid[] _U_ =
  */
 #define        NULL_HDRLEN 4
 
  */
 #define        NULL_HDRLEN 4
 

-/*
- * BSD AF_ values.
- *
- * Unfortunately, the BSDs don't all use the same value for AF_INET6,
- * so, because we want to be able to read captures from all of the BSDs,
- * we check for all of them.
- */
-#define BSD_AF_INET            2
-#define BSD_AF_NS              6               /* XEROX NS protocols */
-#define BSD_AF_ISO             7
-#define BSD_AF_APPLETALK       16
-#define BSD_AF_IPX             23
-#define BSD_AF_INET6_BSD       24      /* OpenBSD (and probably NetBSD), BSD/OS */
-#define BSD_AF_INET6_FREEBSD   28
-#define BSD_AF_INET6_DARWIN    30
-
-static void
-null_print(u_int family, u_int length)
-{
-       if (nflag)
-               printf("AF %u ", family);
-       else {
-               switch (family) {
-
-               case BSD_AF_INET:
-                       printf("ip ");
-                       break;
-
-#ifdef INET6
-               case BSD_AF_INET6_BSD:
-               case BSD_AF_INET6_FREEBSD:
-               case BSD_AF_INET6_DARWIN:
-                       printf("ip6 ");
-                       break;
-#endif
-
-               case BSD_AF_NS:
-                       printf("ns ");
-                       break;
-
-               case BSD_AF_ISO:
-                       printf("osi ");
-                       break;
-
-               case BSD_AF_APPLETALK:
-                       printf("atalk ");
-                       break;
-
-               case BSD_AF_IPX:
-                       printf("ipx ");
-                       break;
-
-               default:
-                       printf("AF %u ", family);
-                       break;
-               }
-       }
-       printf("%d: ", length);
-}
-

 /*
  * Byte-swap a 32-bit number.
  * ("htonl()" or "ntohl()" won't work - we want to byte-swap even on
 /*
  * Byte-swap a 32-bit number.
  * ("htonl()" or "ntohl()" won't work - we want to byte-swap even on


@@ -122,25 +51,38 @@ null_print(u_int family, u_int length)
 #define        SWAPLONG(y) \
 ((((y)&0xff)<<24) | (((y)&0xff00)<<8) | (((y)&0xff0000)>>8) | (((y)>>24)&0xff))
 
 #define        SWAPLONG(y) \
 ((((y)&0xff)<<24) | (((y)&0xff00)<<8) | (((y)&0xff0000)>>8) | (((y)>>24)&0xff))
 

+static void
+null_hdr_print(netdissect_options *ndo, uint32_t family, u_int length)
+{
+       if (!ndo->ndo_qflag) {
+               ND_PRINT("AF %s (%u)",
+                       tok2str(bsd_af_values,"Unknown",family),family);
+       } else {
+               ND_PRINT("%s",
+                       tok2str(bsd_af_values,"Unknown AF %u",family));
+       }
+
+       ND_PRINT(", length %u: ", length);
+}
+

 /*
  * This is the top level routine of the printer.  'p' points
  * to the ether header of the packet, 'h->ts' is the timestamp,
  * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
 /*
  * This is the top level routine of the printer.  'p' points
  * to the ether header of the packet, 'h->ts' is the timestamp,
  * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */

-u_int
-null_if_print(const struct pcap_pkthdr *h, const u_char *p)
+void
+null_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)

 {
        u_int length = h->len;
        u_int caplen = h->caplen;
 {
        u_int length = h->len;
        u_int caplen = h->caplen;

-       u_int family;
+       uint32_t family;

 
 

-       if (caplen < NULL_HDRLEN) {
-               printf("[|null]");
-               return (NULL_HDRLEN);
-       }
+       ndo->ndo_protocol = "null";
+       ND_TCHECK_LEN(p, NULL_HDRLEN);
+       ndo->ndo_ll_hdr_len += NULL_HDRLEN;

 
 

-       memcpy((char *)&family, (char *)p, sizeof(family));
+       family = GET_HE_U_4(p);

 
        /*
         * This isn't necessarily in our host byte order; if this is
 
        /*
         * This isn't necessarily in our host byte order; if this is


@@ -153,53 +95,42 @@ null_if_print(const struct pcap_pkthdr *h, const u_char *p)
        if ((family & 0xFFFF0000) != 0)
                family = SWAPLONG(family);
 
        if ((family & 0xFFFF0000) != 0)
                family = SWAPLONG(family);
 

+       if (ndo->ndo_eflag)
+               null_hdr_print(ndo, family, length);
+

        length -= NULL_HDRLEN;
        caplen -= NULL_HDRLEN;
        p += NULL_HDRLEN;
 
        length -= NULL_HDRLEN;
        caplen -= NULL_HDRLEN;
        p += NULL_HDRLEN;
 

-       if (eflag)
-               null_print(family, length);
-

        switch (family) {
 
        case BSD_AF_INET:
        switch (family) {
 
        case BSD_AF_INET:

-               ip_print(gndo, p, length);
+               ip_print(ndo, p, length);

                break;
 
                break;
 

-#ifdef INET6

        case BSD_AF_INET6_BSD:
        case BSD_AF_INET6_FREEBSD:
        case BSD_AF_INET6_DARWIN:
        case BSD_AF_INET6_BSD:
        case BSD_AF_INET6_FREEBSD:
        case BSD_AF_INET6_DARWIN:

-               ip6_print(p, length);
+               ip6_print(ndo, p, length);

                break;
                break;

-#endif

 
        case BSD_AF_ISO:
 
        case BSD_AF_ISO:

-               isoclns_print(p, length, caplen);
+               isoclns_print(ndo, p, length);

                break;
 
        case BSD_AF_APPLETALK:
                break;
 
        case BSD_AF_APPLETALK:

-               atalk_print(p, length);
+               atalk_print(ndo, p, length);

                break;
 
        case BSD_AF_IPX:
                break;
 
        case BSD_AF_IPX:

-               ipx_print(p, length);
+               ipx_print(ndo, p, length);

                break;
 
        default:
                /* unknown AF_ value */
                break;
 
        default:
                /* unknown AF_ value */

-               if (!eflag)
-                       null_print(family, length + NULL_HDRLEN);
-               if (!xflag && !qflag)
-                       default_print(p, caplen);
+               if (!ndo->ndo_eflag)
+                       null_hdr_print(ndo, family, length + NULL_HDRLEN);
+               if (!ndo->ndo_suppress_default_print)
+                       ND_DEFAULTPRINT(p, caplen);

        }
        }

-
-       return (NULL_HDRLEN);

 }
 }

-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */