sam
a8bc04a53e
resolve merge conflicts
...
MFC after: 1 month
2006-09-04 20:25:04 +00:00
sam
a6a758d9f4
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
sam
498672d448
Import of tcpdump v3.9.4
2006-09-04 20:04:42 +00:00
obrien
705134c240
Document that 'bad cksum 0' is expected on NICs with checksum off-loading.
2006-06-20 05:04:05 +00:00
sam
6dcc5281a5
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
32ef291767
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
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
357fae9fdf
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
e1999dee5d
pullup security fix on vendor branch
2005-06-09 15:54:42 +00:00
sam
a6836add6e
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
22f120bd5e
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
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
cbc6e26dd5
Virgin import of tcpdump v3.9.1 (alpha 096) from tcpdump.org
2005-05-29 18:24:21 +00:00
sam
d9db21b8bc
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
88a191f109
Virgin import of tcpdump v3.9.1 (alpha 096) from tcpdump.org
2005-05-29 18:17:16 +00:00
sam
777fc78fe5
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
bms
219be4fec7
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
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
bms
68fb152d91
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
fenner
be6faec6d0
Commit vendor update for vulnerabilities found by
...
Jonathan Heusser <jonny@drugphish.ch>
2004-01-13 17:28:59 +00:00
fenner
11c4902229
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
fenner
31272f2dd4
Commit vendor fix for l2tp vulnerability reported by
...
Przemyslaw Frasunek on bugtraq list.
2004-01-13 17:28:06 +00:00
fenner
2160335c02
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
fenner
7171542229
Merge tcpdump 3.7.2
2003-03-02 08:25:48 +00:00
fenner
5f76ebca43
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
fenner
af30588ecb
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
fenner
a889502d5d
Merge Multi-DLT support.
2003-01-26 01:23:26 +00:00
fenner
24ede2d805
Commit tcpdump.org's multi-DLT support to vendor branch.
2003-01-26 01:16:33 +00:00
fenner
e3b499182e
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
d28b761d98
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
60eec7d756
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
fenner
27ceacd9e9
Remove cruft.
2002-06-26 01:35:00 +00:00
fenner
6d9538de20
Merge tcpdump 3.7.1
...
MFC after: 2 weeks
2002-06-21 00:49:02 +00:00
fenner
91fc581e38
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
fenner
d832be42ce
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
fenner
cd52de85f6
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
3176497499
Quick hack to print out the non-standard pppoe used by 3com
2001-09-27 08:02:27 +00:00
fenner
274f364f05
Merge tcpdump 3.6.3
2001-07-23 23:15:44 +00:00
fenner
f815ae37f4
Virgin import of tcpdump.org tcpdump v3.6.3
2001-07-23 23:15:13 +00:00
fenner
656ab0c2a8
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
fenner
974993672d
Check in the diff for rev 1.11 of tcpdump.org's print-smb.c
...
to replace freebsd.org's rev 1.2.
2001-04-04 00:11:06 +00:00
fenner
3209bda73a
This commit was generated by cvs2svn to compensate for changes in r75147,
...
which included commits to RCS files with non-trunk default branches.
2001-04-04 00:11:06 +00:00
fenner
2877f5b613
Merge tcpdump 3.6.2
2001-04-03 07:50:46 +00:00
fenner
ace14a2b50
Virgin import of tcpdump.org tcpdump v3.6.2
2001-04-03 07:45:48 +00:00
fenner
f7d9a5e270
This commit was generated by cvs2svn to compensate for changes in r75115,
...
which included commits to RCS files with non-trunk default branches.
2001-04-03 07:45:48 +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
fenner
3364f4cb6d
Include ip6.h from <netinet/>, not <netinet6/>.
...
Submitted by: Yoshinobu Inoue <shin@nd.net.fujitsu.co.jp>
Approved by: jkh
2000-03-08 02:24:10 +00:00
fenner
dd812cf383
Fix nybble-order bug in PIM printer.
...
Approved by: jkh
2000-02-17 03:30:04 +00:00