diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-04-22 08:50:07 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-04-22 08:50:07 +0000 |
| commit | 146f8ebd469523e9e95570389614830b682bf1e8 (patch) | |
| tree | 84fd11429fc55545cef014f34cfb3febc50e6ab1 | |
| parent | 99b9d2a13ecdf5f60edbd839e98d7340211277c7 (diff) | |
Add the Ethernet type for the Vines Echo protocol.
svn path=/trunk/; revision=7526
| -rw-r--r-- | etypes.h | 10 | ||||
| -rw-r--r-- | packet-ethertype.c | 8 | ||||
| -rw-r--r-- | packet-vines.c | 5 |
3 files changed, 15 insertions, 8 deletions
@@ -1,7 +1,7 @@ /* etypes.h * Defines ethernet packet types, similar to tcpdump's ethertype.h * - * $Id: etypes.h,v 1.32 2003/03/05 07:41:23 guy Exp $ + * $Id: etypes.h,v 1.33 2003/04/22 08:50:07 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -44,8 +44,12 @@ * http://www.cavebear.com/CaveBear/Ethernet/ */ -#ifndef ETHERTYPE_VINES -#define ETHERTYPE_VINES 0x0bad +#ifndef ETHERTYPE_VINES_IP +#define ETHERTYPE_VINES_IP 0x0bad +#endif + +#ifndef ETHERTYPE_VINES_ECHO +#define ETHERTYPE_VINES_ECHO 0x0baf #endif #ifndef ETHERTYPE_TRAIN diff --git a/packet-ethertype.c b/packet-ethertype.c index 426d93e9f7..c33426fc9a 100644 --- a/packet-ethertype.c +++ b/packet-ethertype.c @@ -1,7 +1,7 @@ /* ethertype.c * Routines for calling the right protocol for the ethertype. * - * $Id: packet-ethertype.c,v 1.34 2003/03/02 15:50:55 gerald Exp $ + * $Id: packet-ethertype.c,v 1.35 2003/04/22 08:50:07 guy Exp $ * * Gilbert Ramirez <gram@alumni.rice.edu> * @@ -53,7 +53,8 @@ const value_string etype_vals[] = { {ETHERTYPE_SNA, "SNA-over-Ethernet" }, {ETHERTYPE_AARP, "AARP" }, {ETHERTYPE_IPX, "Netware IPX/SPX" }, - {ETHERTYPE_VINES, "Vines" }, + {ETHERTYPE_VINES_IP, "Vines IP" }, + {ETHERTYPE_VINES_ECHO, "Vines Echo" }, {ETHERTYPE_TRAIN, "Netmon Train" }, {ETHERTYPE_LOOP, "Loopback" }, /* Ethernet Loopback */ {ETHERTYPE_WCP, "Wellfleet Compression Protocol" }, @@ -122,7 +123,8 @@ capture_ethertype(guint16 etype, const guchar *pd, int offset, int len, case ETHERTYPE_VLAN: capture_vlan(pd, offset, len, ld); break; - case ETHERTYPE_VINES: + case ETHERTYPE_VINES_IP: + case ETHERTYPE_VINES_ECHO: capture_vines(ld); break; default: diff --git a/packet-vines.c b/packet-vines.c index 480cba88b8..1e9ad402d9 100644 --- a/packet-vines.c +++ b/packet-vines.c @@ -1,7 +1,7 @@ /* packet-vines.c * Routines for Banyan VINES protocol packet disassembly * - * $Id: packet-vines.c,v 1.57 2003/04/22 08:37:55 guy Exp $ + * $Id: packet-vines.c,v 1.58 2003/04/22 08:50:07 guy Exp $ * * Don Lafontaine <lafont02@cn.ca> * @@ -429,7 +429,7 @@ proto_register_vines_ip(void) void proto_reg_handoff_vines_ip(void) { - dissector_add("ethertype", ETHERTYPE_VINES, vines_ip_handle); + dissector_add("ethertype", ETHERTYPE_VINES_IP, vines_ip_handle); dissector_add("ppp.protocol", PPP_VINES, vines_ip_handle); dissector_add("arcnet.protocol_id", ARCNET_PROTO_BANYAN, vines_ip_handle); @@ -476,6 +476,7 @@ proto_reg_handoff_vines_echo(void) vines_echo_handle = create_dissector_handle(dissect_vines_echo, proto_vines_echo); dissector_add("vines_llc.ptype", VINES_LLC_ECHO, vines_echo_handle); + dissector_add("ethertype", ETHERTYPE_VINES_ECHO, vines_echo_handle); } static const value_string pkttype_vals[] = { |