diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-06-14 20:37:07 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-06-14 20:37:07 +0000 |
| commit | fd6901b0c9ec3b29ed22f2bc1f3f65630455daab (patch) | |
| tree | d35fe7f51221f93cc9a20e762a08cc315038ecd8 /packet-ethertype.c | |
| parent | 2d0a0be25208dc0b34975ffed29bb9765f078da4 (diff) | |
| download | wireshark-fd6901b0c9ec3b29ed22f2bc1f3f65630455daab.tar.gz | |
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
Diffstat (limited to 'packet-ethertype.c')
| -rw-r--r-- | packet-ethertype.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/packet-ethertype.c b/packet-ethertype.c index 9b973bdf9c..b4d7b3ea7b 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.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, |