diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-01-23 04:04:01 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-01-23 04:04:01 +0000 |
| commit | 8e6518ea607984b4fb76d0e04c28fed8631b368c (patch) | |
| tree | f214615d7ccc4c35e113ba59059839b4f3a043dd /arcnet_pids.h | |
| parent | 46ce1e6079557ec10c18d4d8908edaad7bc9354f (diff) | |
In the BSDs, ARCNET packets don't have an offset field between the
addresses and the protocol type, as supplied by BPF; on Linux, they *do*
have an offset field, as supplied by PF_PACKET sockets. Add a new
WTAP_ENCAP_ARCNET_LINUX, with packets that include the offset field, and
don't dissect an offset in WTAP_ENCAP_ARCNET packets.
Map a libpcap link-layer type of 129 to WTAP_ENCAP_ARCNET_LINUX; that
value was recently assigned to Linux-style ARCNET.
Add some more ARCNET protocol IDs.
For most protocol IDs, dissect an ATA 878.2 fragmentation header; don't
do it for RFC 1051 IP and ARP, and Diagnose packets. Set the length of
the ARCNET protocol tree item appropriately.
Dissect both the RFC 1051 and RFC 1201 styles of IP and ARP over ARCNET,
and dissect the RFC 1201 style of RARP as well.
svn path=/trunk/; revision=6981
Diffstat (limited to 'arcnet_pids.h')
| -rw-r--r-- | arcnet_pids.h | 35 |
1 files changed, 31 insertions, 4 deletions
diff --git a/arcnet_pids.h b/arcnet_pids.h index a9e4e999b0..72e5cea975 100644 --- a/arcnet_pids.h +++ b/arcnet_pids.h @@ -2,7 +2,7 @@ * ARCNET protocol ID values * Copyright 2001-2002, Peter Fales <ethereal@fales-lorenz.net> * - * $Id: arcnet_pids.h,v 1.1 2002/10/18 20:59:57 guy Exp $ + * $Id: arcnet_pids.h,v 1.2 2003/01/23 04:03:58 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -23,6 +23,33 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define ARCNET_PROTO_IP 0xd4 -#define ARCNET_PROTO_ARP 0xd5 -#define ARCNET_PROTO_IPX 0xfa +/* RFC 1051 */ +#define ARCNET_PROTO_IP_1051 240 +#define ARCNET_PROTO_ARP_1051 241 + +/* RFC 1201 */ +#define ARCNET_PROTO_IP_1201 212 +#define ARCNET_PROTO_ARP_1201 213 +#define ARCNET_PROTO_RARP_1201 214 + +#define ARCNET_PROTO_IPX 250 +#define ARCNET_PROTO_NOVELL_EC 236 + +#define ARCNET_PROTO_IPv6 196 /* or so BSD's arcnet.h claims */ + +/* + * Raw Ethernet over ARCNET - Linux's "if_arcnet.h" calls this + * "MS LAanMan/WfWg 'NDIS' encapsuation". + */ +#define ARCNET_PROTO_ETHERNET 232 + +#define ARCNET_PROTO_DATAPOINT_BOOT 0 +#define ARCNET_PROTO_DATAPOINT_MOUNT 1 +#define ARCNET_PROTO_POWERLAN_BEACON 8 +#define ARCNET_PROTO_POWERLAN_BEACON2 243 +#define ARCNET_PROTO_LANSOFT 251 + +#define ARCNET_PROTO_APPLETALK 221 +#define ARCNET_PROTO_BANYAN 247 /* Banyan VINES */ + +#define ARCNET_PROTO_DIAGNOSE 128 /* as per ANSI/ATA 878.1 */ |