Commit Graph

19 Commits

Author SHA1 Message Date
delphij
f49c5d523a MFV r276761: tcpdump 4.6.2.
MFC after:	1 month
2015-01-07 19:55:18 +00:00
delphij
661b9d9441 Merge tcpdump 4.2.1.
MFC after:	2 weeks
2012-05-17 05:11:57 +00:00
rpaulo
1e8ad3bd80 Merge tcpdump-4.1.1. 2010-10-28 19:06:17 +00:00
rpaulo
a7b3086920 Merge tcpdump 4.0.0 from the vendor branch. 2009-03-21 18:30:25 +00:00
rpaulo
04b1d6babe Flatten vendor/tcpdump and remove keyword expansion. 2009-03-20 13:27:51 +00:00
mlaier
7407d685ab Resolve merge conflicts
Approved by:	re (kensmith)
Obtained from:	tcpdump.org
2007-10-16 02:31:48 +00:00
mlaier
3b74598d7e Import of tcpdump v3.9.8 2007-10-16 02:20:42 +00:00
sam
a8bc04a53e resolve merge conflicts
MFC after:	1 month
2006-09-04 20:25:04 +00:00
sam
498672d448 Import of tcpdump v3.9.4 2006-09-04 20:04:42 +00:00
sam
5d66575dd9 resolve merge conflicts
Approved by:	re (scottl)
2005-07-11 04:14:02 +00:00
sam
1166f90fe8 Virgin import of tcpdump v3.9.1 (release) from tcpdump.org
Approved by:	re (scottl)
2005-07-11 03:54:22 +00:00
sam
7dacff5dd0 resolve merge conflicts and update for proper build; including:
o print-fr.c returned to code on vendor branch
o remove pmap_prot.h include from print-sunrprc.c
o remove gcc/i386-specific ntoh* write-arounds from tcpdump-stdinc.h

Reviewed by:	bms
2005-05-29 19:09:28 +00:00
sam
88a191f109 Virgin import of tcpdump v3.9.1 (alpha 096) from tcpdump.org 2005-05-29 18:17:16 +00:00
bms
55b12ee199 Merge of tcpdump 3.8.3 from tcpdump.org, with the following caveats:
print-atm.c no longer performs special handling for FORE headers; these
 can no doubt be re-added at a later date.

 print-fr.c is effectively a no-op.

 print-llc.c has had the default_print_unaligned() call removed as
 tcpdump no longer defines this function, however the prototype is still
 present. Suggest we roll in a diff to use print_unknown_data().
2004-03-31 14:57:24 +00:00
bms
281e9d7140 Import tcpdump 3.8.3, from http://www.tcpdump.org/releases/tcpdump-3.8.3.tar.gz 2004-03-31 09:17:26 +00:00
kris
0e6572e8c9 * Buffer-safe string function cleanup. There are a couple of strcpy()
and strcat()s which would be more difficult to fix, but I think they're
  safe anyway.
* Don't crash at runtime by overflowing a buffer with constant data in
  print-icmp.c on a long hostname.
* Don't overflow a static buffer by trying to decode an AFS ACL into a buffer
  which is way too small for it.

Reviewed by:    -audit
2000-10-05 02:49:49 +00:00
cvs2svn
0c669098d0 This commit was manufactured by cvs2svn to create branch
'VENDOR-tcpdump'.
1999-02-20 11:18:01 +00:00
pst
a472b7fd71 Handle frame relay, decode ATM VP/VC info, and handle ISO over FR. 1998-01-01 04:13:54 +00:00
pst
a610ac10b8 Add frame-relay decode support. 1997-12-31 21:50:31 +00:00