Commit Graph

40 Commits

Author SHA1 Message Date
Guy Harris
7068209574 Use nd_ types in 802.x and FDDI headers.
Use EXTRACT_U_1() as required by those changes.  Remove
no-longer-necessary & operators from other EXTRACT_ calls.

While we're at it, add MAC_ADDR_LEN to netdissect.h, and use it instead
of ETHER_ADDR_LEN; eliminate ETHER_ADDR_LEN.

Move the maximum Ethernet length field value to ethertype.h, under the
name MAX_ETHERNET_LENGTH_VAL.

Move the Ethernet header structure, and the #define for the Ethernet
header length, to print-ether.c; in non-Ethernet dissectors that were
using the Ethernet header structure, just declare two nd_mac_addr
variables for the source and destination MAC addresses and use them
instead of the Ethernet header (we don't need the type field there).

These changes leave nothing in ether.h, so eliminate it.
2017-12-12 10:36:21 -08:00
Steven H. Wang
99f6d01b24 add NSH ethertype
https://tools.ietf.org/html/draft-ietf-sfc-nsh-12#section-12.1
2017-04-02 09:08:17 +01:00
Andrew Lunn
d729eb478e Add support for the Marvell Extended Distributed Switch Architecture header
This header can be used with Marvell switches to direct packets in/out
of a specific port in a tree of interconnected switches. The header
uses its own Ethertype of 0xdada.

By default, only brief output is printed, showing the switch device,
port, and vlan the packet is to/from. However if -e is given, to print
the link-level header, all fields are printed.
2015-04-25 22:44:15 +02:00
Francois-Xavier Le Bail
37117d76c0 print-ether: print 'ethertype IEEE1905.1' instead of 'ethertype Unknown'
not a full decoder, uses default print
reference: http://standards.ieee.org/develop/regauth/ethertype/eth.txt
2014-05-05 11:02:52 +02:00
Denis Ovsienko
35043f3507 AoE: add version 1 decoder (GH #298)
The sample capture was produced with two Linux hosts (aoetools version
36, kernel module version 85, vblade version 21). One of the hosts
exported a 1MB block device containing a freshly created filesystem and
the other mounted it, wrote a small file and then unmounted.
2014-05-04 20:48:03 +04:00
Denis Ovsienko
fe3253b9b8 remove tcpdump's own CVS keywords
Remove lots of $Header's and a few $Id's that all belong to the former
CVS repository of tcpdump itself. These keywords have been frozen since
the migration to git in late 2008.
2014-01-03 00:59:08 +04:00
Michael Richardson
a97fb2f3ae whitespace changes 2014-01-01 21:31:18 -05:00
Ola Martin Lykkja
0c78d433d9 Improved quality, bug fixes, typos. Added test case 2013-06-27 13:28:10 +02:00
Ola Martin Lykkja
80d038a7b1 Adding support for ISO CALM FAST and ETSI GeoNetworking 2013-06-25 23:43:19 +02:00
Romain Francoise
66c1d1031b Add MS NLB heartbeat ethertype, as well as a basic printer
The protocol is undocumented but Wireshark extracts some useful bits of
info from the packet, so it was used as a reference.
2013-02-23 18:48:52 +01:00
ABHIMANYU
2c233065b6 TIPC support.
Reviewed-and-much-modified-by: Guy Harris <guy@alum.mit.edu>
2012-02-28 20:36:55 -08:00
Michael Richardson
28b293f330 added support and test case for QinQ packets 2010-10-07 14:47:22 -04:00
Guy Harris
0d6ffcf7e6 Make it look more like the FreeBSD tcpdump ethertype.h. 2009-07-25 10:48:32 -07:00
Guy Harris
f1ca3d4287 From FreeBSD: handle the non-standard Ethertypes for PPPoE that some
3Com hardware uses.
2009-07-25 10:47:00 -07:00
Guy Harris
9248d0c2fa From William J. Hulley: support for the Transparent Ethernet Bridge
ethertype in GRE.
2009-02-26 01:04:20 -08:00
guy
1789f57c36 From Andrew Silent: Realtek Remote Control Protocol support (see
OpenRRCP.org.ru for details).
2008-02-06 10:47:53 +00:00
hannes
bbb4050969 add basic support for the IEEE Link Discovery Protocol as per 802.1ab 2007-08-03 11:03:19 +00:00
hannes
9d84f80c5f change 802.1ag pre-standard codepoint to standard codepoint 2007-07-23 09:01:09 +00:00
hannes
1226a40cb0 add skeleton support for 802.1ag CFM 2006-10-12 10:26:12 +00:00
hannes
0860434f38 add basic support for MPCP 802.3ah frame printer 2006-02-10 04:52:25 +00:00
hannes
c56e09a204 add support for the IEEE slow protocols LACP, MARKER as per 802.3ad 2005-07-10 14:41:34 +00:00
hannes
de7827fb7e add support for cisco-style ethertype encaps within frame-relay 2004-10-07 16:04:06 +00:00
hannes
3b8786edf4 - hack the ethertype_values[] table to accomodate GRE flavours
- call the IP6, IPX, ATALK, MPLS dissectors within the GRE dissector
- be more verbose about the GRE proto-id (hidden under the eflag)
2004-06-12 16:32:56 +00:00
mcr
dba9695745 added EAPOL ethernet type. 2004-03-25 03:30:40 +00:00
hannes
3a919068a9 add support for Jumbo Ethertype 0x8870 and embedded OSI traffic 2004-02-18 14:23:27 +00:00
guy
6f93affaeb Define "ethertype_values[]" in "print-ether.c", make it not static, and
have "ethertype.h" just declare it, so that

	1) we only have one such table, shared by all dissectors that
	   use it

and

	2) GCC 3.3 doesn't complain that it's defined but not used in
	   those dissectors that incldue "ethertype.h" but don't use
	   "ethertype_values[]".
