#
303975 |
|
11-Aug-2016 |
gjb |
Copy stable/11@r303970 to releng/11.0 as part of the 11.0-RELEASE cycle.
Prune svn:mergeinfo from the new branch, and rename it to RC1.
Update __FreeBSD_version.
Use the quarterly branch for the default FreeBSD.conf pkg(8) repo and the dvd1.iso packages population.
Approved by: re (implicit) Sponsored by: The FreeBSD Foundation |
#
302408 |
|
08-Jul-2016 |
gjb |
Copy head@r302406 to stable/11 as part of the 11.0-RELEASE cycle. Prune svn:mergeinfo from the new branch, as nothing has been merged here.
Additional commits post-branch will follow.
Approved by: re (implicit) Sponsored by: The FreeBSD Foundation
|
#
285275 |
|
08-Jul-2015 |
pkelsey |
MFV r285191: tcpdump 4.7.4.
Also, the changes made in r272451 and r272653 that were lost in the merge of 4.6.2 (r276788) have been restored.
PR: 199568 Differential Revision: https://reviews.freebsd.org/D3007 Reviewed by: brooks, hiren Approved by: jmallett (mentor) MFC after: 1 month
|
#
277982 |
|
31-Jan-2015 |
pfg |
MFV r277981: Upstream fixes for issues found with afl (Issue #417).
- Fix length checking.
Check both the captured length and the on-the-wire length (the latter *should* be greater than or equal to the former, but that's not guaranteed).
Add some additional length checks, so neither caplen nor length underflow.
If we stop dissecting because the packet is too short, return 1, not 0, as we've "dissected" what we can; 0 means "this is LLC+SNAP with an OUI of 0 and an unknown Ethertype".
commit: 743bcecdc92f88b118ec7aac4f68b606601205cc
- Clean up length checks.
Check only the amount of length that matters at any given point; yes, this means we do multiple checks, but so it goes.
We don't need to check for LLC+SNAP - llc_print() does that for us. We do, however, need to check to make sure we can safely skip the Fore header.
commit: 5c65e7532fa16308e01299988852b0dc5b027559
|
#
276788 |
|
07-Jan-2015 |
delphij |
MFV r276761: tcpdump 4.6.2.
MFC after: 1 month
|
#
235530 |
|
17-May-2012 |
delphij |
Merge tcpdump 4.2.1.
MFC after: 2 weeks
|
#
214478 |
|
28-Oct-2010 |
rpaulo |
Merge tcpdump-4.1.1.
|
#
190207 |
|
21-Mar-2009 |
rpaulo |
Merge tcpdump 4.0.0 from the vendor branch.
|
#
172686 |
|
16-Oct-2007 |
mlaier |
Resolve merge conflicts
Approved by: re (kensmith) Obtained from: tcpdump.org
|
#
162021 |
|
04-Sep-2006 |
sam |
resolve merge conflicts
MFC after: 1 month
|
#
147904 |
|
11-Jul-2005 |
sam |
resolve merge conflicts
Approved by: re (scottl)
|
#
146778 |
|
29-May-2005 |
sam |
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
|
#
127675 |
|
31-Mar-2004 |
bms |
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().
|
#
98527 |
|
21-Jun-2002 |
fenner |
Merge tcpdump 3.7.1
MFC after: 2 weeks
|
#
75118 |
|
03-Apr-2001 |
fenner |
Merge tcpdump 3.6.2
|
#
56896 |
|
30-Jan-2000 |
fenner |
Merge tcpdump 3.5
|
#
39300 |
|
15-Sep-1998 |
fenner |
Merge tcpdump 3.4
PR: bin/7877
|
#
32149 |
|
01-Jan-1998 |
pst |
Handle frame relay, decode ATM VP/VC info, and handle ISO over FR.
|
#
26183 |
|
27-May-1997 |
fenner |
Merge tcpdump 3.3. The print_nfs.c changes are pretty extensive; this is partially because LBL did a lot of cleanup and partially because I removed lots of pointless changes away from the LBL style.
PR: 3371 mostly-Submitted by: Chris Timmons <skynyrd@opus.cts.cwu.edu>
|
#
21262 |
|
03-Jan-1997 |
wollman |
Update to reflect changes in net/if.h.
|
#
17681 |
|
19-Aug-1996 |
pst |
This commit was generated by cvs2svn to compensate for changes in r17680, which included commits to RCS files with non-trunk default branches.
|
#
17680 |
|
19-Aug-1996 |
pst |
Virgin import of unmodified tcpdump v3.2.1 distribution from LBL. Obtained from: ftp://ftp.ee.lbl.gov/tcpdump.tar.Z on 19-Aug-1996.
|