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

[tcpdump] / af.h

diff --git a/af.h b/af.h
index 679cc8e5fa18678f7dbb102a0bbd511b4fb8a625..1d8d457e33ae49ac8cd09b895616bd02a10ef57d 100644 (file)
--- a/af.h
+++ b/af.h
@@ -1,5 +1,3 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/af.h,v 1.3 2006-03-23 14:58:44 hannes Exp $ (LBL) */
-

 /*
  * Copyright (c) 1998-2006 The TCPDUMP project
  *
 /*
  * Copyright (c) 1998-2006 The TCPDUMP project
  *


@@ -14,15 +12,15 @@
  * 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 const struct tok af_values[];
 extern const struct tok bsd_af_values[];
 
 /* RFC1700 address family numbers */
  */
 
 extern const struct tok af_values[];
 extern const struct tok bsd_af_values[];
 
 /* RFC1700 address family numbers */

-#define AFNUM_INET     1
-#define AFNUM_INET6    2
+#define AFNUM_IP       1
+#define AFNUM_IP6      2

 #define AFNUM_NSAP     3
 #define AFNUM_HDLC     4
 #define AFNUM_BBN1822  5
 #define AFNUM_NSAP     3
 #define AFNUM_HDLC     4
 #define AFNUM_BBN1822  5


@@ -47,11 +45,11 @@ extern const struct tok bsd_af_values[];
  * so, because we want to be able to read captures from all of the BSDs,
  * we check for all of them.
  */
  * so, because we want to be able to read captures from all of the BSDs,
  * we check for all of them.
  */

-#define BSD_AFNUM_INET         2
-#define BSD_AFNUM_NS           6               /* XEROX NS protocols */
-#define BSD_AFNUM_ISO          7
-#define BSD_AFNUM_APPLETALK    16
-#define BSD_AFNUM_IPX          23
-#define BSD_AFNUM_INET6_BSD    24      /* OpenBSD (and probably NetBSD), BSD/OS */
-#define BSD_AFNUM_INET6_FREEBSD        28
-#define BSD_AFNUM_INET6_DARWIN 30
+#define BSD_AF_INET            2
+#define BSD_AF_NS              6       /* XEROX NS protocols */
+#define BSD_AF_ISO             7
+#define BSD_AF_APPLETALK       16
+#define BSD_AF_IPX             23
+#define BSD_AF_INET6_BSD       24      /* NetBSD, OpenBSD, BSD/OS, Npcap */
+#define BSD_AF_INET6_FREEBSD   28      /* FreeBSD */
+#define BSD_AF_INET6_DARWIN    30      /* macOS, iOS, other Darwin-based OSes */