18 Commits

Author SHA1 Message Date
mlaier
7407d685ab Resolve merge conflicts
Approved by:	re (kensmith)
Obtained from:	tcpdump.org
2007-10-16 02:31:48 +00:00
sam
a8bc04a53e resolve merge conflicts
MFC after:	1 month
2006-09-04 20:25:04 +00:00
sam
5d66575dd9 resolve merge conflicts
Approved by:	re (scottl)
2005-07-11 04:14:02 +00:00
sam
7dacff5dd0 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
bms
55b12ee199 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
fenner
7171542229 Merge tcpdump 3.7.2 2003-03-02 08:25:48 +00:00
fenner
6d9538de20 Merge tcpdump 3.7.1
MFC after:	2 weeks
2002-06-21 00:49:02 +00:00
julian
3176497499 Quick hack to print out the non-standard pppoe used by 3com 2001-09-27 08:02:27 +00:00
fenner
2877f5b613 Merge tcpdump 3.6.2 2001-04-03 07:50:46 +00:00
fenner
c780ea93f3 Merge tcpdump 3.5 2000-01-30 01:05:24 +00:00
brian
2d0abab14d Support PPPoE.
Add a missing comma to the lcp config options table.
1999-11-14 11:28:11 +00:00
fenner
03014afd03 Merge tcpdump 3.4
PR:		bin/7877
1998-09-15 19:46:59 +00:00
wollman
0890a7ca8a This is a hack. Decode IEEE 802.1Q VLAN tagging so that we can decode
tagged traffic according to the encapsulated protocol.  It needs in
addition modifications to the filter generator which would deal with
checking the ethertype and vlan header as required.
1997-12-08 21:42:35 +00:00
fenner
a45d5a033f 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>
1997-05-27 02:17:42 +00:00
wollman
fb79103251 Update to reflect changes in net/if.h. 1997-01-03 20:10:04 +00:00
pst
b4a90e5e8c Here is a patch to make tcpdump recognise IPX packets that is using
ETHERNET_II framing. It got lost during the tcpdump upgrade.

Submitted by: John.Hay@mikom.csir.co.za
1996-09-15 17:55:09 +00:00
pst
621d4a6845 Decode maximumim sized ethernet frames properly 1996-08-19 21:35:13 +00:00
pst
97a804ef88 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.
1996-08-19 20:34:12 +00:00