Max Laier
abf2519367
Resolve merge conflicts
...
Approved by: re (kensmith)
Obtained from: tcpdump.org
2007-10-16 02:31:48 +00:00
Max Laier
e57e181f09
This commit was generated by cvs2svn to compensate for changes in r172683,
...
which included commits to RCS files with non-trunk default branches.
2007-10-16 02:20:42 +00:00
Max Laier
b5bfcb5d8a
Import of tcpdump v3.9.8
2007-10-16 02:20:42 +00:00
Simon L. B. Nielsen
faeb38d111
Correct buffer overflow in tcpdump(1).
...
Security: FreeBSD-SA-07:06.tcpdump
Security: CVE-2007-3798
Obtained from: tcpdump.org
Approved by: re (security blanket)
2007-08-01 20:40:44 +00:00
Simon L. B. Nielsen
7613322fdb
This commit was generated by cvs2svn to compensate for changes in r171682,
...
which included commits to RCS files with non-trunk default branches.
2007-08-01 20:40:44 +00:00
Sam Leffler
6efb4aa143
o add minimal radiotap support for 11n
2007-06-11 04:04:30 +00:00
Andrew Thompson
af20afd05a
Pull in latest print-stp.c from vendor
2007-04-04 21:17:33 +00:00
Andrew Thompson
f3300398cb
This commit was generated by cvs2svn to compensate for changes in r168371,
...
which included commits to RCS files with non-trunk default branches.
2007-04-04 21:17:33 +00:00
Sam Leffler
17cb103cb1
resolve merge conflicts
...
MFC after: 1 month
2006-09-04 20:25:04 +00:00
Sam Leffler
2ebc47db5b
Import of tcpdump v3.9.4
2006-09-04 20:04:42 +00:00
Sam Leffler
d44c9004ff
This commit was generated by cvs2svn to compensate for changes in r162017,
...
which included commits to RCS files with non-trunk default branches.
2006-09-04 20:04:42 +00:00
David E. O'Brien
35a6917047
Document that 'bad cksum 0' is expected on NICs with checksum off-loading.
2006-06-20 05:04:05 +00:00
Sam Leffler
06885fed80
correct check for whether or not md5 signature matches; applied
...
to vendor branch since this is already in their depot
2005-11-13 19:28:17 +00:00
Sam Leffler
d954c733ba
This commit was generated by cvs2svn to compensate for changes in r152390,
...
which included commits to RCS files with non-trunk default branches.
2005-11-13 19:28:17 +00:00
Sam Leffler
29292c17af
resolve merge conflicts
...
Approved by: re (scottl)
2005-07-11 04:14:02 +00:00
Sam Leffler
f4d0c64a1d
Virgin import of tcpdump v3.9.1 (release) from tcpdump.org
...
Approved by: re (scottl)
2005-07-11 03:54:22 +00:00
Sam Leffler
f6fb7a2cfe
This commit was generated by cvs2svn to compensate for changes in r147899,
...
which included commits to RCS files with non-trunk default branches.
2005-07-11 03:54:22 +00:00
Sam Leffler
dd9c1736f5
pullup security fix on vendor branch
2005-06-09 15:54:42 +00:00
Sam Leffler
cc157742d1
Correct several denial-of-service vulnerabilities in tcpdump.
...
Security: FreeBSD-SA-05:10.tcpdump
Security: CAN-2005-1267, CAN-2005-1278, CAN-2005-1279, CAN-2005-1280
Obtained from: tcpdump.org
2005-06-09 15:42:58 +00:00
Sam Leffler
fa2afacabb
This commit was generated by cvs2svn to compensate for changes in r147173,
...
which included commits to RCS files with non-trunk default branches.
2005-06-09 15:42:58 +00:00
Sam Leffler
c1ad1296ec
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 Leffler
d93a098204
Virgin import of tcpdump v3.9.1 (alpha 096) from tcpdump.org
2005-05-29 18:24:21 +00:00
Sam Leffler
3d1038b8ce
This commit was generated by cvs2svn to compensate for changes in r146775,
...
which included commits to RCS files with non-trunk default branches.
2005-05-29 18:24:21 +00:00
Sam Leffler
1de50e9f41
Virgin import of tcpdump v3.9.1 (alpha 096) from tcpdump.org
2005-05-29 18:17:16 +00:00
Sam Leffler
233f3abd96
This commit was generated by cvs2svn to compensate for changes in r146773,
...
which included commits to RCS files with non-trunk default branches.
2005-05-29 18:17:16 +00:00
Bruce M Simpson
a0fba9baed
Fix NULL pointer dereference bug when parsing IPV6CP traffic.
...
This file is already off the vendor branch, and the fix will be
in future tcpdump.org vendor branch imports.
PR: bin/76497
MFC after: 1 week
Obtained from: tcpdump.org rev 1.89.2.4
Discussed with: fenner, keramida
2005-01-24 14:56:48 +00:00
Bruce M Simpson
cc391cce11
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
Bruce M Simpson
5b0fe47811
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
Bruce M Simpson
87e4d12e4a
This commit was generated by cvs2svn to compensate for changes in r127668,
...
which included commits to RCS files with non-trunk default branches.
2004-03-31 09:17:26 +00:00
Bill Fenner
c76561e4dc
Commit vendor update for vulnerabilities found by
...
Jonathan Heusser <jonny@drugphish.ch>
2004-01-13 17:28:59 +00:00
Bill Fenner
cea4bb1622
This commit was generated by cvs2svn to compensate for changes in r124488,
...
which included commits to RCS files with non-trunk default branches.
2004-01-13 17:28:59 +00:00
Bill Fenner
b97c9af58a
Commit vendor fix for l2tp vulnerability reported by
...
Przemyslaw Frasunek on bugtraq list.
2004-01-13 17:28:06 +00:00
Bill Fenner
11c9ffd1ce
This commit was generated by cvs2svn to compensate for changes in r124486,
...
which included commits to RCS files with non-trunk default branches.
2004-01-13 17:28:06 +00:00
Bill Fenner
0e0def197a
Merge tcpdump 3.7.2
2003-03-02 08:25:48 +00:00
Bill Fenner
9afd0c2902
Import tcpdump 3.7.2 (fudging for multi-DLT support) from
...
http://www.tcpdump.org/release/tcpdump-3.7.2.tar.gz
2003-03-02 08:22:26 +00:00
Bill Fenner
e32fdc8718
This commit was generated by cvs2svn to compensate for changes in r111726,
...
which included commits to RCS files with non-trunk default branches.
2003-03-02 08:22:26 +00:00
Bill Fenner
aa1a4c1370
Merge Multi-DLT support.
2003-01-26 01:23:26 +00:00
Bill Fenner
0ccd7b511b
Commit tcpdump.org's multi-DLT support to vendor branch.
2003-01-26 01:16:33 +00:00
Bill Fenner
a63efadcf1
This commit was generated by cvs2svn to compensate for changes in r109839,
...
which included commits to RCS files with non-trunk default branches.
2003-01-26 01:16:33 +00:00
Peter Wemm
dc14fb2388
Add in a patch from tcpdump-current (that will be included in the next
...
import) to stop a segfault on ia64. Add a #include to get missing
prototypes, particularly malloc().
Approved by: fenner
2003-01-08 22:12:01 +00:00
Peter Wemm
a828a2f58c
This commit was generated by cvs2svn to compensate for changes in r108968,
...
which included commits to RCS files with non-trunk default branches.
2003-01-08 22:12:01 +00:00
Bill Fenner
698bfaa4b5
Remove cruft.
2002-06-26 01:35:00 +00:00
Bill Fenner
a1c2090e60
Merge tcpdump 3.7.1
...
MFC after: 2 weeks
2002-06-21 00:49:02 +00:00
Bill Fenner
a90e161be3
Import tcpdump 3.7.1, from
...
http://www.tcpdump.org/release/tcpdump-3.7.1.tar.gz
2002-06-21 00:43:23 +00:00
Bill Fenner
1c6248dba0
This commit was generated by cvs2svn to compensate for changes in r98524,
...
which included commits to RCS files with non-trunk default branches.
2002-06-21 00:43:23 +00:00
Bill Fenner
93b99d6264
In TTEST2(), check to make sure the "l" argument isn't so large that
...
"snapend - l" underflows; this fixes a buffer overflow with malformed
NFS packets, and may fix other buffer overflows with malformed packets.
Obtained from: tcpdump.org CVS
2002-06-17 15:26:56 +00:00
Julian Elischer
f1f9d42a53
Quick hack to print out the non-standard pppoe used by 3com
2001-09-27 08:02:27 +00:00
Bill Fenner
d73c3f4796
Merge tcpdump 3.6.3
2001-07-23 23:15:44 +00:00
Bill Fenner
39eaefddae
Virgin import of tcpdump.org tcpdump v3.6.3
2001-07-23 23:15:13 +00:00
Bill Fenner
669c0adba2
This commit was generated by cvs2svn to compensate for changes in r80231,
...
which included commits to RCS files with non-trunk default branches.
2001-07-23 23:15:13 +00:00