Add changes in 4.2.1.

[tcpdump] / ppp.h

diff --git a/ppp.h b/ppp.h
index 520fde736b8977c0a80ffdcc9281e902c665a3cd..f1a2c48b98d814ad9ce050b6eee8ce05246e4d86 100644 (file)
--- a/ppp.h
+++ b/ppp.h
@@ -1,4 +1,4 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/ppp.h,v 1.12 2001-02-04 02:17:55 fenner Exp $ (LBL) */
+/* @(#) $Header: /tcpdump/master/tcpdump/ppp.h,v 1.16 2004-10-20 16:14:16 hannes Exp $ (LBL) */

 /*
  * Point to Point Protocol (PPP) RFC1331
  *
 /*
  * Point to Point Protocol (PPP) RFC1331
  *


@@ -20,6 +20,9 @@
 #define PPP_ADDRESS    0xff    /* The address byte value */
 #define PPP_CONTROL    0x03    /* The control byte value */
 
 #define PPP_ADDRESS    0xff    /* The address byte value */
 #define PPP_CONTROL    0x03    /* The control byte value */
 

+#define PPP_WITHDIRECTION_IN  0x00 /* non-standard for DLT_PPP_WITHDIRECTION */
+#define PPP_WITHDIRECTION_OUT 0x01 /* non-standard for DLT_PPP_WITHDIRECTION */
+

 /* Protocol numbers */
 #define PPP_IP         0x0021  /* Raw IP */
 #define PPP_OSI                0x0023  /* OSI Network Layer */
 /* Protocol numbers */
 #define PPP_IP         0x0021  /* Raw IP */
 #define PPP_OSI                0x0023  /* OSI Network Layer */


@@ -32,12 +35,15 @@
 #define PPP_BRPDU      0x0031  /* Bridging PDU */
 #define PPP_STII       0x0033  /* Stream Protocol (ST-II) */
 #define PPP_VINES      0x0035  /* Banyan Vines */
 #define PPP_BRPDU      0x0031  /* Bridging PDU */
 #define PPP_STII       0x0033  /* Stream Protocol (ST-II) */
 #define PPP_VINES      0x0035  /* Banyan Vines */

+#define PPP_ML          0x003d  /* Multi-Link PPP */

 #define PPP_IPV6       0x0057  /* IPv6 */
 #define        PPP_COMP        0x00fd  /* Compressed Datagram */
 
 #define PPP_HELLO      0x0201  /* 802.1d Hello Packets */
 #define PPP_LUXCOM     0x0231  /* Luxcom */
 #define PPP_SNS                0x0233  /* Sigma Network Systems */
 #define PPP_IPV6       0x0057  /* IPv6 */
 #define        PPP_COMP        0x00fd  /* Compressed Datagram */
 
 #define PPP_HELLO      0x0201  /* 802.1d Hello Packets */
 #define PPP_LUXCOM     0x0231  /* Luxcom */
 #define PPP_SNS                0x0233  /* Sigma Network Systems */

+#define PPP_MPLS_UCAST  0x0281  /* rfc 3032 */
+#define PPP_MPLS_MCAST  0x0283  /* rfc 3022 */

 
 #define PPP_IPCP       0x8021  /* IP Control Protocol */
 #define PPP_OSICP      0x8023  /* OSI Network Layer Control Protocol */
 
 #define PPP_IPCP       0x8021  /* IP Control Protocol */
 #define PPP_OSICP      0x8023  /* OSI Network Layer Control Protocol */


@@ -49,13 +55,17 @@
 #define PPP_VINESCP    0x8035  /* Banyan Vines Control Protocol */
 #define PPP_IPV6CP     0x8057  /* IPv6 Control Protocol */
 #define PPP_CCP                0x80fd  /* Compress Control Protocol */
 #define PPP_VINESCP    0x8035  /* Banyan Vines Control Protocol */
 #define PPP_IPV6CP     0x8057  /* IPv6 Control Protocol */
 #define PPP_CCP                0x80fd  /* Compress Control Protocol */

+#define PPP_MPLSCP      0x8281  /* rfc 3022 */

 
 #define PPP_LCP                0xc021  /* Link Control Protocol */
 #define PPP_PAP                0xc023  /* Password Authentication Protocol */
 #define PPP_LQM                0xc025  /* Link Quality Monitoring */
 
 #define PPP_LCP                0xc021  /* Link Control Protocol */
 #define PPP_PAP                0xc023  /* Password Authentication Protocol */
 #define PPP_LQM                0xc025  /* Link Quality Monitoring */

+#define PPP_SPAP        0xc027

 #define PPP_CHAP       0xc223  /* Challenge Handshake Authentication Protocol */
 #define PPP_BACP       0xc02b  /* Bandwidth Allocation Control Protocol */
 #define PPP_BAP                0xc02d  /* BAP */
 #define PPP_CHAP       0xc223  /* Challenge Handshake Authentication Protocol */
 #define PPP_BACP       0xc02b  /* Bandwidth Allocation Control Protocol */
 #define PPP_BAP                0xc02d  /* BAP */

-#define PPP_MP         0xc03d  /* Multi-Link */
+#define PPP_MPCP               0xc03d  /* Multi-Link */
+#define PPP_SPAP_OLD    0xc123
+#define PPP_EAP         0xc227

 
 extern struct tok ppptype2str[];
 
 extern struct tok ppptype2str[];