diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-03-29 08:05:07 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-03-29 08:05:07 +0000 |
| commit | 41904dc30328d7d2bc432f744a0c312050bbc457 (patch) | |
| tree | 7d2124066541ba6d1d3e4893f01a5281fd154fad | |
| parent | d11b3119921374357378aa80170f9185ef8afa19 (diff) | |
Add WCP to the list of Ethernet types in "etype_vals[]", and add
"compressed" to the list of NLPIDs in "nlpid_vals[]".
Use "nlpid_vals" for the Frame Relay NLPID field.
svn path=/trunk/; revision=3206
| -rw-r--r-- | etypes.h | 6 | ||||
| -rw-r--r-- | packet-ethertype.c | 3 | ||||
| -rw-r--r-- | packet-fr.c | 4 | ||||
| -rw-r--r-- | packet-osi.c | 3 | ||||
| -rw-r--r-- | packet-wcp.c | 5 |
5 files changed, 13 insertions, 8 deletions
@@ -1,7 +1,7 @@ /* etypes.h * Defines ethernet packet types, similar to tcpdump's ethertype.h * - * $Id: etypes.h,v 1.15 2001/01/13 07:47:48 guy Exp $ + * $Id: etypes.h,v 1.16 2001/03/29 08:05:06 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -126,6 +126,10 @@ /* Created by Netmon as a summary packet */ #endif +#ifndef ETHERTYPE_WCP +#define ETHERTYPE_WCP 0x80ff /* Wellfleet Compression Protocol */ +#endif + #ifndef ETHERTYPE_LOOP #define ETHERTYPE_LOOP 0x9000 /* used for layer 2 testing (do i see my own frames on the wire) */ #endif diff --git a/packet-ethertype.c b/packet-ethertype.c index f858f25778..1cc43a256c 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.12 2001/02/01 07:34:29 guy Exp $ + * $Id: packet-ethertype.c,v 1.13 2001/03/29 08:05:06 guy Exp $ * * Gilbert Ramirez <gram@xiexie.org> * @@ -56,6 +56,7 @@ const value_string etype_vals[] = { {ETHERTYPE_VINES, "Vines" }, {ETHERTYPE_TRAIN, "Netmon Train" }, {ETHERTYPE_LOOP, "Loopback" }, /* Ethernet Loopback */ + {ETHERTYPE_WCP, "Wellfleet Compression Protocol" }, {ETHERTYPE_PPPOED, "PPPoE Discovery" }, {ETHERTYPE_PPPOES, "PPPoE Session" }, {ETHERTYPE_VLAN, "802.1Q Virtual LAN" }, diff --git a/packet-fr.c b/packet-fr.c index 113ad354fc..33a011ee3d 100644 --- a/packet-fr.c +++ b/packet-fr.c @@ -3,7 +3,7 @@ * * Copyright 2001, Paul Ionescu <paul@acorp.ro> * - * $Id: packet-fr.c,v 1.12 2001/03/23 23:56:03 guy Exp $ + * $Id: packet-fr.c,v 1.13 2001/03/29 08:05:06 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -274,7 +274,7 @@ void proto_register_fr(void) FRELAY_EA, "Extended Address" }}, { &hf_fr_nlpid, { "NLPID", "fr.nlpid", FT_UINT8, BASE_HEX, - NULL, 0x0, "FrameRelay Encapsulated Protocol NLPID" }}, + VALS(nlpid_vals), 0x0, "FrameRelay Encapsulated Protocol NLPID" }}, { &hf_fr_oui, { "Organization Code", "fr.snap.oui", FT_UINT24, BASE_HEX, VALS(oui_vals), 0x0, ""}}, diff --git a/packet-osi.c b/packet-osi.c index 06ea30267e..53c7bc5274 100644 --- a/packet-osi.c +++ b/packet-osi.c @@ -2,7 +2,7 @@ * Routines for ISO/OSI network and transport protocol packet disassembly * Main entrance point and common functions * - * $Id: packet-osi.c,v 1.39 2001/01/09 06:31:39 guy Exp $ + * $Id: packet-osi.c,v 1.40 2001/03/29 08:05:06 guy Exp $ * Laurent Deniel <deniel@worldnet.fr> * Ralf Schneider <Ralf.Schneider@t-online.de> * @@ -218,6 +218,7 @@ const value_string nlpid_vals[] = { { NLPID_ISO9542X25_ESIS, "ESIS (X.25)" }, { NLPID_ISO10030, "ISO 10030" }, { NLPID_ISO11577, "ISO 11577" }, + { NLPID_COMPRESSED, "Data compression protocol" }, { NLPID_IP, "IP" }, { NLPID_PPP, "PPP" }, { 0, NULL }, diff --git a/packet-wcp.c b/packet-wcp.c index 7e02bd388c..3ac71e5160 100644 --- a/packet-wcp.c +++ b/packet-wcp.c @@ -2,7 +2,7 @@ * Routines for Wellfleet Compression frame disassembly * Copyright 2001, Jeffrey C. Foster <jfoste@woodward.com> * - * $Id: packet-wcp.c,v 1.6 2001/03/29 06:09:50 guy Exp $ + * $Id: packet-wcp.c,v 1.7 2001/03/29 08:05:07 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -112,6 +112,7 @@ #include "packet-frame.h" #include "packet-osi.h" #include "conversation.h" +#include "etypes.h" #include "nlpid.h" #include "oui.h" #include "packet-llc.h" @@ -184,8 +185,6 @@ static int hf_wcp_type = -1; static gint ett_wcp = -1; static gint ett_wcp_field = -1; -#define ETHERTYPE_WCP 0x80ff /* ether snap value for WCP */ - /* * Bits in the address field. */ |