Avoid collison with error(), clean up code a bit.

[tcpdump] / ppp.h

diff --git a/ppp.h b/ppp.h
index 423480861b4167f581b681a12acd695dc1534b64..9d53423f3b7c4c253d5080606bc54585871958d8 100644 (file)
--- a/ppp.h
+++ b/ppp.h
@@ -1,4 +1,3 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/ppp.h,v 1.14 2003-05-22 15:29:22 hannes Exp $ (LBL) */
 /*
  * Point to Point Protocol (PPP) RFC1331
  *
@@ -20,6 +19,9 @@
 #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 */
@@ -32,6 +34,7 @@
 #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 */
 
@@ -60,8 +63,6 @@
 #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[];