xnu-4570.1.46.tar.gz

[apple/xnu.git] / bsd / netinet / icmp_var.h

diff --git a/bsd/netinet/icmp_var.h b/bsd/netinet/icmp_var.h
index f64a91e7d34897137845fdb679993ea7e59ff84a..bb3021d022c24932ec899f45bdada54a46a0a48d 100644 (file)
--- a/bsd/netinet/icmp_var.h
+++ b/bsd/netinet/icmp_var.h
@@ -1,14 +1,19 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2013 Apple Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @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
@@ -18,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
@@ -66,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 */
 };
 
 /*
@@ -90,7 +95,7 @@ struct        icmpstat {
 #define ICMPCTL_TIMESTAMP      4       /* allow replies to time stamp requests */
 #define ICMPCTL_MAXID          5
 
-#ifdef KERNEL_PRIVATE
+#ifdef BSD_KERNEL_PRIVATE
 #define ICMPCTL_NAMES { \
        { 0, 0 }, \
        { "maskrepl", CTLTYPE_INT }, \
@@ -110,5 +115,7 @@ extern int badport_bandlim(int);
 #define BANDLIM_RST_CLOSEDPORT 3 /* No connection, and no listeners */
 #define BANDLIM_RST_OPENPORT 4   /* No connection, listener */
 #define BANDLIM_MAX 4
-#endif KERNEL_PRIVATE
-#endif _NETINET_ICMP_VAR_H_
+
+extern struct  icmpstat icmpstat;
+#endif /* BSD_KERNEL_PRIVATE */
+#endif /* _NETINET_ICMP_VAR_H_ */