Commit Graph

75 Commits

Author SHA1 Message Date
bms
9bc61e36ba 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
3aaf04c858 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
171ea2e742 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
bms
00ada397dc 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
fenner
b45a94e142 Commit vendor update for vulnerabilities found by
Jonathan Heusser <jonny@drugphish.ch>
2004-01-13 17:28:59 +00:00
fenner
7480b9a151 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
8a5c3b685e Commit vendor fix for l2tp vulnerability reported by
Przemyslaw Frasunek on bugtraq list.
2004-01-13 17:28:06 +00:00
fenner
7412f6a3c0 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
a0ddd030a6 Merge tcpdump 3.7.2 2003-03-02 08:25:48 +00:00
fenner
776c3fffd5 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
0cecfff325 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
07c53db8d7 Merge Multi-DLT support. 2003-01-26 01:23:26 +00:00
fenner
831e578a40 Commit tcpdump.org's multi-DLT support to vendor branch. 2003-01-26 01:16:33 +00:00
fenner
052e356c1e 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
d97c739f26 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
f8b33f6507 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
c1e1c596d7 Remove cruft. 2002-06-26 01:35:00 +00:00
fenner
35b4c5ca24 Merge tcpdump 3.7.1
MFC after:	2 weeks
2002-06-21 00:49:02 +00:00
fenner
58c79b7a94 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
8582a34a5c 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
e2b2d6f821 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
2b777e5838 Quick hack to print out the non-standard pppoe used by 3com 2001-09-27 08:02:27 +00:00
fenner
ec8d06c36b Merge tcpdump 3.6.3 2001-07-23 23:15:44 +00:00
fenner
7f2edf944c Virgin import of tcpdump.org tcpdump v3.6.3 2001-07-23 23:15:13 +00:00
fenner
99ed9eecbb 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
ea65b661b8 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
5c61907169 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
3036444183 Merge tcpdump 3.6.2 2001-04-03 07:50:46 +00:00
fenner
cf8df7d604 Virgin import of tcpdump.org tcpdump v3.6.2 2001-04-03 07:45:48 +00:00
fenner
b8cd33e7dd 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
ca18414919 * 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
ff00fb7e07 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
4ab36382bc Fix nybble-order bug in PIM printer.
Approved by:	jkh
2000-02-17 03:30:04 +00:00
fenner
2ca69d280a Merge tcpdump 3.5 2000-01-30 01:05:24 +00:00
fenner
725b1768c7 Virgin import of tcpdump.org tcpdump v3.5 2000-01-30 00:45:58 +00:00
fenner
602f803bad This commit was generated by cvs2svn to compensate for changes in r56893,
which included commits to RCS files with non-trunk default branches.
2000-01-30 00:45:58 +00:00
archie
0d5dbad870 Document the -X flag. 2000-01-26 18:55:58 +00:00
archie
94da152bdd Add the -X flag to dump the buffer in "emacs-hexl" style,
that is, with ASCII character decoding.

Obtained from:	OpenBSD
2000-01-26 18:10:21 +00:00
brian
d90b9299cc Pass the pppoe packets into do_ppp_print correctly. 1999-11-27 18:04:57 +00:00
brian
eaa1c2bef7 Support PPPoE.
Add a missing comma to the lcp config options table.
1999-11-14 11:28:11 +00:00
lile
34b4b22959 Add source routing support. 1999-08-28 15:14:15 +00:00
cvs2svn
87961919e3 This commit was manufactured by cvs2svn to create branch
'VENDOR-tcpdump'.
1999-02-20 11:18:01 +00:00
julian
3b2c61afa4 World, I'd like you to meet the first FreeBSD token Ring driver.
This  is for various Olicom cards. An IBM driver is following.
This patch also adds support to tcpdump to decode packets on tokenring.
Congratulations to the proud father.. (below)

Submitted by:	Larry Lile <lile@stdio.com>
1999-02-20 11:18:00 +00:00
billf
1e71ed1ecb Remove bogus reference.
PR:		docs/8430
Submitted by:	jkb
1998-12-29 02:53:08 +00:00
thepish
dcbd0e0d50 PR: 8429
Submitted by:		jkb@FreeBSD.ORG
correct typo in example
1998-10-24 10:08:05 +00:00
fenner
4c60525ae9 Merge tcpdump 3.4
PR:		bin/7877
1998-09-15 19:46:59 +00:00
fenner
cfc42b58f2 Virgin import of LBL tcpdump v3.4 1998-09-15 19:36:32 +00:00
fenner
a0690bb361 This commit was generated by cvs2svn to compensate for changes in r39297,
which included commits to RCS files with non-trunk default branches.
1998-09-15 19:36:32 +00:00
thepish
8552640d41 PR: 7741
Submitted by:	Hellmuth Michaelis <hm@kts.org>
add LCP/PAP/CHAP/IPCP frame printing functionality
1998-08-30 05:32:44 +00:00
peter
f8bb322b02 Zap the T_UID,T_GID and T_UINFO stuff, it doesn't exist in the bind8
headers.  As I understand it, it was for some really ancient athena stuff
that has long been replaced.
1998-06-11 14:40:42 +00:00