summaryrefslogtreecommitdiffstats
path: root/contrib/tcpdump/print-llc.c
Commit message (Collapse)AuthorAgeFilesLines
* MFV r277981:pfg2015-01-311-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* MFV r276761: tcpdump 4.6.2.delphij2015-01-071-90/+76
|\ | | | | | | MFC after: 1 month
* \ Merge tcpdump 4.2.1.delphij2012-05-171-3/+3
|\ \ | |/ | | | | MFC after: 2 weeks
* | Merge tcpdump-4.1.1.rpaulo2010-10-281-9/+5
|\ \ | |/
* | Merge tcpdump 4.0.0 from the vendor branch.rpaulo2009-03-211-6/+22
|\ \ | |/
| * Flatten vendor/tcpdump and remove keyword expansion.rpaulo2009-03-201-533/+0
| |
| * Import of tcpdump v3.9.8mlaier2007-10-161-15/+34
| |
| * Import of tcpdump v3.9.4sam2006-09-041-54/+55
| |
| * Virgin import of tcpdump v3.9.1 (release) from tcpdump.orgsam2005-07-111-106/+171
| | | | | | | | Approved by: re (scottl)
| * Virgin import of tcpdump v3.9.1 (alpha 096) from tcpdump.orgsam2005-05-291-7/+26
| |
| * Import tcpdump 3.8.3, from http://www.tcpdump.org/releases/tcpdump-3.8.3.tar.gzbms2004-03-311-51/+162
| |
| * Import tcpdump 3.7.1, fromfenner2002-06-211-27/+82
| | | | | | | | http://www.tcpdump.org/release/tcpdump-3.7.1.tar.gz
| * Virgin import of tcpdump.org tcpdump v3.6.2fenner2001-04-031-17/+73
| |
| * Virgin import of tcpdump.org tcpdump v3.5fenner2000-01-301-27/+42
| |
| * Virgin import of LBL tcpdump v3.4fenner1998-09-151-3/+2
| |
| * Virgin import of LBL tcpdump v3.3fenner1997-05-271-5/+3
| |
* | Resolve merge conflictsmlaier2007-10-161-15/+34
| | | | | | | | | | Approved by: re (kensmith) Obtained from: tcpdump.org
* | resolve merge conflictssam2006-09-041-54/+55
| | | | | | | | MFC after: 1 month
* | resolve merge conflictssam2005-07-111-106/+171
| | | | | | | | Approved by: re (scottl)
* | resolve merge conflicts and update for proper build; including:sam2005-05-291-7/+26
| | | | | | | | | | | | | | | | 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
* | Merge of tcpdump 3.8.3 from tcpdump.org, with the following caveats:bms2004-03-311-54/+162
| | | | | | | | | | | | | | | | | | | | | | 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().
* | Merge tcpdump 3.7.1fenner2002-06-211-27/+82
| | | | | | | | MFC after: 2 weeks
* | Merge tcpdump 3.6.2fenner2001-04-031-17/+73
| |
* | Merge tcpdump 3.5fenner2000-01-301-24/+44
| |
* | Merge tcpdump 3.4fenner1998-09-151-3/+2
| | | | | | | | PR: bin/7877
* | Merge tcpdump 3.3.fenner1997-05-271-5/+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>
* | repair editor damageadam1996-12-111-1/+1
| |
* | Please shut up if asked to be quiet.phk1996-12-111-1/+1
|/
* Virgin import of unmodified tcpdump v3.2.1 distribution from LBL.pst1996-08-191-0/+195
Obtained from: ftp://ftp.ee.lbl.gov/tcpdump.tar.Z on 19-Aug-1996.
OpenPOWER on IntegriCloud