diff options
| author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2006-09-12 12:58:16 +0000 |
|---|---|---|
| committer | Jaap Keuter <jaap.keuter@xs4all.nl> | 2006-09-12 12:58:16 +0000 |
| commit | 593efe3509b56eca787c18c799b80aa61448d6e9 (patch) | |
| tree | 19e4b97b6eaee61f85810d317bcdc14b9436a71f /epan/dissectors | |
| parent | 4919409df7c5698ecee34e68611383d2203e125e (diff) | |
Fix for bug 1098. Add BPDU dissector to ethertype 0x8181.
svn path=/trunk/; revision=19211
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-bpdu.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-ethertype.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/epan/dissectors/packet-bpdu.c b/epan/dissectors/packet-bpdu.c index 769a7863e9..837c474127 100644 --- a/epan/dissectors/packet-bpdu.c +++ b/epan/dissectors/packet-bpdu.c @@ -35,6 +35,7 @@ #include <epan/llcsaps.h> #include <epan/ppptypes.h> #include <epan/chdlctypes.h> +#include <epan/etypes.h> #include <epan/addr_resolv.h> /* Offsets of fields within a BPDU */ @@ -802,4 +803,5 @@ proto_reg_handoff_bpdu(void) dissector_add("llc.dsap", SAP_BPDU, bpdu_handle); dissector_add("chdlctype", CHDLCTYPE_BPDU, bpdu_handle); dissector_add("llc.cisco_pid", 0x010b, bpdu_handle); + dissector_add("ethertype", ETHERTYPE_STP, bpdu_handle); } diff --git a/epan/dissectors/packet-ethertype.c b/epan/dissectors/packet-ethertype.c index b96023f0e2..e5e04c78da 100644 --- a/epan/dissectors/packet-ethertype.c +++ b/epan/dissectors/packet-ethertype.c @@ -64,7 +64,8 @@ const value_string etype_vals[] = { {ETHERTYPE_TRAIN, "Netmon Train" }, {ETHERTYPE_LOOP, "Loopback" }, /* Ethernet Loopback */ {ETHERTYPE_FOUNDRY, "Foundry proprietary" }, - {ETHERTYPE_WCP, "Wellfleet Compression Protocol" }, + {ETHERTYPE_WCP, "Wellfleet Compression Protocol" }, + {ETHERTYPE_STP, "Spanning Tree Protocol" }, {ETHERTYPE_ISMP, "Cabletron Interswitch Message Protocol" }, {ETHERTYPE_ISMP_TBFLOOD, "Cabletron SFVLAN 1.8 Tag-Based Flood" }, /* for ISMP, see RFC 2641, RFC 2642, RFC 2643 */ |