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 9bb6c184ed6edf5f5d9d41921d1551b73d085a64..65f626163b6d1a4eb98bcae328c0f8ed8da7d0db 100644 (file)
--- a/print-ipnet.c
+++ b/print-ipnet.c
@@ -1,15 +1,13 @@
 /* \summary: Solaris DLT_IPNET printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
+#define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "extract.h"
 
-static const char tstr[] = "[|ipnet]";
 
 typedef struct ipnet_hdr {
        nd_uint8_t      iph_version;
@@ -39,26 +37,22 @@ ipnet_hdr_print(netdissect_options *ndo, const u_char *bp, u_int length)
        const ipnet_hdr_t *hdr;
        hdr = (const ipnet_hdr_t *)bp;
 
-       ND_TCHECK_SIZE(hdr);
-       ND_PRINT("%u > %u", EXTRACT_BE_U_4(hdr->iph_zsrc),
-                 EXTRACT_BE_U_4(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) {
                ND_PRINT(", family %s (%u)",
                           tok2str(ipnet_values, "Unknown",
-                                  EXTRACT_U_1(hdr->iph_family)),
-                          EXTRACT_U_1(hdr->iph_family));
+                                  GET_U_1(hdr->iph_family)),
+                          GET_U_1(hdr->iph_family));
         } else {
                ND_PRINT(", %s",
                           tok2str(ipnet_values,
                                   "Unknown Ethertype (0x%04x)",
-                                 EXTRACT_U_1(hdr->iph_family)));
+                                 GET_U_1(hdr->iph_family)));
         }
 
        ND_PRINT(", length %u: ", length);
-       return;
-trunc:
-       ND_PRINT(" %s", tstr);
 }
 
 static void
@@ -66,9 +60,8 @@ ipnet_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen
 {
        const ipnet_hdr_t *hdr;
 
-       ndo->ndo_protocol = "ipnet";
-       if (caplen < sizeof(ipnet_hdr_t))
-               goto trunc;
+       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);
@@ -78,8 +71,7 @@ ipnet_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen
        hdr = (const ipnet_hdr_t *)p;
        p += sizeof(ipnet_hdr_t);
 
-       ND_TCHECK_1(hdr->iph_family);
-       switch (EXTRACT_U_1(hdr->iph_family)) {
+       switch (GET_U_1(hdr->iph_family)) {
 
        case IPH_AF_INET:
                ip_print(ndo, p, length);
@@ -98,9 +90,6 @@ ipnet_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen
                        ND_DEFAULTPRINT(p, caplen);
                break;
        }
-       return;
-trunc:
-       ND_PRINT(" %s", tstr);
 }
 
 /*
@@ -109,13 +98,11 @@ trunc:
  * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
-u_int
+void
 ipnet_if_print(netdissect_options *ndo,
                const struct pcap_pkthdr *h, const u_char *p)
 {
-       ndo->ndo_protocol = "ipnet_if";
+       ndo->ndo_protocol = "ipnet";
        ipnet_print(ndo, p, h->len, h->caplen);
-
-       return (sizeof(ipnet_hdr_t));
 }
 #endif /* DLT_IPNET */