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

[tcpdump] / print-ipnet.c

diff --git a/print-ipnet.c b/print-ipnet.c
index 187f939d3f8c130ceef06bcc62a47767a3669579..65f626163b6d1a4eb98bcae328c0f8ed8da7d0db 100644 (file)
--- a/print-ipnet.c
+++ b/print-ipnet.c
@@ -1,85 +1,93 @@
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+/* \summary: Solaris DLT_IPNET printer */

 
 

-#include <tcpdump-stdinc.h>
+#include <config.h>

 
 

-#include <stdio.h>
-#include <pcap.h>
+#include "netdissect-stdinc.h"

 
 

+#define ND_LONGJMP_FROM_TCHECK

 #include "netdissect.h"
 #include "netdissect.h"

-#include "interface.h"
-#include "addrtoname.h"
-#include "ipnet.h"
+#include "extract.h"
+
+
+typedef struct ipnet_hdr {
+       nd_uint8_t      iph_version;
+       nd_uint8_t      iph_family;
+       nd_uint16_t     iph_htype;
+       nd_uint32_t     iph_pktlen;
+       nd_uint32_t     iph_ifindex;
+       nd_uint32_t     iph_grifindex;
+       nd_uint32_t     iph_zsrc;
+       nd_uint32_t     iph_zdst;
+} ipnet_hdr_t;
+
+#define        IPH_AF_INET     2               /* Matches Solaris's AF_INET */
+#define        IPH_AF_INET6    26              /* Matches Solaris's AF_INET6 */

 
 #ifdef DLT_IPNET
 
 
 #ifdef DLT_IPNET
 

-const struct tok ipnet_values[] = {
+static const struct tok ipnet_values[] = {

        { IPH_AF_INET,          "IPv4" },
        { IPH_AF_INET6,         "IPv6" },
        { 0,                    NULL }
 };
 
        { IPH_AF_INET,          "IPv4" },
        { IPH_AF_INET6,         "IPv6" },
        { 0,                    NULL }
 };
 

-static inline void
-ipnet_hdr_print(struct netdissect_options *ndo, const u_char *bp, u_int length)
+static void
+ipnet_hdr_print(netdissect_options *ndo, const u_char *bp, u_int length)

 {
        const ipnet_hdr_t *hdr;
        hdr = (const ipnet_hdr_t *)bp;
 
 {
        const ipnet_hdr_t *hdr;
        hdr = (const ipnet_hdr_t *)bp;
 

-       ND_PRINT((ndo, "%d > %d", hdr->iph_zsrc, hdr->iph_zdst));
+       ND_PRINT("%u > %u", GET_BE_U_4(hdr->iph_zsrc),
+                 GET_BE_U_4(hdr->iph_zdst));

 
        if (!ndo->ndo_qflag) {
 
        if (!ndo->ndo_qflag) {

-               ND_PRINT((ndo,", family %s (%d)",
+               ND_PRINT(", family %s (%u)",

                           tok2str(ipnet_values, "Unknown",
                           tok2str(ipnet_values, "Unknown",

-                                  hdr->iph_family),
-                          hdr->iph_family));
+                                  GET_U_1(hdr->iph_family)),
+                          GET_U_1(hdr->iph_family));

         } else {
         } else {

-               ND_PRINT((ndo,", %s",
+               ND_PRINT(", %s",

                           tok2str(ipnet_values,
                                   "Unknown Ethertype (0x%04x)",
                           tok2str(ipnet_values,
                                   "Unknown Ethertype (0x%04x)",

-                                  hdr->iph_family)));
+                                 GET_U_1(hdr->iph_family)));

         }
 
         }
 

-       ND_PRINT((ndo, ", length %u: ", length));
+       ND_PRINT(", length %u: ", length);

 }
 
 static void
 }
 
 static void

-ipnet_print(struct netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)
+ipnet_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen)

 {
 {

-       ipnet_hdr_t *hdr;
+       const ipnet_hdr_t *hdr;

 
 

-       if (caplen < sizeof(ipnet_hdr_t)) {
-               ND_PRINT((ndo, "[|ipnet]"));
-               return;
-       }
+       ND_TCHECK_LEN(p, sizeof(ipnet_hdr_t));
+       ndo->ndo_ll_hdr_len += sizeof(ipnet_hdr_t);

 
        if (ndo->ndo_eflag)
                ipnet_hdr_print(ndo, p, length);
 
        length -= sizeof(ipnet_hdr_t);
        caplen -= sizeof(ipnet_hdr_t);
 
        if (ndo->ndo_eflag)
                ipnet_hdr_print(ndo, p, length);
 
        length -= sizeof(ipnet_hdr_t);
        caplen -= sizeof(ipnet_hdr_t);

-       hdr = (ipnet_hdr_t *)p;
+       hdr = (const ipnet_hdr_t *)p;

        p += sizeof(ipnet_hdr_t);
 
        p += sizeof(ipnet_hdr_t);
 

-       switch (hdr->iph_family) {
+       switch (GET_U_1(hdr->iph_family)) {

 
        case IPH_AF_INET:
                ip_print(ndo, p, length);
                break;
 
 
        case IPH_AF_INET:
                ip_print(ndo, p, length);
                break;
 

-#ifdef INET6

        case IPH_AF_INET6:
                ip6_print(ndo, p, length);
                break;
        case IPH_AF_INET6:
                ip6_print(ndo, p, length);
                break;

-#endif /*INET6*/

 
        default:
                if (!ndo->ndo_eflag)
 
        default:
                if (!ndo->ndo_eflag)

-                       ipnet_hdr_print(ndo, (u_char *)hdr,
+                       ipnet_hdr_print(ndo, (const u_char *)hdr,

                                        length + sizeof(ipnet_hdr_t));
 
                if (!ndo->ndo_suppress_default_print)
                                        length + sizeof(ipnet_hdr_t));
 
                if (!ndo->ndo_suppress_default_print)

-                       ndo->ndo_default_print(ndo, p, caplen);
+                       ND_DEFAULTPRINT(p, caplen);

                break;
        }
 }
                break;
        }
 }


@@ -90,20 +98,11 @@ ipnet_print(struct netdissect_options *ndo, const u_char *p, u_int length, u_int
  * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
  * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */

-u_int
-ipnet_if_print(struct netdissect_options *ndo,
+void
+ipnet_if_print(netdissect_options *ndo,

                const struct pcap_pkthdr *h, const u_char *p)
 {
                const struct pcap_pkthdr *h, const u_char *p)
 {

+       ndo->ndo_protocol = "ipnet";

        ipnet_print(ndo, p, h->len, h->caplen);
        ipnet_print(ndo, p, h->len, h->caplen);

-
-       return (sizeof(ipnet_hdr_t));

 }
 }

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

 #endif /* DLT_IPNET */
 #endif /* DLT_IPNET */