d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
285,920 Commits 72 Branches 135 Tags 3.2 GiB
b4ef09b9eb
Commit Graph

172 Commits

Author SHA1 Message Date
Pawel Jakub Dawidek
457f64b4ed Sandbox tcpdump(8) using Capsicum's capability mode and capabilities. 
For now, sandboxing is done only if -n option was specified and neither -z nor
-V options were given. Because it is very common to run tcpdump(8) with the -n
option for speed, I decided to commit sandboxing now. To also support
sandboxing when -n option wasn't specified, we need Casper daemon and its
services that are not available in FreeBSD yet.

- Limit file descriptors of a file specified by -r option or files specified
  via -V option to CAP_READ only.

- If neither -r nor -V options were specified, we operate on /dev/bpf.
  Limit its descriptor to CAP_READ and CAP_IOCTL plus limit allowed ioctls to
  BIOCGSTATS only.

- Limit file descriptor of a file specified by -w option to CAP_SEEK and
  CAP_WRITE.

- If either -C or -G options were specified, we open directory containing
  destination file and we limit directory descriptor to CAP_CREATE, CAP_FCNTL,
  CAP_FTRUNCATE, CAP_LOOKUP, CAP_SEEK and CAP_WRITE. Newly opened/created
  files are limited to CAP_SEEK and CAP_WRITE only.

- Enter capability mode if -n option was specified and neither -z nor -V
  options were specified.

Approved by:	delphij, wxs
Sponsored by:	The FreeBSD Foundation
 2013-07-07 21:19:53 +00:00
Xin LI
049c53d3ff MFV: Redo the fixup using the submitted version accepted by upstream. 2013-05-31 22:55:23 +00:00
Xin LI
356c1037fa Diff reduction against tcpdump revision 949a22064d3534eddeb8aa2b9c36a50e45fe16fa. 2013-05-30 21:25:55 +00:00
Xin LI
d03c0883ad MFV: tcpdump 4.4.0. 
MFC after:	4 weeks
 2013-05-30 20:51:22 +00:00
Pedro F. Giffuni
646a7fea0c Clean some 'svn:executable' properties in the tree. 
Submitted by:	Christoph Mallon
MFC after:	3 days
 2013-01-26 22:08:21 +00:00
Eitan Adler
37a6031461 Clean up hardcoded ar(1) flags in the tree to use the global ARFLAGS in 
share/mk/sys.mk instead.

This is part of a medium term project to permit deterministic builds of
FreeBSD.

Submitted by:	Erik Cederstrand <erik@cederstrand.dk>
Reviewed by:	imp, toolchain@
Approved by:	cperciva
MFC after:	2 weeks
 2012-12-06 01:31:25 +00:00
Xin LI
d09a7e67b9 MFV: tcpdump 4.3.0. 
MFC after:	4 weeks
 2012-10-05 20:19:28 +00:00
Gleb Smirnoff
ffe9c13e2a Provide ability for printing and decoding pfsync(4) traffic. This 
doesn't mean supporting IFT_PFSYNC (which I hope will eventually
die). This means decoding packets with IP protocol of 240 caught
on any normal interface like Ethernet.

  The code is based on couple of files from OpenBSD, significantly
modified by myself.

  Parser differentiates for four levels of verbosity: no -v, -v,
-vv and -vvv.

  We don't yet forward this code upstream, because currently it
strongly relies on if_pfsync.h and even on pfvar.h. I hope that
this can be fixed in future.

Reviewed by:	gnn, delphij
 2012-10-05 07:51:21 +00:00
Xin LI
cac3dcd5f9 Merge tcpdump 4.2.1. 
MFC after:	2 weeks
 2012-05-17 05:11:57 +00:00
Kevin Lo
5610c31cb2 Fix incorrect uses of sizeof(). 
The details of the fix can be found in the tcpdump git repository:
commit 684955d58611ee94eccdc34e82b32e676337188c
 2011-12-28 05:58:31 +00:00
Dimitry Andric
3803473797 In contrib/tcpdump/print-icmp6.c, fix a problem where the comparison 
against icmp6_hdr::icmp6_type is done incorrectly.  (This fix has
already been applied upstream, but we do not have the latest version of
tcpdump.)

MFC after:	1 week
 2011-12-19 17:32:54 +00:00
Rui Paulo
c2ab553ee5 Remove useless stuff. 2010-10-28 19:10:15 +00:00
Rui Paulo
27df3f5ddd Merge tcpdump-4.1.1. 2010-10-28 19:06:17 +00:00
Rui Paulo
ce3ed1caa1 Add parsing code for TCP UTO (User Timeout Option). 
Submitted by:	fangwang@
Obtained from:	//depot/projects/soc2009/tcputo/
 2009-10-07 09:07:06 +00:00
