summaryrefslogtreecommitdiffstats
path: root/contrib/tcpdump
Commit message (Collapse)AuthorAgeFilesLines
* Importing pfSense patch tcpdump.pfsync.diffRenato Botelho2015-08-173-4/+7
|
* MFC r285275 (only the part that fixes PR 199568):pkelsey2015-07-181-18/+77
| | | | | | | | | | | Obtain proper capsicum rights for dump files so rotation of such files works when requested. This is equivalent to cherry picking the following upstream commits: commit c6d472bf63488b0c2ab7ab9f4b32c68dd2c8ea2b commit f08eb851eedf9775e6485ab75c0d8cf8d1306be6 commit d83a284abc80d3d09f6bddd087760bb1b01d9cc7 PR: 199568 Approved by: re
* MFC: 272451, 272653 add CAP_EVENT so that we can poll() on netmap and pcapluigi2015-05-261-1/+6
| | | | file descriptors
* MFC r282436 (the portion that makes sense):brooks2015-05-191-2/+0
| | | | | | | | | | | | Remove "capability mode sandbox enabled" messages. These messages serve little purpose and break some consumers. PR: 199855 Differential Revision: https://reviews.freebsd.org/D2440 Reviewed by: rwatson Approved by: pjd Sponsored by: DARPA, AFRL
* Merge an applicable subset of r263234 from HEAD to stable/10:rwatson2015-03-191-1/+1
| | | | | | | | | | | | | Update most userspace consumers of capability.h to use capsicum.h instead. auditdistd is not updated as I will make the change upstream and then do a vendor import sometime in the next week or two. Note that a significant fraction does not apply, as FreeBSD 10 doesn't contain a Capsicumised ping, casperd, libcasper, etc. When these features are merged, the capsicum.h change will need to be merged with them. Sponsored by: Google, Inc.
* Bulk sync of pf changes from head, in attempt to fixup broken build Iglebius2014-03-121-0/+2
| | | | | | | | | made in r263029. Merge r257186,257215,257349,259736,261797. These changesets split pfvar.h into several smaller headers and make userland utilities to include only some of them.
* MFV r258571:pfg2013-12-131-14/+39
| | | | | | | Removes strict-aliasing warnings from newer GCC in tcpdump. Corresponds to MFC r258573, but for some reason our new pre-commit hooks will not let us merge it from there.
* Change the cap_rights_t type from uint64_t to a structure that we can extendpjd2013-09-051-13/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the future in a backward compatible (API and ABI) way. The cap_rights_t represents capability rights. We used to use one bit to represent one right, but we are running out of spare bits. Currently the new structure provides place for 114 rights (so 50 more than the previous cap_rights_t), but it is possible to grow the structure to hold at least 285 rights, although we can make it even larger if 285 rights won't be enough. The structure definition looks like this: struct cap_rights { uint64_t cr_rights[CAP_RIGHTS_VERSION + 2]; }; The initial CAP_RIGHTS_VERSION is 0. The top two bits in the first element of the cr_rights[] array contain total number of elements in the array - 2. This means if those two bits are equal to 0, we have 2 array elements. The top two bits in all remaining array elements should be 0. The next five bits in all array elements contain array index. Only one bit is used and bit position in this five-bits range defines array index. This means there can be at most five array elements in the future. To define new right the CAPRIGHT() macro must be used. The macro takes two arguments - an array index and a bit to set, eg. #define CAP_PDKILL CAPRIGHT(1, 0x0000000000000800ULL) We still support aliases that combine few rights, but the rights have to belong to the same array element, eg: #define CAP_LOOKUP CAPRIGHT(0, 0x0000000000000400ULL) #define CAP_FCHMOD CAPRIGHT(0, 0x0000000000002000ULL) #define CAP_FCHMODAT (CAP_FCHMOD | CAP_LOOKUP) There is new API to manage the new cap_rights_t structure: cap_rights_t *cap_rights_init(cap_rights_t *rights, ...); void cap_rights_set(cap_rights_t *rights, ...); void cap_rights_clear(cap_rights_t *rights, ...); bool cap_rights_is_set(const cap_rights_t *rights, ...); bool cap_rights_is_valid(const cap_rights_t *rights); void cap_rights_merge(cap_rights_t *dst, const cap_rights_t *src); void cap_rights_remove(cap_rights_t *dst, const cap_rights_t *src); bool cap_rights_contains(const cap_rights_t *big, const cap_rights_t *little); Capability rights to the cap_rights_init(), cap_rights_set(), cap_rights_clear() and cap_rights_is_set() functions are provided by separating them with commas, eg: cap_rights_t rights; cap_rights_init(&rights, CAP_READ, CAP_WRITE, CAP_FSTAT); There is no need to terminate the list of rights, as those functions are actually macros that take care of the termination, eg: #define cap_rights_set(rights, ...) \ __cap_rights_set((rights), __VA_ARGS__, 0ULL) void __cap_rights_set(cap_rights_t *rights, ...); Thanks to using one bit as an array index we can assert in those functions that there are no two rights belonging to different array elements provided together. For example this is illegal and will be detected, because CAP_LOOKUP belongs to element 0 and CAP_PDKILL to element 1: cap_rights_init(&rights, CAP_LOOKUP | CAP_PDKILL); Providing several rights that belongs to the same array's element this way is correct, but is not advised. It should only be used for aliases definition. This commit also breaks compatibility with some existing Capsicum system calls, but I see no other way to do that. This should be fine as Capsicum is still experimental and this change is not going to 9.x. Sponsored by: The FreeBSD Foundation
* When using tcpdump -I -i wlanN and wlanN is not a monitor mode VAP,rpaulo2013-07-311-0/+23
| | | | | | tcpdump will print an error message saying rfmon is not supported. Give a concise explanation as to how one might solve this problem by creating a monitor mode VAP.
* Sandbox tcpdump(8) using Capsicum's capability mode and capabilities.pjd2013-07-071-1/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* MFV: Redo the fixup using the submitted version accepted by upstream.delphij2013-05-311-3/+1
|
* Diff reduction against tcpdump revision ↵delphij2013-05-301-2/+1
| | | | 949a22064d3534eddeb8aa2b9c36a50e45fe16fa.
* MFV: tcpdump 4.4.0.delphij2013-05-3039-7877/+4631
|\ | | | | | | MFC after: 4 weeks
* | Clean some 'svn:executable' properties in the tree.pfg2013-01-267-0/+0
| | | | | | | | | | Submitted by: Christoph Mallon MFC after: 3 days
* | Clean up hardcoded ar(1) flags in the tree to use the global ARFLAGS ineadler2012-12-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | MFV: tcpdump 4.3.0.delphij2012-10-0528-355/+1079
|\ \ | |/ | | | | MFC after: 4 weeks
* | Provide ability for printing and decoding pfsync(4) traffic. Thisglebius2012-10-054-0/+457
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge tcpdump 4.2.1.delphij2012-05-17164-34297/+5055
|\ \ | |/ | | | | MFC after: 2 weeks
* | Fix incorrect uses of sizeof().kevlo2011-12-286-8/+8
| | | | | | | | | | The details of the fix can be found in the tcpdump git repository: commit 684955d58611ee94eccdc34e82b32e676337188c
* | In contrib/tcpdump/print-icmp6.c, fix a problem where the comparisondim2011-12-191-8/+7
| | | | | | | | | | | | | | | | 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
* | Remove useless stuff.rpaulo2010-10-2815-2008/+0
| |
* | Merge tcpdump-4.1.1.rpaulo2010-10-28201-3086/+38522
|\ \ | |/
* | Add parsing code for TCP UTO (User Timeout Option).rpaulo2009-10-072-0/+14
| | | | | | | | | | Submitted by: fangwang@ Obtained from: //depot/projects/soc2009/tcputo/
* | correct IEEE80211_RADIOTAP_XCHANNEL to match systemsam2009-07-151-1/+1
| | | | | | | | | | Submitted by: Guy Harris Approved by: re (kib)
* | Updates, mostly to add 802.11s support:sam2009-07-142-38/+273
| | | | | | | | | | | | | | | | | | | | 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)
* | Fix WITHOUT_IPV6=yes build.rpaulo2009-03-211-0/+2
| | | | | | | | Reported by: Andrzej Tobola ato at iem.pw.edu.pl
* | Merge tcpdump 4.0.0 from the vendor branch.rpaulo2009-03-21293-8578/+11822
|\ \ | |/
| * Flatten vendor/tcpdump and remove keyword expansion.rpaulo2009-03-20316-106740/+0
| |
* | Fix a path.rpaulo2009-03-211-1/+1
| |
* | Exclude list for tcpdump imports.rpaulo2009-03-211-0/+3
| |
* | unbreak printing 802.11 tx/rx ratessam2008-02-251-2/+2
| | | | | | | | MFC after: 3 days
* | Avoid excessive error message printout.mlaier2007-11-211-0/+1
| | | | | | | | | | | | PR: bin/118150 Reported by: keramida MFC after: 3 days
* | Resolve merge conflictsmlaier2007-10-1627-557/+1130
| | | | | | | | | | Approved by: re (kensmith) Obtained from: tcpdump.org
* | This commit was generated by cvs2svn to compensate for changes in r172683,mlaier2007-10-1649-4971/+7341
|\ \ | |/ | | | | which included commits to RCS files with non-trunk default branches.
| * Import of tcpdump v3.9.8mlaier2007-10-1676-5450/+8487
| |
* | This commit was generated by cvs2svn to compensate for changes in r171682,simon2007-08-011-8/+39
|\ \ | |/ | | | | which included commits to RCS files with non-trunk default branches.
| * Correct buffer overflow in tcpdump(1).simon2007-08-011-8/+39
| | | | | | | | | | | | | | Security: FreeBSD-SA-07:06.tcpdump Security: CVE-2007-3798 Obtained from: tcpdump.org Approved by: re (security blanket)
* | o add minimal radiotap support for 11nsam2007-06-113-15/+191
| |
* | This commit was generated by cvs2svn to compensate for changes in r168371,thompsa2007-04-041-51/+314
|\ \ | |/ | | | | which included commits to RCS files with non-trunk default branches.
| * Pull in latest print-stp.c from vendorthompsa2007-04-041-51/+314
| |
* | resolve merge conflictssam2006-09-0419-293/+557
| | | | | | | | MFC after: 1 month
* | This commit was generated by cvs2svn to compensate for changes in r162017,sam2006-09-0497-314/+6192
|\ \ | |/ | | | | which included commits to RCS files with non-trunk default branches.
| * Import of tcpdump v3.9.4sam2006-09-04114-599/+6747
| |
* | Document that 'bad cksum 0' is expected on NICs with checksum off-loading.obrien2006-06-201-0/+7
| |
* | This commit was generated by cvs2svn to compensate for changes in r152390,sam2005-11-131-1/+1
|\ \ | |/ | | | | which included commits to RCS files with non-trunk default branches.
| * correct check for whether or not md5 signature matches; appliedsam2005-11-131-1/+1
| | | | | | | | to vendor branch since this is already in their depot
* | resolve merge conflictssam2005-07-1122-492/+1013
| | | | | | | | Approved by: re (scottl)
* | This commit was generated by cvs2svn to compensate for changes in r147899,sam2005-07-1159-818/+3330
|\ \ | |/ | | | | which included commits to RCS files with non-trunk default branches.
| * Virgin import of tcpdump v3.9.1 (release) from tcpdump.orgsam2005-07-1182-1358/+4379
| | | | | | | | Approved by: re (scottl)
* | pullup security fix on vendor branchsam2005-06-091-1/+4
| |
OpenPOWER on IntegriCloud