xnu-1456.1.26.tar.gz

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

diff --git a/bsd/netinet/icmp6.h b/bsd/netinet/icmp6.h
index 5c1dd02399e657f264768d34bd24e571d0e96137..e3c559b11c1794154cc116aab03adc06e8f7a229 100644 (file)
--- a/bsd/netinet/icmp6.h
+++ b/bsd/netinet/icmp6.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2000,2007 Apple Inc. All rights reserved.
+ * Copyright (c) 2000,2008 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -132,6 +132,12 @@ struct icmp6_hdr {
 #define ICMP6_MEMBERSHIP_REDUCTION     132     /* group membership termination */
 #define MLD6_LISTENER_DONE             132     /* multicast listener done */
 
 #define ICMP6_MEMBERSHIP_REDUCTION     132     /* group membership termination */
 #define MLD6_LISTENER_DONE             132     /* multicast listener done */
 

+#ifndef KERNEL
+#define        MLD_LISTENER_QUERY              MLD6_LISTENER_QUERY
+#define        MLD_LISTENER_REPORT             MLD6_LISTENER_REPORT
+#define        MLD_LISTENER_DONE               MLD6_LISTENER_DONE
+#endif /* !KERNEL */
+

 #define ND_ROUTER_SOLICIT              133     /* router solicitation */
 #define ND_ROUTER_ADVERT               134     /* router advertisment */
 #define ND_NEIGHBOR_SOLICIT            135     /* neighbor solicitation */
 #define ND_ROUTER_SOLICIT              133     /* router solicitation */
 #define ND_ROUTER_ADVERT               134     /* router advertisment */
 #define ND_NEIGHBOR_SOLICIT            135     /* neighbor solicitation */


@@ -151,6 +157,11 @@ struct icmp6_hdr {
 #define MLD6_MTRACE_RESP               200     /* mtrace response(to sender) */
 #define MLD6_MTRACE                    201     /* mtrace messages */
 
 #define MLD6_MTRACE_RESP               200     /* mtrace response(to sender) */
 #define MLD6_MTRACE                    201     /* mtrace messages */
 

+#ifndef KERNEL
+#define        MLD_MTRACE_RESP                 MLD6_MTRACE_RESP
+#define        MLD_MTRACE                      MLD6_MTRACE
+#endif /* !KERNEL */
+

 #define ICMP6_HADISCOV_REQUEST         202     /* XXX To be defined */
 #define ICMP6_HADISCOV_REPLY           203     /* XXX To be defined */
   
 #define ICMP6_HADISCOV_REQUEST         202     /* XXX To be defined */
 #define ICMP6_HADISCOV_REPLY           203     /* XXX To be defined */
   


@@ -731,6 +742,6 @@ do { \
 
 extern int     icmp6_rediraccept;      /* accept/process redirects */
 extern int     icmp6_redirtimeout;     /* cache time for redirect routes */
 
 extern int     icmp6_rediraccept;      /* accept/process redirects */
 extern int     icmp6_redirtimeout;     /* cache time for redirect routes */

-#endif KERNEL_PRIVATE
+#endif /* KERNEL_PRIVATE */

 
 #endif /* !_NETINET_ICMP6_H_ */
 
 #endif /* !_NETINET_ICMP6_H_ */