The PPP protocol type of 0031 is for the PPP Bridging Control Protocol;

it's not the "Bridge Control Protocol", and the packets aren't "BPDU"s
in the sense of Spanning Tree Protocol packets.

svn path=/trunk/; revision=25732

diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c
index 8f2a79704669df3a7f9b41355c6f13f7b5e59efd..bfa222eac2465679dd16759132b50ff0c451fc7d 100644 (file)
--- a/epan/dissectors/packet-ppp.c
+++ b/epan/dissectors/packet-ppp.c
@@ -263,7 +263,7 @@ const value_string ppp_vals[] = {
        {PPP_IPX,       "Netware IPX/SPX"},
        {PPP_VJC_COMP,  "VJ compressed TCP"},
        {PPP_VJC_UNCOMP,"VJ uncompressed TCP"},
-       {PPP_BPDU,      "Bridging PDU"},
+       {PPP_BCP,       "Bridging Control Protocol"},
        {PPP_ST,        "Stream Protocol (ST-II)" },
        {PPP_VINES,     "Vines"          },
        {PPP_AT_EDDP,   "AppleTalk EDDP" },
@@ -4392,7 +4392,7 @@ proto_register_bcp(void)
     &ett_bcp_flags
   };
 
-  proto_bcp = proto_register_protocol("PPP Bridge Control Protocol", "PPP BCP",                                      "bcp");
+  proto_bcp = proto_register_protocol("PPP Bridging Control Protocol", "PPP BCP", "bcp");
   proto_register_field_array(proto_bcp, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
 }
@@ -4419,7 +4419,7 @@ proto_reg_handoff_bcp(void)
   eth_withoutfcs_handle = find_dissector("eth_withoutfcs");
 
   bcp_handle = create_dissector_handle(dissect_bcp, proto_bcp);
-  dissector_add("ppp.protocol", PPP_BPDU, bcp_handle);
+  dissector_add("ppp.protocol", PPP_BCP, bcp_handle);
 }
 
 void

diff --git a/epan/ppptypes.h b/epan/ppptypes.h
index 65a28d9ef2a64d4a625915cfe10a9cdcd510f65f..7d6078e3ffce54092fd585370510a5f7cdd59277 100644 (file)
--- a/epan/ppptypes.h
+++ b/epan/ppptypes.h
@@ -41,7 +41,7 @@
 #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_BCP                0x31    /* Bridging Control Protocol */
 #define PPP_ST         0x33    /* Stream Protocol (ST-II) */
 #define        PPP_VINES       0x35    /* Banyan Vines */
 #define PPP_AT_EDDP    0x39    /* AppleTalk EDDP */