CI: Add warning exemptions for Sun C (suncc-5.15) on Solaris 10

[tcpdump] / nlpid.h

diff --git a/nlpid.h b/nlpid.h
index 31f6b66da6ba0fdf5346184e80ba11d38eb971d0..a3a6905481c9d3e4d42a3e026664da3c4a77605d 100644 (file)
--- a/nlpid.h
+++ b/nlpid.h
@@ -1,5 +1,4 @@
-/* @(#) $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
  * distributions retain the above copyright notice and this paragraph
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code
  * distributions retain the above copyright notice and this paragraph


@@ -11,21 +10,22 @@
  * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  * FOR A PARTICULAR PURPOSE.
  *
  * LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
  * FOR A PARTICULAR PURPOSE.
  *

- * Original code by Hannes Gredler (hannes@juniper.net)
+ * Original code by Hannes Gredler (hannes@gredler.at)

  */
 
  */
 

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

 
 

-#define        NLPID_NULLNS    0x00
+#define        NLPID_NULLNS      0x00

 #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_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_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_CONS      0x84
 #define NLPID_IDRP      0x85
 #define NLPID_MFR       0xb1 /* FRF.15 */

+#define NLPID_SPB       0xc1 /* IEEE 802.1aq/D4.5 */

 #define NLPID_IP        0xcc
 #define NLPID_PPP       0xcf
 #define NLPID_X25_ESIS  0x8a
 #define NLPID_IP        0xcc
 #define NLPID_PPP       0xcf
 #define NLPID_X25_ESIS  0x8a