Add changes in 4.2.1.

[tcpdump] / nlpid.h

diff --git a/nlpid.h b/nlpid.h
index 69641121796e7f1cc2b16f597f5aafe9f5f17af2..8931835a9940cada9bb480aa69d4da82bf60994a 100644 (file)
--- a/nlpid.h
+++ b/nlpid.h
@@ -1,4 +1,4 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/nlpid.h,v 1.1 2004-10-07 14:53:10 hannes Exp $ (LBL) */
+/* @(#) $Header: /tcpdump/master/tcpdump/nlpid.h,v 1.4 2004-10-19 15:27:55 hannes Exp $ (LBL) */

 /* 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code
 /* 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code


@@ -14,17 +14,19 @@
  * Original code by Hannes Gredler ([email protected])
  */
 
  * Original code by Hannes Gredler ([email protected])
  */
 

-extern struct tok nlpid_values[];
+extern const struct tok nlpid_values[];

 
 #define        NLPID_NULLNS    0x00
 
 #define        NLPID_NULLNS    0x00

-#define NLPID_LMI       0x08 /* ANSI T1.617 Annex D or ITU-T Q.933 Annex A */
-#define NLPID_CISCO_LMI 0x09 /* The original, aka Cisco, aka Gang of Four */
+#define NLPID_Q933      0x08 /* ANSI T1.617 Annex D or ITU-T Q.933 Annex A */
+#define NLPID_LMI       0x09 /* The original, aka Cisco, aka Gang of Four */

 #define NLPID_SNAP      0x80
 #define        NLPID_CLNP      0x81 /* iso9577 */
 #define        NLPID_ESIS      0x82 /* iso9577 */
 #define        NLPID_ISIS      0x83 /* iso9577 */
 #define NLPID_CONS      0x84
 #define NLPID_IDRP      0x85
 #define NLPID_SNAP      0x80
 #define        NLPID_CLNP      0x81 /* iso9577 */
 #define        NLPID_ESIS      0x82 /* iso9577 */
 #define        NLPID_ISIS      0x83 /* iso9577 */
 #define NLPID_CONS      0x84
 #define NLPID_IDRP      0x85

+#define NLPID_MFR       0xb1 /* FRF.15 */

 #define NLPID_IP        0xcc
 #define NLPID_IP        0xcc

+#define NLPID_PPP       0xcf

 #define NLPID_X25_ESIS  0x8a
 #define NLPID_IP6       0x8e
 #define NLPID_X25_ESIS  0x8a
 #define NLPID_IP6       0x8e