diff options
| author | fenner <fenner@FreeBSD.org> | 2001-07-23 23:15:44 +0000 |
|---|---|---|
| committer | fenner <fenner@FreeBSD.org> | 2001-07-23 23:15:44 +0000 |
| commit | 274f364f056e74c94633e04d95512c900155cb62 (patch) | |
| tree | 85142bb010e2a52ed425c332ae2b441e9a57b408 /contrib/tcpdump | |
| parent | 656ab0c2a8c6557aac660b514e53fdac9e683db9 (diff) | |
| download | FreeBSD-src-274f364f056e74c94633e04d95512c900155cb62.zip FreeBSD-src-274f364f056e74c94633e04d95512c900155cb62.tar.gz | |
Merge tcpdump 3.6.3
Diffstat (limited to 'contrib/tcpdump')
| -rw-r--r-- | contrib/tcpdump/print-domain.c | 3 | ||||
| -rw-r--r-- | contrib/tcpdump/tcpdump.1 | 9 |
2 files changed, 10 insertions, 2 deletions
diff --git a/contrib/tcpdump/print-domain.c b/contrib/tcpdump/print-domain.c index 91fc3f6..fff315e 100644 --- a/contrib/tcpdump/print-domain.c +++ b/contrib/tcpdump/print-domain.c @@ -23,7 +23,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-domain.c,v 1.64 2001/01/02 23:24:51 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-domain.c,v 1.64.2.1 2001/02/21 09:01:20 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -557,6 +557,7 @@ ns_print(register const u_char *bp, u_int length) register const u_char *cp = NULL; np = (const HEADER *)bp; + TCHECK(*np); /* get the byte-order right */ qdcount = ntohs(np->qdcount); ancount = ntohs(np->ancount); diff --git a/contrib/tcpdump/tcpdump.1 b/contrib/tcpdump/tcpdump.1 index 785bfbc..64e6144 100644 --- a/contrib/tcpdump/tcpdump.1 +++ b/contrib/tcpdump/tcpdump.1 @@ -1,4 +1,4 @@ -.\" @(#) $Header: /tcpdump/master/tcpdump/tcpdump.1,v 1.92.2.2 2001/01/18 04:38:31 guy Exp $ (LBL) +.\" @(#) $Header: /tcpdump/master/tcpdump/tcpdump.1,v 1.92.2.3 2001/03/04 00:19:48 guy Exp $ (LBL) .\" .\" Copyright (c) 1987, 1988, 1989, 1990, 1991, 1992, 1994, 1995, 1996, 1997 .\" The Regents of the University of California. All rights reserved. @@ -250,6 +250,13 @@ Print absolute, rather than relative, TCP sequence numbers. .B \-tt Print an unformatted timestamp on each dump line. .TP +.B \-ttt +Print a delta (in micro-seconds) between current and previous line +on each dump line. +.TP +.B \-tttt +Print a timestamp in default format proceeded by date on each dump line. +.TP .B \-v (Slightly more) verbose output. For example, the time to live, identification, total length and options in an IP packet are printed. |
