osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Add some ethertypes (which were captured on my network, so inuse ;-). 

svn path=/trunk/; revision=2242
This commit is contained in:
Laurent Deniel 2000-08-09 22:10:23 +00:00
parent 02fc097017
commit 95c935f216
2 changed files with 69 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
etypes.h
View File

@ -1,7 +1,7 @@
/* etypes.h
* Defines ethernet packet types, similar to tcpdump's ethertype.h
*
* $Id: etypes.h,v 1.13 2000/03/09 18:31:50 ashokn Exp $
* $Id: etypes.h,v 1.14 2000/08/09 22:10:23 deniel Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -45,6 +45,42 @@
* http://www.cavebear.com/CaveBear/Ethernet/
*/
#ifndef ETHERTYPE_3C_NBP_DGRAM
#define ETHERTYPE_3C_NBP_DGRAM 0x3c07
#endif
#ifndef ETHERTYPE_DEC
#define ETHERTYPE_DEC 0x6000
#endif
#ifndef ETHERTYPE_DNA_DL
#define ETHERTYPE_DNA_DL 0x6001
#endif
#ifndef ETHERTYPE_DNA_RC
#define ETHERTYPE_DNA_RC 0x6002
#endif
#ifndef ETHERTYPE_DNA_RT
#define ETHERTYPE_DNA_RT 0x6003
#endif
#ifndef ETHERTYPE_LAT
#define ETHERTYPE_LAT 0x6004
#endif
#ifndef ETHERTYPE_DEC_DIAG
#define ETHERTYPE_DEC_DIAG 0x6005
#endif
#ifndef ETHERTYPE_DEC_CUST
#define ETHERTYPE_DEC_CUST 0x6006
#endif
#ifndef ETHERTYPE_DEC_SCA
#define ETHERTYPE_DEC_SCA 0x6007
#endif
#ifndef ETHERTYPE_IP
#define ETHERTYPE_IP 0x0800
#endif
@ -65,6 +101,10 @@
#define ETHERTYPE_REVARP 0x8035
#endif
#ifndef ETHERTYPE_DEC_LB
#define ETHERTYPE_DEC_LB 0x8038
#endif
#ifndef ETHERTYPE_ATALK
#define ETHERTYPE_ATALK 0x809b
#endif

46
packet-ethertype.c
View File

@ -1,7 +1,7 @@
/* ethertype.c
* Routines for calling the right protocol for the ethertype.
*
* $Id: packet-ethertype.c,v 1.6 2000/08/07 03:20:33 guy Exp $
* $Id: packet-ethertype.c,v 1.7 2000/08/09 22:10:23 deniel Exp $
*
* Gilbert Ramirez <gram@xiexie.org>
*
@ -44,23 +44,33 @@
static dissector_table_t ethertype_dissector_table;
const value_string etype_vals[] = {
{ETHERTYPE_IP, "IP" },
{ETHERTYPE_IPv6, "IPv6" },
{ETHERTYPE_X25L3, "X.25 Layer 3" },
{ETHERTYPE_ARP, "ARP" },
{ETHERTYPE_REVARP, "RARP" },
{ETHERTYPE_ATALK, "Appletalk" },
{ETHERTYPE_AARP, "AARP" },
{ETHERTYPE_IPX, "Netware IPX/SPX"},
{ETHERTYPE_VINES, "Vines" },
{ETHERTYPE_TRAIN, "Netmon Train" },
{ETHERTYPE_LOOP, "Loopback" }, /* Ethernet Loopback */
{ETHERTYPE_PPPOED, "PPPoE Discovery"},
{ETHERTYPE_PPPOES, "PPPoE Session" },
{ETHERTYPE_VLAN, "802.1Q Virtual LAN" },
{ETHERTYPE_MPLS, "MPLS label switched packet" },
{ETHERTYPE_MPLS_MULTI, "MPLS multicast label switched packet" },
{0, NULL } };
{ETHERTYPE_IP, "IP" },
{ETHERTYPE_IPv6, "IPv6" },
{ETHERTYPE_X25L3, "X.25 Layer 3" },
{ETHERTYPE_ARP, "ARP" },
{ETHERTYPE_REVARP, "RARP" },
{ETHERTYPE_DEC_LB, "DEC LanBridge" },
{ETHERTYPE_ATALK, "Appletalk" },
{ETHERTYPE_AARP, "AARP" },
{ETHERTYPE_IPX, "Netware IPX/SPX" },
{ETHERTYPE_VINES, "Vines" },
{ETHERTYPE_TRAIN, "Netmon Train" },
{ETHERTYPE_LOOP, "Loopback" }, /* Ethernet Loopback */
{ETHERTYPE_PPPOED, "PPPoE Discovery" },
{ETHERTYPE_PPPOES, "PPPoE Session" },
{ETHERTYPE_VLAN, "802.1Q Virtual LAN" },
{ETHERTYPE_MPLS, "MPLS label switched packet" },
{ETHERTYPE_MPLS_MULTI, "MPLS multicast label switched packet" },
{ETHERTYPE_3C_NBP_DGRAM, "3Com NBP Datagram" },
{ETHERTYPE_DEC, "DEC proto" },
{ETHERTYPE_DNA_DL, "DEC DNA Dump/Load" },
{ETHERTYPE_DNA_RC, "DEC DNA Remote Console" },
{ETHERTYPE_DNA_RT, "DEC DNA Routing" },
{ETHERTYPE_LAT, "DEC LAT" },
{ETHERTYPE_DEC_DIAG, "DEC Diagnostics" },
{ETHERTYPE_DEC_CUST, "DEC Customer use" },
{ETHERTYPE_DEC_SCA, "DEC LAVC/SCA" },
{0, NULL } };
void
capture_ethertype(guint16 etype, int offset,