CHANGES: Add/move change(s) backported to 4.99

[tcpdump] / print-frag6.c

diff --git a/print-frag6.c b/print-frag6.c
index 13ce5ba40fb3604865dda34ac21d54d65159678a..abc2a6367380927c6fe242c06b6f7a7df34717e2 100644 (file)
--- a/print-frag6.c
+++ b/print-frag6.c
@@ -21,12 +21,11 @@
 
 /* \summary: IPv6 fragmentation header printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
+#define ND_LONGJMP_FROM_TCHECK
 #include "netdissect.h"
 #include "extract.h"
 
@@ -45,6 +44,8 @@ frag6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2)
        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))