d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
181,407 Commits 4 Branches 49 Tags 2 GiB
f4844f65a9
Commit Graph

121 Commits

Author SHA1 Message Date
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