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

[tcpdump] / af.c

diff --git a/af.c b/af.c
index 06d675fe2ff0aeca123be3a375498d2556e4326b..1f8a93a5c45d021a53d9f86865477775127cb138 100644 (file)
--- a/af.c
+++ b/af.c
@@ -12,26 +12,19 @@
  * 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/af.c,v 1.2 2006-02-27 07:25:27 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 "af.h"
 
-struct tok af_values[] = {
+const struct tok af_values[] = {
     { 0,                      "Reserved"},
-    { AFNUM_INET,             "IPv4"},
-    { AFNUM_INET6,            "IPv6"},
+    { AFNUM_IP,               "IPv4"},
+    { AFNUM_IP6,              "IPv6"},
     { AFNUM_NSAP,             "NSAP"},
     { AFNUM_HDLC,             "HDLC"},
     { AFNUM_BBN1822,          "BBN 1822"},
@@ -49,3 +42,15 @@ struct tok af_values[] = {
     { AFNUM_VPLS,             "VPLS"},
     { 0, NULL},
 };
+
+const struct tok bsd_af_values[] = {
+    { BSD_AF_INET, "IPv4" },
+    { BSD_AF_NS, "NS" },
+    { BSD_AF_ISO, "ISO" },
+    { BSD_AF_APPLETALK, "Appletalk" },
+    { BSD_AF_IPX, "IPX" },
+    { BSD_AF_INET6_BSD, "IPv6" },
+    { BSD_AF_INET6_FREEBSD, "IPv6" },
+    { BSD_AF_INET6_DARWIN, "IPv6" },
+    { 0, NULL}
+};