Commit graph

10 commits

Author SHA1 Message Date
Sam Leffler 17cb103cb1 resolve merge conflicts
MFC after:	1 month
2006-09-04 20:25:04 +00:00
Sam Leffler c1ad1296ec 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
Bruce M Simpson cc391cce11 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
Bill Fenner a1c2090e60 Merge tcpdump 3.7.1
MFC after:	2 weeks
2002-06-21 00:49:02 +00:00
Julian Elischer f1f9d42a53 Quick hack to print out the non-standard pppoe used by 3com 2001-09-27 08:02:27 +00:00
Bill Fenner 943ee2b15a Merge tcpdump 3.6.2 2001-04-03 07:50:46 +00:00
Bill Fenner a88113a830 Merge tcpdump 3.5 2000-01-30 01:05:24 +00:00
Brian Somers e8fdcab380 Support PPPoE.
Add a missing comma to the lcp config options table.
1999-11-14 11:28:11 +00:00
Paul Traina d5a5022d60 Print IPX packets over a PPP link.
Always display IPX network number in decimal (industry standard).
Decode other PPP protocol types too.

Submitted by:	peter, pst, John Hay <jhay@mikom.csir.co.za>
1996-08-19 21:43:47 +00:00
Paul Traina 4edb46e9a8 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