Add the PPP types for the DEC LANBridge100 Spanning Tree protocol and

for "Bridging PDU"s (which I'm assuming are 802.1d Spanning Tree BPDUs),
and have the STP and LANBridge100 STP dissectors register them with the
"ppp.protocol" dissector table.

Fix the value for the PPP type for MPLS Multicast (it's 0x0283, not
0x0281).


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

4 files changed, 20 insertions, 10 deletions

diff --git a/packet-bpdu.c b/packet-bpdu.c
index db992d9a86..20f9c9e0ab 100644
--- a/packet-bpdu.c
+++ b/packet-bpdu.c
@@ -1,7 +1,7 @@
 /* packet-bpdu.c
  * Routines for BPDU (Spanning Tree Protocol) disassembly
  *
- * $Id: packet-bpdu.c,v 1.19 2001/01/09 06:31:34 guy Exp $
+ * $Id: packet-bpdu.c,v 1.20 2001/01/14 08:25:14 guy Exp $
  *
  * Copyright 1999 Christophe Tronche <ch.tronche@computer.org>
  * 
@@ -42,6 +42,7 @@
 #include <glib.h>
 #include "packet.h"
 #include "llcsaps.h"
+#include "ppptypes.h"
 #include "resolv.h"
 
 /* Include this for GVRP dissector */
@@ -326,4 +327,5 @@ void
 proto_reg_handoff_bpdu(void)
 {
   dissector_add("llc.dsap", SAP_BPDU, dissect_bpdu, proto_bpdu);
+  dissector_add("ppp.protocol", PPP_BPDU, dissect_bpdu, proto_bpdu);
 }
diff --git a/packet-dec-bpdu.c b/packet-dec-bpdu.c
index a41bd9ff47..11eff73ed0 100644
--- a/packet-dec-bpdu.c
+++ b/packet-dec-bpdu.c
@@ -1,7 +1,7 @@
 /* packet-dec-bpdu.c
  * Routines for DEC BPDU (DEC Spanning Tree Protocol) disassembly
  *
- * $Id: packet-dec-bpdu.c,v 1.4 2001/01/09 06:31:35 guy Exp $
+ * $Id: packet-dec-bpdu.c,v 1.5 2001/01/14 08:25:14 guy Exp $
  *
  * Copyright 2001 Paul Ionescu <paul@acorp.ro>
  * 
@@ -43,6 +43,7 @@
 #include "packet.h"
 #include "resolv.h"
 #include "etypes.h"
+#include "ppptypes.h"
 
 /* Offsets of fields within a BPDU */
 
@@ -157,7 +158,8 @@ proto_register_dec_bpdu(void)
     &ett_dec_bpdu,
   };
 
-  proto_dec_bpdu = proto_register_protocol("DEC Spanning Tree Protocol", "DEC_STP", "dec_stp");
+  proto_dec_bpdu = proto_register_protocol("DEC Spanning Tree Protocol",
+					   "DEC_STP", "dec_stp");
   proto_register_subtree_array(ett, array_length(ett));
 }
 
@@ -166,4 +168,6 @@ proto_reg_handoff_dec_bpdu(void)
 {
   dissector_add("ethertype", ETHERTYPE_DEC_LB, dissect_dec_bpdu,
 		proto_dec_bpdu); 
+  dissector_add("ppp.protocol", PPP_DEC_LB, dissect_dec_bpdu,
+		proto_dec_bpdu); 
 }
diff --git a/packet-ppp.c b/packet-ppp.c
index ab9d851ebe..bf35c822dc 100644
--- a/packet-ppp.c
+++ b/packet-ppp.c
@@ -1,7 +1,7 @@
 /* packet-ppp.c
  * Routines for ppp packet disassembly
  *
- * $Id: packet-ppp.c,v 1.53 2001/01/13 07:47:49 guy Exp $
+ * $Id: packet-ppp.c,v 1.54 2001/01/14 08:25:14 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -94,11 +94,15 @@ static const value_string ppp_vals[] = {
 	{PPP_AT,        "Appletalk"      },
 	{PPP_IPX,       "Netware IPX/SPX"},
 	{PPP_VJC_COMP,	"VJ compressed TCP"},
-	{PPP_VJC_UNCOMP,"VJ uncompressed TCP"}, 
+	{PPP_VJC_UNCOMP,"VJ uncompressed TCP"},
+	{PPP_BPDU,      "Bridging PDU"},
 	{PPP_VINES,     "Vines"          },
         {PPP_MP,	"Multilink"},
 	{PPP_IPV6,      "IPv6"           },
 	{PPP_COMP,	"compressed packet" },
+	{PPP_DEC_LB,	"DEC LANBridge100 Spanning Tree"},
+	{PPP_MPLS_UNI,  "MPLS Unicast"},
+	{PPP_MPLS_MULTI, "MPLS Multicast"},
 	{PPP_IPCP,	"IP Control Protocol" },
 	{PPP_ATCP,	"AppleTalk Control Protocol" },
 	{PPP_IPXCP,	"IPX Control Protocol" },
@@ -108,8 +112,6 @@ static const value_string ppp_vals[] = {
 	{PPP_LQR,	"Link Quality Report protocol" },
 	{PPP_CHAP,	"Cryptographic Handshake Auth. Protocol" },
 	{PPP_CBCP,	"Callback Control Protocol" },
-	{PPP_MPLS_UNI,  "MPLS Uni-cast"},
-	{PPP_MPLS_MULTI, "MPLS Multi-cast"},
 	{ETHERTYPE_IP,  "Cisco HDLC IP"},
 	{CISCO_SLARP,   "Cisco HDLC SLARP"},
 	{0,             NULL            }
diff --git a/ppptypes.h b/ppptypes.h
index ba9083ea3a..9268a123d2 100644
--- a/ppptypes.h
+++ b/ppptypes.h
@@ -1,7 +1,7 @@
 /* ppptypes.h
  * Defines PPP packet types.
  *
- * $Id: ppptypes.h,v 1.4 2001/01/10 09:34:08 guy Exp $
+ * $Id: ppptypes.h,v 1.5 2001/01/14 08:25:14 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -36,12 +36,14 @@
 #define PPP_IPX		0x2b	/* IPX protocol */
 #define	PPP_VJC_COMP	0x2d	/* VJ compressed TCP */
 #define	PPP_VJC_UNCOMP	0x2f	/* VJ uncompressed TCP */
+#define PPP_BPDU	0x31	/* Bridging PDU (spanning tree BPDU?) */
 #define	PPP_VINES	0x35	/* Banyan Vines */
 #define PPP_MP		0x3d	/* Multilink PPP */
 #define PPP_IPV6	0x57	/* Internet Protocol Version 6 */
 #define PPP_COMP	0xfd	/* compressed packet */
-#define PPP_MPLS_UNI	0x281	/* MPLS Unicast */
-#define PPP_MPLS_MULTI	0x281	/* MPLS Multicast */
+#define PPP_DEC_LB	0x0205	/* DEC LANBridge100 Spanning Tree */
+#define PPP_MPLS_UNI	0x0281	/* MPLS Unicast */
+#define PPP_MPLS_MULTI	0x0283	/* MPLS Multicast */
 #define PPP_IPCP	0x8021	/* IP Control Protocol */
 #define PPP_ATCP	0x8029	/* AppleTalk Control Protocol */
 #define PPP_IPXCP	0x802b	/* IPX Control Protocol */