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

[tcpdump] / print-frag6.c

diff --git a/print-frag6.c b/print-frag6.c
index b8c49fd986946b5866011f6d1856e546909d6db7..abc2a6367380927c6fe242c06b6f7a7df34717e2 100644 (file)
--- a/print-frag6.c
+++ b/print-frag6.c
@@ -19,52 +19,47 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+/* \summary: IPv6 fragmentation header printer */
 
-#ifdef INET6
+#include <config.h>
 
-#include <tcpdump-stdinc.h>
+#include "netdissect-stdinc.h"
 
-#include "ip6.h"
+#define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "extract.h"
 
+#include "ip6.h"
+
 int
-frag6_print(netdissect_options *ndo, register const u_char *bp, register const u_char *bp2)
+frag6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2)
 {
-       register const struct ip6_frag *dp;
-       register const struct ip6_hdr *ip6;
+       const struct ip6_frag *dp;
+       const struct ip6_hdr *ip6;
 
+       ndo->ndo_protocol = "frag6";
        dp = (const struct ip6_frag *)bp;
        ip6 = (const struct ip6_hdr *)bp2;
 
-       ND_TCHECK(dp->ip6f_offlg);
-
-       if (ndo->ndo_vflag) {
-               ND_PRINT((ndo, "frag (0x%08x:%d|%ld)",
-                      EXTRACT_32BITS(&dp->ip6f_ident),
-                      EXTRACT_16BITS(&dp->ip6f_offlg) & IP6F_OFF_MASK,
-                      sizeof(struct ip6_hdr) + EXTRACT_16BITS(&ip6->ip6_plen) -
-                              (long)(bp - bp2) - sizeof(struct ip6_frag)));
-       } else {
-               ND_PRINT((ndo, "frag (%d|%ld)",
-                      EXTRACT_16BITS(&dp->ip6f_offlg) & IP6F_OFF_MASK,
-                      sizeof(struct ip6_hdr) + EXTRACT_16BITS(&ip6->ip6_plen) -
-                              (long)(bp - bp2) - sizeof(struct ip6_frag)));
-       }
+       ND_PRINT("frag (");
+       if (ndo->ndo_vflag)
+               ND_PRINT("0x%08x:", GET_BE_U_4(dp->ip6f_ident));
+       else
+               ND_TCHECK_4(dp->ip6f_ident);
+       ND_PRINT("%u|", GET_BE_U_2(dp->ip6f_offlg) & IP6F_OFF_MASK);
+       if ((bp - bp2) + sizeof(struct ip6_frag) >
+           sizeof(struct ip6_hdr) + GET_BE_U_2(ip6->ip6_plen))
+               ND_PRINT("[length < 0] (invalid))");
+       else
+               ND_PRINT("%zu)",
+                        sizeof(struct ip6_hdr) + GET_BE_U_2(ip6->ip6_plen) -
+                        (bp - bp2) - sizeof(struct ip6_frag));
 
        /* it is meaningless to decode non-first fragment */
-       if ((EXTRACT_16BITS(&dp->ip6f_offlg) & IP6F_OFF_MASK) != 0)
+       if ((GET_BE_U_2(dp->ip6f_offlg) & IP6F_OFF_MASK) != 0)
                return -1;
-       else
-       {
-               ND_PRINT((ndo, " "));
+       else {
+               ND_PRINT(" ");
                return sizeof(struct ip6_frag);
        }
-trunc:
-       ND_PRINT((ndo, "[|frag]"));
-       return -1;
 }
-#endif /* INET6 */