summaryrefslogtreecommitdiffstats
path: root/contrib/libpcap
Commit message (Collapse)AuthorAgeFilesLines
* Merge 272659:luigi2015-01-262-0/+11
| | | | | | | | | | | | | | | | Add netmap support to libpcap. Tcpdump and other native pcap clients can now run directly on netmap ports using netmap:foo or valeXX:YY as device names. Modifications to existing code are small and trivial, the netmap-specific code is all in a new file. Please be aware that in netmap mode the physical interface is disconnected from the host stack, so libpcap will steal the traffic not just make a copy. For the full version of the code (including linux and autotools support) see https://code.google.com/p/netmap-libpcap/
* Bulk sync of pf changes from head, in attempt to fixup broken build Iglebius2014-03-121-1/+1
| | | | | | | | | 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.
* MFC r260444:kevlo2014-02-171-1/+1
| | | | | | | | | | | | | Rename definition of IEEE80211_FC1_WEP to IEEE80211_FC1_PROTECTED. The origin of WEP comes from IEEE Std 802.11-1997 where it defines whether the frame body of MAC frame has been encrypted using WEP algorithm or not. IEEE Std. 802.11-2007 changes WEP to Protected Frame, indicates whether the frame is protected by a cryptographic encapsulation algorithm. Reviewed by: adrian, rpaulo
* MFV: libpcap 1.4.0.delphij2013-05-3054-4050/+8632
| | | | MFC after: 4 weeks
* Add tcp header flags ECE and CWR defined in RFC 3168.hiren2013-05-163-2/+6
| | | | | | | PR: 140349 Submitted by: Alan Amesbury <amesbury@umn.edu> (earlier version) Reviewed by: delphij Approved by: sbruno (mentor)
* Clean some 'svn:executable' properties in the tree.pfg2013-01-261-0/+0
| | | | | Submitted by: Christoph Mallon MFC after: 3 days
* MFV: libpcap 1.3.0.delphij2012-10-0525-6915/+3907
|\ | | | | | | MFC after: 4 weeks
* | Fix typo: s/pakcet/packetkevlo2012-09-201-1/+1
| |
* | Add 3 missing files that was generated but not included with the initialdelphij2012-05-143-0/+267
| | | | | | | | | | | | | | commit. Reported by: buganini via IRC MFC after: 2 weeks
* | Merge from vendor branch: update libpcap to 1.2.1.delphij2012-05-1476-2553/+6708
|\ \ | |/ | | | | MFC after: 2 weeks
* | Incorporate vendor commit ecdc5c0a7f7591a7cd4a:delphij2011-06-281-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | In userland, sign extend the offset for JA instructions. We currently use that to implement "ip6 protochain", and "pc" might be wider than "pc->k", in which case we need to arrange that "pc->k" be sign-extended, by casting it to bpf_int32. PR: kern/157188 Submitted by: plosher MFC after: 2 weeks
* | Explicitly initialize the packet buffer to NULL after we unmap the zero copycsjp2011-06-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | buffers. This fixes a segfault on exit due to calling free on a bogus pointer. This should be considered a temporary stop gap fix to avoid the crash. The complete fix re-shuffles the initializations of some of the clean-up pointers. The details of the fix can be found in the libpcap git repository: commit bc8209b71e928870b0f172d43b174ab27ba24394 Proded by: kevlo, rpaulo MFC after: 2 weeks Submitted by: Anton Yuzhaninov
* | Merge my change against libpcap trunk revisiondelphij2011-03-111-11/+39
| | | | | | | | | | | | | | | | c65292b04b98d6a76d58c5a54ca8f81463bf24de to support new SIOCGIFDESCR ioctl interface which was too late for libpcap 1.1.1. Reported by: brucec Noticed by: wxs
* | Remove more unused files.rpaulo2010-10-295-590/+0
| |
* | Remove unused files.rpaulo2010-10-2948-8225/+0
| |
* | Merge libpcap-1.1.1.rpaulo2010-10-29203-4500/+19746
|\ \ | |/
* | Revised revision 199201 (add interface description capability as inspireddelphij2010-01-271-3/+13
| | | | | | | | | | | | | | | | by OpenBSD), based on comments from many, including rwatson, jhb, brooks and others. Sponsored by: iXsystems, Inc. MFC after: 1 month
* | Revert revision 199201 for now as it has introduced a kernel vulnerabilitydelphij2009-11-121-12/+4
| | | | | | | | and requires more polishing.
* | Add interface description capability as inspired by OpenBSD.delphij2009-11-111-4/+12
| | | | | | | | MFC after: 3 months
* | Revert previous commit that commented out some bpf functions.rpaulo2009-04-115-9/+9
| | | | | | | | | | | | Unconstify arguments of bpf_image(), bpf_filter() and bpf_dump(). This is needed because some ports rely heavely on these arguments (some of them even roll out their own implemenentations of bpf_dump).
* | Restore local change to include <sys/bpf.h> inside pcap.h. This fixesrpaulo2009-04-022-6/+2
| | | | | | | | remaining ports build problems.
* | Remove a dangling extern "C" declaration that was missed during therpaulo2009-03-311-4/+0
| | | | | | | | | | | | merge. Fixes C++ ports using libpcap (nmap, for example). Submitted by: Daniel Roethlisberger <daniel at roe.ch>
* | Fixed indentation for LINKTYPE_ENCvanhu2009-03-241-1/+1
| | | | | | | | Approved by: gnn(mentor)
* | bpf_filter() and bpf_validate() can't live here if they already live inrpaulo2009-03-221-2/+2
| | | | | | | | bpf.h
* | Remove remaining references to BIOCSETBUFMODE ifdefs. We now haverpaulo2009-03-211-7/+0
| | | | | | | | another ifdef for zerocopy bpf.
* | Finish merge of zerocopy bpf.rpaulo2009-03-211-156/+0
| |
* | Merge libpcap 1.0.0.rpaulo2009-03-21156-10691/+25065
|\ \ | |/
| * Flatten vendor/libpcap and remove keyword expansion.rpaulo2009-03-2097-54701/+0
| |
* | Add Mac OS X stuff.rpaulo2009-03-211-0/+2
| |
* | Add a couple more paths.rpaulo2009-03-211-0/+2
| |
* | Add exclude list for libpcap.rpaulo2009-03-211-0/+3
| |
* | Added DLT_ENC to map list, so it is now possiblevanhu2009-03-161-0/+3
| | | | | | | | | | | | | | | | to save dumps on enc0 Reviewed by: gnn(mentor) Obtained from: NETASQ MFC after: 1 week
* | Implement zero-copy bpf(4) buffer or "zbuf" support for libpcap. A slightlycsjp2008-09-163-37/+354
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | different version has been committed upstream in the libpcap vendor branch. This will allow people to experiment with zero-copy bpf(4) without requiring external patches. Note to enable this functionality: sysctl net.bpf.zerocopy_enable=1 By default, libpcap will use the legacy buffering method unless this sysctl variable is set to 1. For the details about zero-copy bpf(4) implementation see svn change r177548. Requested by: many Discussed with: sam In collaboration with: rwatson
* | Revert back to including the whole net/bpf.h again.mlaier2007-10-201-3/+1
| | | | | | | | | | Requested by: sam, nork X-MFC after: now
* | Resolve merge conflictsmlaier2007-10-1612-893/+965
| | | | | | | | | | Approved by: re (kensmith) Obtained from: tcpdump.org
* | This commit was generated by cvs2svn to compensate for changes in r172677,mlaier2007-10-1624-3037/+4903
|\ \ | |/ | | | | which included commits to RCS files with non-trunk default branches.
| * Import of libpcap v0.9.8mlaier2007-10-1634-3478/+5892
| |
* | Add three new ioctl(2) commands for bpf(4).jkim2007-02-261-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - BIOCGDIRECTION and BIOCSDIRECTION get or set the setting determining whether incoming, outgoing, or all packets on the interface should be returned by BPF. Set to BPF_D_IN to see only incoming packets on the interface. Set to BPF_D_INOUT to see packets originating locally and remotely on the interface. Set to BPF_D_OUT to see only outgoing packets on the interface. This setting is initialized to BPF_D_INOUT by default. BIOCGSEESENT and BIOCSSEESENT are obsoleted by these but kept for backward compatibility. - BIOCFEEDBACK sets packet feedback mode. This allows injected packets to be fed back as input to the interface when output via the interface is successful. When BPF_D_INOUT direction is set, injected outgoing packet is not returned by BPF to avoid duplication. This flag is initialized to zero by default. Note that libpcap has been modified to support BPF_D_OUT direction for pcap_setdirection(3) and PCAP_D_OUT direction is functional now. Reviewed by: rwatson
* | sigh, put back buffer overflow fix of 1.1.11 that seems to havesam2006-09-041-1/+3
| | | | | | | | | | not gone into the 0.9.4 release; don't put it on the vendor branch so we won't lose it on the next import if they continue to lose it
* | update instructionssam2006-09-041-13/+12
| |
* | resolve merge conflictssam2006-09-047-85/+262
| | | | | | | | MFC after: 1 month
* | This commit was generated by cvs2svn to compensate for changes in r162012,sam2006-09-0422-293/+3983
|\ \ | |/ | | | | which included commits to RCS files with non-trunk default branches.
| * Import of libpcap v0.9.4sam2006-09-0429-381/+4246
| |
* | This commit was generated by cvs2svn to compensate for changes in r154439,sam2006-01-161-1/+1
|\ \ | |/ | | | | which included commits to RCS files with non-trunk default branches.
| * correct dlt buffer alloc; this goes on the vendor branch as itsam2006-01-161-1/+1
| | | | | | | | | | | | will be committed there shortly MFC after: 3 days
* | resolve merge conflictssam2005-07-1110-544/+1556
| | | | | | | | Approved by: re (scottl)
* | This commit was generated by cvs2svn to compensate for changes in r147894,sam2005-07-1128-282/+1239
|\ \ | |/ | | | | which included commits to RCS files with non-trunk default branches.
| * Virgin import of libpcap v0.9.1 (release) from tcpdump.orgsam2005-07-1138-730/+2803
| | | | | | | | Approved by: re (scottl)
* | resolve merge conflictssam2005-05-2910-895/+600
| | | | | | | | Reviewed by: bms (earlier version)
* | This commit was generated by cvs2svn to compensate for changes in r146768,sam2005-05-2943-1058/+6642
|\ \ | |/ | | | | which included commits to RCS files with non-trunk default branches.
OpenPOWER on IntegriCloud