Sam Leffler
649874e159 correct IEEE80211_RADIOTAP_XCHANNEL to match system 
Submitted by:	Guy Harris
Approved by:	re (kib)
 2009-07-15 13:50:06 +00:00
Sam Leffler
0b73e40339 Updates, mostly to add 802.11s support: 
o add missing Status and Reason codes
o parse/display Action frames
o parse/display Mesh data frames
o parse/display BA frames

Reviewed by:	rpaulo
Approved by:	re (kib)
 2009-07-14 17:11:06 +00:00
Rui Paulo
661c9d81e0 Fix WITHOUT_IPV6=yes build. 
Reported by:	Andrzej Tobola ato at iem.pw.edu.pl
 2009-03-21 21:56:23 +00:00
Rui Paulo
a5779b6e02 Merge tcpdump 4.0.0 from the vendor branch. 2009-03-21 18:30:25 +00:00
Rui Paulo
ef1946bcf8 Fix a path. 2009-03-21 16:08:40 +00:00
Rui Paulo
58ffff611f Exclude list for tcpdump imports. 2009-03-21 15:46:37 +00:00
Rui Paulo
81ceab7147 Flatten vendor/tcpdump and remove keyword expansion. 2009-03-20 13:27:51 +00:00
Sam Leffler
ba4e014b5c unbreak printing 802.11 tx/rx rates 
MFC after:	3 days
 2008-02-25 01:28:14 +00:00
Max Laier
7b8d9f5cb3 Avoid excessive error message printout. 
PR:		bin/118150
Reported by:	keramida
MFC after:	3 days
 2007-11-21 12:52:26 +00:00
Max Laier
abf2519367 Resolve merge conflicts 
Approved by:	re (kensmith)
Obtained from:	tcpdump.org
 2007-10-16 02:31:48 +00:00
Max Laier
b5bfcb5d8a Import of tcpdump v3.9.8 2007-10-16 02:20:42 +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
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
Bill Fenner
7e9c480713 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
Bill Fenner
84c29ae3c4 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
Bill Fenner
943ee2b15a Merge tcpdump 3.6.2 2001-04-03 07:50:46 +00:00
Bill Fenner
685295f4d7 Virgin import of tcpdump.org tcpdump v3.6.2 2001-04-03 07:45:48 +00:00
Bill Fenner
4df395f42e 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 Kennaway
7524a0790d * 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
Bill Fenner
bb1ba4173a 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
Bill Fenner
9537d84e80 Fix nybble-order bug in PIM printer. 
Approved by:	jkh
 2000-02-17 03:30:04 +00:00
Bill Fenner
a88113a830 Merge tcpdump 3.5 2000-01-30 01:05:24 +00:00
Bill Fenner
b045338223 Virgin import of tcpdump.org tcpdump v3.5 2000-01-30 00:45:58 +00:00
Bill Fenner
623fbbc49c 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 Cobbs
0989ffbd53 Document the -X flag. 2000-01-26 18:55:58 +00:00
Archie Cobbs
37eaa1d162 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 Somers
40e7a3d7fd Pass the pppoe packets into do_ppp_print correctly. 1999-11-27 18:04:57 +00:00
Brian Somers
e8fdcab380 Support PPPoE. 
Add a missing comma to the lcp config options table.
 1999-11-14 11:28:11 +00:00
Larry Lile
14fffcebea Add source routing support. 1999-08-28 15:14:15 +00:00
Julian Elischer
722012cc0c 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
Bill Fumerola
af693bfbc1 Remove bogus reference. 
PR:		docs/8430
Submitted by:	jkb
 1998-12-29 02:53:08 +00:00
Peter Hawkins
db4ce352d0 PR: 8429 
Submitted by:		jkb@FreeBSD.ORG
correct typo in example
 1998-10-24 10:08:05 +00:00
Bill Fenner
699fc31439 Merge tcpdump 3.4 
PR:		bin/7877
 1998-09-15 19:46:59 +00:00
Bill Fenner
4644f044b2 Virgin import of LBL tcpdump v3.4 1998-09-15 19:36:32 +00:00
Bill Fenner
90dc276c84 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
Peter Hawkins
3cf9b7ae04 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 Wemm
e0269ee77c 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
Paul Traina
1c1351793c Handle frame relay, decode ATM VP/VC info, and handle ISO over FR. 1998-01-01 04:13:54 +00:00
Paul Traina
13acb9488b Add frame-relay decode support. 1997-12-31 21:50:31 +00:00
Garrett Wollman
0bfc6e6706 This is a hack. Decode IEEE 802.1Q VLAN tagging so that we can decode 
tagged traffic according to the encapsulated protocol.  It needs in
addition modifications to the filter generator which would deal with
checking the ethertype and vlan header as required.
 1997-12-08 21:42:35 +00:00