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

As long as we're supporting PPP protocol types over Ethernet, we might 

as well just include "ppptypes.h" in "packet-ethertype.c", rather than
defining ETHERTYPE_ values equal to the corresponding PPP_ values, and
add entries for the PPP protocols we now dissect when running atop
Ethernet.

svn path=/trunk/; revision=3548
This commit is contained in:
Guy Harris 2001-06-14 20:37:07 +00:00
parent 2d0a0be252
commit fd6901b0c9
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
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.20 2001/06/14 20:05:12 guy Exp $
* $Id: etypes.h,v 1.21 2001/06/14 20:37:07 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -168,9 +168,6 @@
#define ETHERTYPE_LOOP 0x9000 /* used for layer 2 testing (do i see my own frames on the wire) */
#endif
#ifndef ETHERTYPE_PAP
#define ETHERTYPE_PAP 0xC023 /* Quick & dirty. just to indicate the PAP protocol*/
#endif
extern const value_string etype_vals[];
#endif /* etypes.h */

13
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.15 2001/06/14 20:05:12 guy Exp $
* $Id: packet-ethertype.c,v 1.16 2001/06/14 20:37:07 guy Exp $
*
* Gilbert Ramirez <gram@xiexie.org>
*
@ -40,6 +40,7 @@
#include "packet-vlan.h"
#include "packet-vines.h"
#include "etypes.h"
#include "ppptypes.h"
static dissector_table_t ethertype_dissector_table;
@ -72,7 +73,15 @@ const value_string etype_vals[] = {
{ETHERTYPE_DEC_CUST, "DEC Customer use" },
{ETHERTYPE_DEC_SCA, "DEC LAVC/SCA" },
{ETHERTYPE_ETHBRIDGE, "Transparent Ethernet bridging" },
{ETHERTYPE_PAP, "PPP Password Authentication Protocol" },
/*
* XXX - is there a standard for running PPP protocols atop
* Ethernet, using the PPP protocol type value as the
* Ethernet protocol type value?
*/
{PPP_IPCP, "PPP IP Control Protocol" },
{PPP_LCP, "PPP Link Control Protocol" },
{PPP_PAP, "PPP Password Authentication Protocol" },
{0, NULL } };
static void add_trailer(proto_tree *fh_tree, int trailer_id, tvbuff_t *tvb,