Fix for bug 1098. Add BPDU dissector to ethertype 0x8181.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19211 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/dissectors/packet-bpdu.c b/epan/dissectors/packet-bpdu.c
index 769a7863e96f7b857ea5c3c699beb49e7c1e43c0..837c47412711fa0702c447d9151f5cd3e63e7eaa 100644 (file)
--- 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 b96023f0e2a748e2a10947e46baded7fc0943343..e5e04c78da24f875f304645dfd8f16c7d70c413c 100644 (file)
--- 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 */

diff --git a/epan/etypes.h b/epan/etypes.h
index 68fe9a7befd006f2c2681bb9ba41045544645d8e..cdb533f95991186c6bafdfa447706f6cd77b032d 100644 (file)
--- a/epan/etypes.h
+++ b/epan/etypes.h
@@ -180,6 +180,10 @@
 #define ETHERTYPE_WCP          0x80ff  /* Wellfleet Compression Protocol */
 #endif
 
+#ifndef ETHERTYPE_STP
+#define ETHERTYPE_STP          0x8181  /* STP, HIPPI-ST */
+#endif
+
 #ifndef ETHERTYPE_ISMP
 #define ETHERTYPE_ISMP         0x81fd  /* Cabletron Interswitch Message Protocol */
 #endif