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

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
This commit is contained in:
Guy Harris 2001-03-29 08:05:07 +00:00
parent d11b311992
commit 41904dc303
5 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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.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

3
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.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" },

4
packet-fr.c
View File

@ -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, ""}},

3
packet-osi.c
View File

@ -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 },

5
packet-wcp.c
View File

@ -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.
*/