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

[tcpdump] / nlpid.c

diff --git a/nlpid.c b/nlpid.c
old mode 100755 (executable)
new mode 100644 (file)
index d903c12..3f431e7
--- a/nlpid.c
+++ b/nlpid.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * 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
@@ -10,33 +10,29 @@
  * 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)
  */
 
-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/nlpid.c,v 1.1 2004-10-07 14:53:10 hannes Exp $ (LBL)";
-#endif
+#include <config.h>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <tcpdump-stdinc.h>
-#include "interface.h"
+#include "netdissect-stdinc.h"
+#include "netdissect.h"
 #include "nlpid.h"
 
-struct tok nlpid_values[] = {
+const struct tok nlpid_values[] = {
     { NLPID_NULLNS, "NULL" },
+    { NLPID_Q933, "Q.933" },
     { NLPID_LMI, "LMI" },
-    { NLPID_CISCO_LMI, "Cisco LMI" },
     { NLPID_SNAP, "SNAP" },
     { NLPID_CLNP, "CLNP" },
     { NLPID_ESIS, "ES-IS" },
     { NLPID_ISIS, "IS-IS" },
     { NLPID_CONS, "CONS" },
     { NLPID_IDRP, "IDRP" },
+    { NLPID_SPB, "ISIS_SPB" },
+    { NLPID_MFR, "FRF.15" },
     { NLPID_IP, "IPv4" },
+    { NLPID_PPP, "PPP" },
     { NLPID_X25_ESIS, "X25 ES-IS" },
     { NLPID_IP6, "IPv6" },
     { 0, NULL }