Upgrade to tcpdump 4.7.4.
Bug: http://b/24902618
Change-Id: I7c3605015d90453b0a8c339b1774e285796f8775
diff --git a/print-frag6.c b/print-frag6.c
index e125bd3..1290952 100644
--- a/print-frag6.c
+++ b/print-frag6.c
@@ -19,11 +19,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef lint
-static const char rcsid[] _U_ =
- "@(#) $Header: /tcpdump/master/tcpdump/print-frag6.c,v 1.20 2005-04-20 22:33:06 guy Exp $";
-#endif
-
+#define NETDISSECT_REWORKED
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -32,16 +28,12 @@
#include <tcpdump-stdinc.h>
-#include <stdio.h>
-
#include "ip6.h"
-
#include "interface.h"
-#include "addrtoname.h"
#include "extract.h"
int
-frag6_print(register const u_char *bp, register const u_char *bp2)
+frag6_print(netdissect_options *ndo, register const u_char *bp, register const u_char *bp2)
{
register const struct ip6_frag *dp;
register const struct ip6_hdr *ip6;
@@ -49,34 +41,31 @@
dp = (const struct ip6_frag *)bp;
ip6 = (const struct ip6_hdr *)bp2;
- TCHECK(dp->ip6f_offlg);
+ ND_TCHECK(dp->ip6f_offlg);
- if (vflag) {
- printf("frag (0x%08x:%d|%ld)",
+ 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));
+ (long)(bp - bp2) - sizeof(struct ip6_frag)));
} else {
- printf("frag (%d|%ld)",
+ 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));
+ (long)(bp - bp2) - sizeof(struct ip6_frag)));
}
-#if 1
/* it is meaningless to decode non-first fragment */
if ((EXTRACT_16BITS(&dp->ip6f_offlg) & IP6F_OFF_MASK) != 0)
return -1;
else
-#endif
{
- fputs(" ", stdout);
+ ND_PRINT((ndo, " "));
return sizeof(struct ip6_frag);
}
trunc:
- fputs("[|frag]", stdout);
+ ND_PRINT((ndo, "[|frag]"));
return -1;
-#undef TCHECK
}
#endif /* INET6 */