aboutsummaryrefslogtreecommitdiffstats
path: root/epan/ppptypes.h
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2015-12-10 13:09:42 -0800
committerGuy Harris <guy@alum.mit.edu>2015-12-10 21:10:40 +0000
commitad328d97a6cd9253c6fbd74b6ccca6c10be58201 (patch)
tree1f8e4a30998f7dafed1b3ed3ae1c100850d07cc7 /epan/ppptypes.h
parenta33209d69e95d025466f4efaebe22f6ae686c214 (diff)
The Bridging Control Protocol is really two protocols.
RFC 3518 defines two protocols, one used to encapsulate bridged PDUs and one used to configure the bridging process. Make them two separately-registered protocols. Change-Id: I393ea31ab7ef44cae2ef2b592ffde5d53ecb113f Reviewed-on: https://code.wireshark.org/review/12509 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/ppptypes.h')
-rw-r--r--epan/ppptypes.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/ppptypes.h b/epan/ppptypes.h
index 449cb2cd4b..c80c714c66 100644
--- a/epan/ppptypes.h
+++ b/epan/ppptypes.h
@@ -40,7 +40,7 @@
#define PPP_IPX 0x2b /* Novell IPX */
#define PPP_VJC_COMP 0x2d /* Van Jacobson Compressed TCP/IP */
#define PPP_VJC_UNCOMP 0x2f /* Van Jacobson Uncompressed TCP/IP */
-#define PPP_BCP 0x31 /* Bridging PDU */
+#define PPP_BCP_BPDU 0x31 /* Bridging PDU */
#define PPP_ST 0x33 /* Stream Protocol (ST-II) */
#define PPP_VINES 0x35 /* Banyan Vines */
#define PPP_AT_EDDP 0x39 /* AppleTalk EDDP */
@@ -111,7 +111,7 @@
#define PPP_DECNETCP 0x8027 /* DECnet Phase IV Control Protocol */
#define PPP_ATCP 0x8029 /* AppleTalk Control Protocol */
#define PPP_IPXCP 0x802b /* Novell IPX Control Protocol */
-#define PPP_BRIDGENCP 0x8031 /* Bridging NCP */
+#define PPP_BCP_NCP 0x8031 /* Bridging NCP */
#define PPP_SPCP 0x8033 /* Stream Protocol Control Protocol */
#define PPP_BVCP 0x8035 /* Banyan Vines Control Protocol */
#define PPP_MLCP 0x803d /* Multi-Link Control Protocol */