Changes 6.6.2:

Fixed tcpdump.c to trace IP packets buried under VLAN headers.

Changes 6.6.3:
Added a function MissingData() in trace.c to check if TCP segments were
missing or were truncated when the -e option is given to extract
contents.

Changes 6.6.4:
Adding in the INBOUNDS module into the main tcptrace development tree.
It is NOT built in by default though; you need to uncomment a line in
Makefile.in to enable it.

Changes 6.6.5:
* Josh fixed the file format searching order, putting tcpdump format to
the end in file_formats.h as a work around for libpcap brokenness.
* Fixed Mfopen() in mfiles.c to open content data files that we
generate in "binary" mode - by changing fopen mode from "w" to "wb+" and "a"
to "ab+". The 'b' is dummy in UNIX systems, but seems to have some
semantic in the Windows world.
* Fixed QuitSig() function in tcptrace.c by adding a call to
udptrace_done() so that we print out UDP connection stats too (if one
were piping live tcpdump traffic to tcptrace and "ctrl-c"-ed it in the
middle, for example). On the way, also fixed the arbitrary "buf[4096]"
declaration to be written correctly as "buf[COMP_HDR_SIZE]" in the
PipeFitting() function.

Changes 6.6.6:
Fixed the callback function in tcpdump.c to prevent garbage data from
getting into the ip_buf buffer.

Changes 6.6.7:
Fixed bugs found in the AVL search function that had major bugs /
complexity issues.

3 files changed, 16 insertions, 18 deletions

diff --git a/net/tcptrace/Makefile b/net/tcptrace/Makefile
index 969e8f1bca9..ea5b0d57c73 100644
--- a/net/tcptrace/Makefile
+++ b/net/tcptrace/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2005/06/17 03:50:28 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.29 2005/08/26 08:32:13 adam Exp $
 
-DISTNAME=	tcptrace-6.6.1
-PKGREVISION=	1
+DISTNAME=	tcptrace-6.6.7
 CATEGORIES=	net
 MASTER_SITES=	http://www.tcptrace.org/download/
 
@@ -10,13 +8,13 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.tcptrace.org/
 COMMENT=	TCP dump file analysis tool
 
-GNU_CONFIGURE=	yes
+GNU_CONFIGURE=		yes
 
-BUILD_TARGET=	tcptrace
+BUILD_TARGET=		tcptrace
 
-DOCFILES=	COPYRIGHT FAQ README README.tput_graphs
+DOCFILES=		COPYRIGHT FAQ README README.tput_graphs
 
-LDFLAGS.SunOS+=	-lm
+LDFLAGS.SunOS+=		-lm
 
 INSTALLATION_DIRS=	bin man/man1
 
diff --git a/net/tcptrace/distinfo b/net/tcptrace/distinfo
index 6ccb67c4ac6..91658e8b585 100644
--- a/net/tcptrace/distinfo
+++ b/net/tcptrace/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 12:14:05 agc Exp $
+$NetBSD: distinfo,v 1.7 2005/08/26 08:32:13 adam Exp $
 
-SHA1 (tcptrace-6.6.1.tar.gz) = e676a3ff8e71dc97e17600d79100476c22c2cb74
-RMD160 (tcptrace-6.6.1.tar.gz) = d53409868fe3b5937688b1dbb2337525e45e4626
-Size (tcptrace-6.6.1.tar.gz) = 3756942 bytes
-SHA1 (patch-aa) = 80b211dadb9ea9ebebf854e544d3694412baeac6
+SHA1 (tcptrace-6.6.7.tar.gz) = ae4d10a0829c57f2eda17e63f593e558f52b7f24
+RMD160 (tcptrace-6.6.7.tar.gz) = 1dd0f373f766322343ffad59d0655eba4c6682e0
+Size (tcptrace-6.6.7.tar.gz) = 3773308 bytes
+SHA1 (patch-aa) = c2ff30c18659f803160fbb0567acdffbbd1b4b60
diff --git a/net/tcptrace/patches/patch-aa b/net/tcptrace/patches/patch-aa
index cb21464bd34..a6a4ef0dd9b 100644
--- a/net/tcptrace/patches/patch-aa
+++ b/net/tcptrace/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.7 2003/08/20 08:28:57 grant Exp $
+$NetBSD: patch-aa,v 1.8 2005/08/26 08:32:13 adam Exp $
 
---- Makefile.in.orig	2003-04-04 09:38:48.000000000 +1000
+--- Makefile.in.orig	2004-03-04 20:33:56.000000000 +0000
 +++ Makefile.in
 @@ -1,4 +1,4 @@
 -#
@@ -19,7 +19,7 @@ $NetBSD: patch-aa,v 1.7 2003/08/20 08:28:57 grant Exp $
  
  
  
-@@ -118,8 +118,8 @@ DEFINES += -DGROK_NETSCOUT
+@@ -129,8 +129,8 @@ DEFINES += -DGROK_ERF
  # 
  ################################################################## 
  # Pathname of directory to install the binary
@@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.7 2003/08/20 08:28:57 grant Exp $
  
  
  ################################################################## 
-@@ -140,7 +140,7 @@ INCLS = -I. @V_INCLS@ ${PCAP_INCS}
+@@ -151,7 +151,7 @@ INCLS = -I. @V_INCLS@ ${PCAP_INCS}
  # Probably want full optimization
  # FreeBSD needs	-Ae
  # HP needs	-Ae
@@ -39,7 +39,7 @@ $NetBSD: patch-aa,v 1.7 2003/08/20 08:28:57 grant Exp $
  
  # Standard LIBS
  LDLIBS = @LIBS@ ${PCAP_LDLIBS}
-@@ -185,7 +185,7 @@ tcptrace: ${OFILES}
+@@ -196,7 +196,7 @@ tcptrace: ${OFILES}
  # your machine, just hack in a quick string below in place of the command.
  version.o: ${CFILES} Makefile
  	${CC} ${CFLAGS} -o version.o -c $(srcdir)/version.c \