2003-07-01 19:10:26 +00:00
hannes
8027f41d71 - complete the proto-id to string mapping
- get rid of duplicate ETHERTYPE_REVARP entry
- add ETHERTYPE_VMAN entry for Extreme' VMAN protocol
2003-05-28 08:59:14 +00:00
hannes
f60a1bd8cb hide multiline output using vflag plus enhanced, ES-IS decoder 2002-10-03 16:00:32 +00:00
hannes
72f3eb3b58 support for decoding IS-IS inside Cisco HDLC Frames 2002-09-11 22:15:16 +00:00
itojun
544c52e1ef MPLS label encapsulation decoding, per RFC3032.
TODO: multiple labels.  other media types.
2001-06-21 17:56:02 +00:00
fenner
c737726a82 Convert cut-n-paste tab damage into tabs. 2001-04-03 05:21:24 +00:00
guy
9298dc84c8 Assorted PPTP and GRE enhancements from Motonori Shindo
<mshindo@mshindo.net>.
2001-03-12 00:24:54 +00:00
fenner
cbb769e118 Handle (GRE-encapsulated) PPTP 2001-02-04 02:19:23 +00:00
guy
e894092542 Add definitions of Ethernet types from
"linux-includes/netinet/if_ether.h" to "ethertype.h".

Move other stuff used by dissectors from <netinet/if_ether.h> to
"ether.h", along the lines of "fddi.h" and "token.h".

Move ARP declarations from BSD include files to "print-arp.c".

Remove from dissectors includes of <netinet/if_ether.h>, and add
includes of "ethertype.h" and/or "ether.h" as necessary.

Get rid of configuration options that test declarations now made in
"ether.h" or "print-arp.c", as those declarations are now under our
control, not the OS's control.
2000-09-23 08:03:27 +00:00
assar
74536c18ba add ETHERTYPE_IPX. From Jeffrey Hutzelman <jhutz@cmu.edu> 2000-06-10 13:49:08 +00:00
fenner
2efcee4a2e Rearrange to keep values sorted. 2000-01-29 21:56:38 +00:00
fenner
29b8d95a8d Fix type for 802.1q 2000-01-29 20:58:41 +00:00
itojun
92d3fd1b47 add ETHERTYPE_IPV6. reorder.
From: Craig Rodrigues <rodrigc@mediaone.net>
2000-01-17 06:23:19 +00:00
assar
8c34405525 add some more types for 802.1Q and PPPoe. From kuznet@ms2.inr.ac.ru 1999-11-21 03:42:52 +00:00
mcr
f555c163f9 Initial revision 1999-10-07 23:47:09 +00:00