xnu-792.13.8.tar.gz

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

diff --git a/bsd/netinet/icmp6.h b/bsd/netinet/icmp6.h
index 428caa828e4b3a7e5eb8ce2d68abee37c61b96eb..5e3955cf734758ed3ae7e0d3efc658d285269cc0 100644 (file)
--- a/bsd/netinet/icmp6.h
+++ b/bsd/netinet/icmp6.h
@@ -1,26 +1,31 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
- * 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
+ * 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.  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
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
+ *
+ * The Original Code and all software distributed under the License are 
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, 
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
+ * Please see the License for the specific language governing rights and 
  * limitations under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
+ *
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
  */
 /*     $KAME: icmp6.h,v 1.46 2001/04/27 15:09:48 itojun Exp $  */
 
@@ -509,7 +514,6 @@ struct icmp6_filter {
 };
 
 #ifdef KERNEL
-#ifdef __APPLE_API_UNSTABLE
 #define        ICMP6_FILTER_SETPASSALL(filterp) \
 do {                                                           \
        int i; u_char *p;                                       \
@@ -519,7 +523,6 @@ do {                                                                \
 } while (0)
 #define        ICMP6_FILTER_SETBLOCKALL(filterp) \
        bzero(filterp, sizeof(struct icmp6_filter))
-#endif /* __APPLE_API_UNSTABLE */
 #else /* KERNEL */
 #define        ICMP6_FILTER_SETPASSALL(filterp) \
        memset(filterp, 0xff, sizeof(struct icmp6_filter))
@@ -536,7 +539,6 @@ do {                                                                \
 #define        ICMP6_FILTER_WILLBLOCK(type, filterp) \
        ((((filterp)->icmp6_filt[(type) >> 5]) & (1 << ((type) & 31))) == 0)
 
-#ifdef __APPLE_API_UNSTABLE
 /*
  * Variables related to this implementation
  * of the internet control message protocol version 6.
@@ -621,6 +623,7 @@ struct icmp6stat {
 #define ICMPV6CTL_ND6_PRLIST   20
 #define ICMPV6CTL_MAXID                21
 
+#ifdef KERNEL_PRIVATE
 #define ICMPV6CTL_NAMES { \
        { 0, 0 }, \
        { 0, 0 }, \
@@ -644,29 +647,26 @@ struct icmp6stat {
        { 0, 0 }, \
        { 0, 0 }, \
 }
-#endif /* __APPLE_API_UNSTABLE */
 
 #define RTF_PROBEMTU   RTF_PROTO1
 
-#ifdef KERNEL
 # ifdef __STDC__
 struct rtentry;
 struct rttimer;
 struct in6_multi;
 # endif
-#ifdef __APPLE_API_PRIVATE
-void   icmp6_init __P((void));
-void   icmp6_paramerror __P((struct mbuf *, int));
-void   icmp6_error __P((struct mbuf *, int, int, int));
-int    icmp6_input __P((struct mbuf **, int *, int));
-void   icmp6_fasttimo __P((void));
-void   icmp6_reflect __P((struct mbuf *, size_t));
-void   icmp6_prepare __P((struct mbuf *));
-void   icmp6_redirect_input __P((struct mbuf *, int));
-void   icmp6_redirect_output __P((struct mbuf *, struct rtentry *));
+void   icmp6_init(void);
+void   icmp6_paramerror(struct mbuf *, int);
+void   icmp6_error(struct mbuf *, int, int, int);
+int    icmp6_input(struct mbuf **, int *);
+void   icmp6_fasttimo(void);
+void   icmp6_reflect(struct mbuf *, size_t);
+void   icmp6_prepare(struct mbuf *);
+void   icmp6_redirect_input(struct mbuf *, int);
+void   icmp6_redirect_output(struct mbuf *, struct rtentry *);
 
 struct ip6ctlparam;
-void   icmp6_mtudisc_update __P((struct ip6ctlparam *, int));
+void   icmp6_mtudisc_update(struct ip6ctlparam *, int);
 
 /* XXX: is this the right place for these macros? */
 #define icmp6_ifstat_inc(ifp, tag) \
@@ -733,7 +733,6 @@ do { \
 
 extern int     icmp6_rediraccept;      /* accept/process redirects */
 extern int     icmp6_redirtimeout;     /* cache time for redirect routes */
-#endif /* __APPLE_API_PRIVATE */
-#endif /* KERNEL */
+#endif KERNEL_PRIVATE
 
 #endif /* !_NETINET_ICMP6_H_ */