The third argument to linkaddr_string is one of the LINKADDR_ enums.

[tcpdump] / ppp.h

diff --git a/ppp.h b/ppp.h
index b33961d2c78c79c165145654a0f9d3e83ce3c0d9..9d53423f3b7c4c253d5080606bc54585871958d8 100644 (file)
--- a/ppp.h
+++ b/ppp.h
@@ -1,4 +1,3 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/ppp.h,v 1.10 2000-08-18 07:44:45 itojun Exp $ (LBL) */
 /*
  * Point to Point Protocol (PPP) RFC1331
  *
@@ -15,9 +14,14 @@
  * suitability of this software for any purpose.  It is provided "as is"
  * without express or implied warranty.
  */
+#define PPP_HDRLEN     4       /* length of PPP header */
+
 #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 */
@@ -30,11 +34,15 @@
 #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_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 */
@@ -46,13 +54,15 @@
 #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_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_MP         0xc03d  /* Multi-Link */
-
-extern struct tok ppptype2str[];
+#define PPP_MPCP               0xc03d  /* Multi-Link */
+#define PPP_SPAP_OLD    0xc123
+#define PPP_EAP         0xc227