summaryrefslogtreecommitdiffstats
path: root/contrib/tcpdump/print-frag6.c
diff options
context:
space:
mode:
authorfenner <fenner@FreeBSD.org>2001-04-03 07:45:48 +0000
committerfenner <fenner@FreeBSD.org>2001-04-03 07:45:48 +0000
commitf7d9a5e270bfcbb075a637a52416185441d33d8d (patch)
treee79d9e6f58638911260708c956a0d44069782cda /contrib/tcpdump/print-frag6.c
parent04f715925eb0f85e1b7d21424cdbb3f6f1fa0b41 (diff)
parentace14a2b50f2cc05c079d0b9137b49066dbb1206 (diff)
downloadFreeBSD-src-f7d9a5e270bfcbb075a637a52416185441d33d8d.zip
FreeBSD-src-f7d9a5e270bfcbb075a637a52416185441d33d8d.tar.gz
This commit was generated by cvs2svn to compensate for changes in r75115,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib/tcpdump/print-frag6.c')
-rw-r--r--contrib/tcpdump/print-frag6.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/contrib/tcpdump/print-frag6.c b/contrib/tcpdump/print-frag6.c
index a043e8f..abf0cc6 100644
--- a/contrib/tcpdump/print-frag6.c
+++ b/contrib/tcpdump/print-frag6.c
@@ -21,7 +21,7 @@
#ifndef lint
static const char rcsid[] =
- "@(#) $Header: /tcpdump/master/tcpdump/print-frag6.c,v 1.3.2.1 2000/01/11 06:58:24 fenner Exp $";
+ "@(#) $Header: /tcpdump/master/tcpdump/print-frag6.c,v 1.12 2000/10/07 05:53:10 itojun Exp $";
#endif
#ifdef HAVE_CONFIG_H
@@ -35,21 +35,12 @@ static const char rcsid[] =
#include <sys/types.h>
#include <sys/socket.h>
-#include <net/if.h>
#include <netinet/in.h>
-#include <netinet/if_ether.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_icmp.h>
-#include <netinet/ip_var.h>
-#include <netinet/udp.h>
-#include <netinet/udp_var.h>
-#include <netinet/tcp.h>
#include <stdio.h>
-#include <netinet/ip6.h>
+#include "ip6.h"
#include "interface.h"
#include "addrtoname.h"
@@ -68,7 +59,7 @@ frag6_print(register const u_char *bp, register const u_char *bp2)
dp = (struct ip6_frag *)bp;
ip6 = (struct ip6_hdr *)bp2;
- /* 'ep' points to the end of avaible data. */
+ /* 'ep' points to the end of available data. */
ep = snapend;
TCHECK(dp->ip6f_offlg);
@@ -86,7 +77,7 @@ frag6_print(register const u_char *bp, register const u_char *bp2)
(long)(bp - bp2) - sizeof(struct ip6_frag));
}
-#if 0
+#if 1
/* it is meaningless to decode non-first fragment */
if (ntohs(dp->ip6f_offlg & IP6F_OFF_MASK) != 0)
return 65535;
OpenPOWER on IntegriCloud