pulled up some changes from the 4.0 release branch

4 files changed, 38 insertions, 9 deletions

diff --git a/CHANGES b/CHANGES
index 851e8a3d..49eda885 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,36 @@
-$Header: /tcpdump/master/tcpdump/CHANGES,v 1.98 2007-07-24 02:23:01 mcr Exp $
-
-Wed.	July 23, 2007.  mcr@xelerance.com.  Summary for 0.9.7 libpcap release
+$Header: /tcpdump/master/tcpdump/CHANGES,v 1.99 2008-11-09 23:35:03 mcr Exp $
+
+Mon.    October 27, 2008.  ken@netfunctional.ca.  Summary for 4.0.0 tcpdump release
+        Add support for Bluetooth Sniffing
+        Add support for Realtek Remote Control Protocol (openrrcp.org.ru)
+        Add support for 802.11 AVS
+        Add support for SMB over TCP
+        Add support for 4 byte BGP AS printing
+        Add support for compiling on case-insensitive file systems
+        Add support for ikev2 printing
+        Update support for decoding AFS
+        Update DHCPv6 printer
+        Use newer libpcap API's (allows -B option on all platforms)
+        Add -I to turn on monitor mode
+        Bugfixes in lldp, lspping, dccp, ESP, NFS printers
+        Cleanup unused files and various cruft
+
+Mon.    September 10, 2007.  ken@xelerance.com.  Summary for 3.9.8 tcpdump release
+        Rework ARP printer
+        Rework OSPFv3 printer
+        Add support for Frame-Relay ARP
+        Decode DHCP Option 121 (RFC 3442 Classless Static Route)
+        Decode DHCP Option 249 (MS Classless Static Route) the same as Option 121
+        TLV: Add support for Juniper .pcap extensions
+        Print EGP header in new-world-order style
+        Converted print-isakmp.c to NETDISSECT
+        Moved AF specific stuff into af.h
+        Test subsystem now table driven, and saves outputs and diffs to one place
+        Require <net/pfvar.h> for pf definitions - allows reading of pflog formatted 
+         libpcap files on an OS other than where the file was generated
+
+
+Wed.	July 23, 2007.  mcr@xelerance.com.  Summary for 3.9.7 libpcap release
 
     	NFS: Print unsigned values as such. 
 	RX: parse safely.
diff --git a/VERSION b/VERSION
index b233a760..fcdb2e10 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.9-PRE-CVS
+4.0.0
diff --git a/print-tcp.c b/print-tcp.c
index baa0ee6e..17c1775e 100644
--- a/print-tcp.c
+++ b/print-tcp.c
@@ -25,8 +25,8 @@
 
 #ifndef lint
 static const char rcsid[] _U_ =
-"@(#) $Header: /tcpdump/master/tcpdump/print-tcp.c,v 1.134 2008-08-16 11:36:20 hannes Exp $ (LBL)";
-  #else
+"@(#) $Header: /tcpdump/master/tcpdump/print-tcp.c,v 1.135 2008-11-09 23:35:03 mcr Exp $ (LBL)";
+#else
 __RCSID("$NetBSD: print-tcp.c,v 1.8 2007/07/24 11:53:48 drochner Exp $");
 #endif
 
diff --git a/tcpdump.1.in b/tcpdump.1.in
index 53398451..74328c1e 100644
--- a/tcpdump.1.in
+++ b/tcpdump.1.in
@@ -1,4 +1,4 @@
-.\" @(#) $Header: /tcpdump/master/tcpdump/tcpdump.1.in,v 1.1 2008-10-27 21:12:49 guy Exp $ (LBL)
+.\" @(#) $Header: /tcpdump/master/tcpdump/tcpdump.1.in,v 1.2 2008-11-09 23:35:03 mcr Exp $ (LBL)
 .\"
 .\"	$NetBSD: tcpdump.8,v 1.9 2003/03/31 00:18:17 perry Exp $
 .\"
@@ -369,8 +369,7 @@ can be used several times to load several MIB modules into \fItcpdump\fP.
 .TP
 .B \-M
 Use \fIsecret\fP as a shared secret for validating the digests found in
-Routing Protocols (RSVP) and TCP segments with the TCP-MD5 option
-(RFC 2385), if present.
+TCP segments with the TCP-MD5 option (RFC 2385), if present.
 .TP
 .B \-n
 Don't convert addresses (i.e., host addresses, port numbers, etc.) to names.