X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/55e303ae13a4cf49d70f2294092726f2fffb9ef2..d41d1dae2cd00cc08c7982087d1c445180cad9f5:/bsd/netinet/icmp_var.h

diff --git a/bsd/netinet/icmp_var.h b/bsd/netinet/icmp_var.h
index bd03dd9af..d4332dcd3 100644
--- a/bsd/netinet/icmp_var.h
+++ b/bsd/netinet/icmp_var.h
@@ -1,16 +1,19 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * Copyright (c) 1982, 1986, 1993
@@ -61,7 +64,6 @@
 #ifndef _NETINET_ICMP_VAR_H_
 #define _NETINET_ICMP_VAR_H_
 #include <sys/appleapiopts.h>
-#ifdef __APPLE_API_UNSTABLE
 
 /*
  * Variables related to this implementation
@@ -69,19 +71,19 @@
  */
 struct	icmpstat {
 /* statistics related to icmp packets generated */
-	u_long	icps_error;		/* # of calls to icmp_error */
-	u_long	icps_oldshort;		/* no error 'cuz old ip too short */
-	u_long	icps_oldicmp;		/* no error 'cuz old was icmp */
-	u_long	icps_outhist[ICMP_MAXTYPE + 1];
+	u_int32_t	icps_error;	/* # of calls to icmp_error */
+	u_int32_t	icps_oldshort;	/* no error 'cuz old ip too short */
+	u_int32_t	icps_oldicmp;	/* no error 'cuz old was icmp */
+	u_int32_t	icps_outhist[ICMP_MAXTYPE + 1];
 /* statistics related to input messages processed */
- 	u_long	icps_badcode;		/* icmp_code out of range */
-	u_long	icps_tooshort;		/* packet < ICMP_MINLEN */
-	u_long	icps_checksum;		/* bad checksum */
-	u_long	icps_badlen;		/* calculated bound mismatch */
-	u_long	icps_reflect;		/* number of responses */
-	u_long	icps_inhist[ICMP_MAXTYPE + 1];
-	u_long	icps_bmcastecho; 	/* b/mcast echo requests dropped */
-	u_long	icps_bmcasttstamp; 	/* b/mcast tstamp requests dropped */
+	u_int32_t	icps_badcode;	/* icmp_code out of range */
+	u_int32_t	icps_tooshort;	/* packet < ICMP_MINLEN */
+	u_int32_t	icps_checksum;	/* bad checksum */
+	u_int32_t	icps_badlen;	/* calculated bound mismatch */
+	u_int32_t	icps_reflect;	/* number of responses */
+	u_int32_t	icps_inhist[ICMP_MAXTYPE + 1];
+	u_int32_t	icps_bmcastecho;/* b/mcast echo requests dropped */
+	u_int32_t	icps_bmcasttstamp; /* b/mcast tstamp requests dropped */
 };
 
 /*
@@ -93,6 +95,7 @@ struct	icmpstat {
 #define ICMPCTL_TIMESTAMP	4	/* allow replies to time stamp requests */
 #define ICMPCTL_MAXID		5
 
+#ifdef KERNEL_PRIVATE
 #define ICMPCTL_NAMES { \
 	{ 0, 0 }, \
 	{ "maskrepl", CTLTYPE_INT }, \
@@ -100,13 +103,10 @@ struct	icmpstat {
 	{ "icmplim", CTLTYPE_INT }, \
 	{ "icmptimestamp", CTLTYPE_INT }, \
 }
-#endif /* __APPLE_API_UNSTABLE */
 
-#ifdef KERNEL
-#ifdef __APPLE_API_PRIVATE
 SYSCTL_DECL(_net_inet_icmp);
 #ifdef ICMP_BANDLIM
-extern int badport_bandlim __P((int));
+extern int badport_bandlim(int);
 #endif
 #define BANDLIM_UNLIMITED -1
 #define BANDLIM_ICMP_UNREACH 0
@@ -115,6 +115,7 @@ extern int badport_bandlim __P((int));
 #define BANDLIM_RST_CLOSEDPORT 3 /* No connection, and no listeners */
 #define BANDLIM_RST_OPENPORT 4   /* No connection, listener */
 #define BANDLIM_MAX 4
-#endif /* __APPLE_API_PRIVATE */
-#endif
-#endif
+
+extern struct	icmpstat icmpstat;
+#endif /* KERNEL_PRIVATE */
+#endif /* _NETINET_ICMP_VAR_H_ */