xnu-3789.70.16.tar.gz

[apple/xnu.git] / bsd / netinet6 / in6.h

diff --git a/bsd/netinet6/in6.h b/bsd/netinet6/in6.h
index c0838ec4300f5ee4cc539172746e9db17967d157..b09c026b4dfe802f807a5da3da10989b890c2ace 100644 (file)
--- a/bsd/netinet6/in6.h
+++ b/bsd/netinet6/in6.h
@@ -1,8 +1,8 @@
 /*
 /*

- * Copyright (c) 2008-2011 Apple Inc. All rights reserved.
+ * Copyright (c) 2008-2015 Apple Inc. All rights reserved.

  *
  * @APPLE_OSREFERENCE_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
  * 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


@@ -11,10 +11,10 @@
  * 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.
  * 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.
  * 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,
  * 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,


@@ -22,13 +22,10 @@
  * 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.
  * 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_OSREFERENCE_LICENSE_HEADER_END@
  */
 
  * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 

-/*     $FreeBSD: src/sys/netinet6/in6.h,v 1.7.2.4 2001/07/04 09:45:23 ume Exp $        */
-/*     $KAME: in6.h,v 1.89 2001/05/27 13:28:35 itojun Exp $    */
-

 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.


@@ -94,27 +91,24 @@
  */
 
 #ifndef __KAME_NETINET_IN_H_INCLUDED_
  */
 
 #ifndef __KAME_NETINET_IN_H_INCLUDED_

-#error "do not include netinet6/in6.h directly, include netinet/in.h.  see RFC2553"
+#error "do not include netinet6/in6.h directly, include netinet/in.h. " \
+       " see RFC2553"

 #endif
 
 #ifndef _NETINET6_IN6_H_
 #endif
 
 #ifndef _NETINET6_IN6_H_

-#define _NETINET6_IN6_H_
+#define        _NETINET6_IN6_H_

 #include <sys/appleapiopts.h>
 #include <sys/_types.h>
 
 #include <sys/appleapiopts.h>
 #include <sys/_types.h>
 

-
-#ifndef _SA_FAMILY_T
-#define _SA_FAMILY_T
-typedef __uint8_t              sa_family_t;
-#endif
+#include <sys/_types/_sa_family_t.h>

 
 /*
  * Identification of the network protocol stack
  * for *BSD-current/release: http://www.kame.net/dev/cvsweb.cgi/kame/COVERAGE
  * has the table of implementation/integration differences.
  */
 
 /*
  * Identification of the network protocol stack
  * for *BSD-current/release: http://www.kame.net/dev/cvsweb.cgi/kame/COVERAGE
  * has the table of implementation/integration differences.
  */

-#define __KAME__
-#define __KAME_VERSION         "2009/apple-darwin"
+#define        __KAME__
+#define        __KAME_VERSION          "2009/apple-darwin"

 
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 /*
 
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 /*


@@ -163,46 +157,46 @@ struct in6_addr {
        } __u6_addr;                    /* 128-bit IP6 address */
 };
 
        } __u6_addr;                    /* 128-bit IP6 address */
 };
 

-#define s6_addr   __u6_addr.__u6_addr8
-#ifdef KERNEL  /*XXX nonstandard*/
-#define s6_addr8  __u6_addr.__u6_addr8
-#define s6_addr16 __u6_addr.__u6_addr16
-#define s6_addr32 __u6_addr.__u6_addr32
+#define        s6_addr   __u6_addr.__u6_addr8
+#ifdef KERNEL  /* XXX nonstandard */
+#define        s6_addr8  __u6_addr.__u6_addr8
+#define        s6_addr16 __u6_addr.__u6_addr16
+#define        s6_addr32 __u6_addr.__u6_addr32

 #endif
 
 #endif
 

-#define INET6_ADDRSTRLEN       46
+#define        INET6_ADDRSTRLEN        46

 
 /*
  * Socket address for IPv6
  */
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 
 /*
  * Socket address for IPv6
  */
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)

-#define SIN6_LEN
+#define        SIN6_LEN

 #endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */
 struct sockaddr_in6 {
 #endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */
 struct sockaddr_in6 {

-       __uint8_t       sin6_len;       /* length of this struct(sa_family_t)*/
+       __uint8_t       sin6_len;       /* length of this struct(sa_family_t) */

        sa_family_t     sin6_family;    /* AF_INET6 (sa_family_t) */
        sa_family_t     sin6_family;    /* AF_INET6 (sa_family_t) */

-       in_port_t       sin6_port;      /* Transport layer port # (in_port_t)*/
+       in_port_t       sin6_port;      /* Transport layer port # (in_port_t) */

        __uint32_t      sin6_flowinfo;  /* IP6 flow information */
        struct in6_addr sin6_addr;      /* IP6 address */
        __uint32_t      sin6_scope_id;  /* scope zone index */
 };
 
        __uint32_t      sin6_flowinfo;  /* IP6 flow information */
        struct in6_addr sin6_addr;      /* IP6 address */
        __uint32_t      sin6_scope_id;  /* scope zone index */
 };
 

-#ifdef KERNEL  /*XXX nonstandard*/
+#ifdef KERNEL  /* XXX nonstandard */

 /*
  * Local definition for masks
  */
 /*
  * Local definition for masks
  */

-#define IN6MASK0       {{{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }}}
-#define IN6MASK7       {{{ 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+#define        IN6MASK0        {{{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }}}
+#define        IN6MASK7        {{{ 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \

                            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }}}
                            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }}}

-#define IN6MASK16      {{{ 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
+#define        IN6MASK16       {{{ 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \

                            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }}}
                            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }}}

-#define IN6MASK32      {{{ 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, \
+#define        IN6MASK32       {{{ 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, \

                            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }}}
                            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }}}

-#define IN6MASK64      {{{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, \
+#define        IN6MASK64       {{{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, \

                            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }}}
                            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }}}

-#define IN6MASK96      {{{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, \
+#define        IN6MASK96       {{{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, \

                            0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 }}}
                            0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 }}}

-#define IN6MASK128     {{{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, \
+#define        IN6MASK128      {{{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, \

                            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }}}
 #endif
 
                            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }}}
 #endif
 


@@ -216,59 +210,64 @@ extern const struct in6_addr in6mask32;
 extern const struct in6_addr in6mask64;
 extern const struct in6_addr in6mask96;
 extern const struct in6_addr in6mask128;
 extern const struct in6_addr in6mask64;
 extern const struct in6_addr in6mask96;
 extern const struct in6_addr in6mask128;

+
+#define        SIN6(s)         ((struct sockaddr_in6 *)(void *)s)
+#define        satosin6(sa)    SIN6(sa)
+#define        sin6tosa(sin6)  ((struct sockaddr *)(void *)(sin6))
+#define        SIN6IFSCOPE(s)  SIN6(s)

 #endif /* KERNEL_PRIVATE */
 
 #endif /* KERNEL_PRIVATE */
 

-#ifdef KERNEL  /*XXX nonstandard*/
+#ifdef KERNEL  /* XXX nonstandard */

 /*
  * Macros started with IPV6_ADDR is KAME local
  */
 #if BYTE_ORDER == BIG_ENDIAN
 /*
  * Macros started with IPV6_ADDR is KAME local
  */
 #if BYTE_ORDER == BIG_ENDIAN

-#define IPV6_ADDR_INT32_ONE    1
-#define IPV6_ADDR_INT32_TWO    2
-#define IPV6_ADDR_INT32_MNL    0xff010000
-#define IPV6_ADDR_INT32_MLL    0xff020000
-#define IPV6_ADDR_INT32_SMP    0x0000ffff
-#define IPV6_ADDR_INT16_ULL    0xfe80
-#define IPV6_ADDR_INT16_USL    0xfec0
-#define IPV6_ADDR_INT16_MLL    0xff02
+#define        IPV6_ADDR_INT32_ONE     1
+#define        IPV6_ADDR_INT32_TWO     2
+#define        IPV6_ADDR_INT32_MNL     0xff010000
+#define        IPV6_ADDR_INT32_MLL     0xff020000
+#define        IPV6_ADDR_INT32_SMP     0x0000ffff
+#define        IPV6_ADDR_INT16_ULL     0xfe80
+#define        IPV6_ADDR_INT16_USL     0xfec0
+#define        IPV6_ADDR_INT16_MLL     0xff02

 #elif BYTE_ORDER == LITTLE_ENDIAN
 #elif BYTE_ORDER == LITTLE_ENDIAN

-#define IPV6_ADDR_INT32_ONE    0x01000000
-#define IPV6_ADDR_INT32_TWO    0x02000000
-#define IPV6_ADDR_INT32_MNL    0x000001ff
-#define IPV6_ADDR_INT32_MLL    0x000002ff
-#define IPV6_ADDR_INT32_SMP    0xffff0000
-#define IPV6_ADDR_INT16_ULL    0x80fe
-#define IPV6_ADDR_INT16_USL    0xc0fe
-#define IPV6_ADDR_INT16_MLL    0x02ff
+#define        IPV6_ADDR_INT32_ONE     0x01000000
+#define        IPV6_ADDR_INT32_TWO     0x02000000
+#define        IPV6_ADDR_INT32_MNL     0x000001ff
+#define        IPV6_ADDR_INT32_MLL     0x000002ff
+#define        IPV6_ADDR_INT32_SMP     0xffff0000
+#define        IPV6_ADDR_INT16_ULL     0x80fe
+#define        IPV6_ADDR_INT16_USL     0xc0fe
+#define        IPV6_ADDR_INT16_MLL     0x02ff

 #endif
 #endif
 
 /*
  * Definition of some useful macros to handle IP6 addresses
  */
 #endif
 #endif
 
 /*
  * Definition of some useful macros to handle IP6 addresses
  */

-#define IN6ADDR_ANY_INIT \
+#define        IN6ADDR_ANY_INIT \

        {{{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }}}
        {{{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }}}

-#define IN6ADDR_LOOPBACK_INIT \
+#define        IN6ADDR_LOOPBACK_INIT \

        {{{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }}}
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
        {{{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }}}
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)

-#define IN6ADDR_NODELOCAL_ALLNODES_INIT \
+#define        IN6ADDR_NODELOCAL_ALLNODES_INIT \

        {{{ 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }}}
        {{{ 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }}}

-#define IN6ADDR_INTFACELOCAL_ALLNODES_INIT \
+#define        IN6ADDR_INTFACELOCAL_ALLNODES_INIT \

        {{{ 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }}}
        {{{ 0xff, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }}}

-#define IN6ADDR_LINKLOCAL_ALLNODES_INIT \
+#define        IN6ADDR_LINKLOCAL_ALLNODES_INIT \

        {{{ 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }}}
        {{{ 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 }}}

-#define IN6ADDR_LINKLOCAL_ALLROUTERS_INIT \
+#define        IN6ADDR_LINKLOCAL_ALLROUTERS_INIT \

        {{{ 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02 }}}
        {{{ 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02 }}}

-#define IN6ADDR_LINKLOCAL_ALLV2ROUTERS_INIT \
+#define        IN6ADDR_LINKLOCAL_ALLV2ROUTERS_INIT \

        {{{ 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16 }}}
        {{{ 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16 }}}

-#define IN6ADDR_V4MAPPED_INIT \
+#define        IN6ADDR_V4MAPPED_INIT \

        {{{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
            0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 }}}
 #endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */
        {{{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, \
            0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00 }}}
 #endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */


@@ -289,58 +288,61 @@ extern const struct in6_addr in6addr_linklocal_allv2routers;
  * in ANSI standard.
  */
 #ifdef KERNEL
  * in ANSI standard.
  */
 #ifdef KERNEL

-#define IN6_ARE_ADDR_EQUAL(a, b)                       \
-    (bcmp(&(a)->s6_addr[0], &(b)->s6_addr[0], sizeof(struct in6_addr)) == 0)
+#define        IN6_ARE_ADDR_EQUAL(a, b) \
+       (bcmp(&(a)->s6_addr[0], &(b)->s6_addr[0], \
+       sizeof (struct in6_addr)) == 0)

 #else
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 #else
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)

-#define IN6_ARE_ADDR_EQUAL(a, b)                       \
-    (memcmp(&(a)->s6_addr[0], &(b)->s6_addr[0], sizeof(struct in6_addr)) == 0)
+#define        IN6_ARE_ADDR_EQUAL(a, b) \
+       (memcmp(&(a)->s6_addr[0], &(b)->s6_addr[0], sizeof (struct in6_addr)) \
+       == 0)

 #endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */
 #endif
 
 #ifdef KERNEL                  /* non standard */
 /* see if two addresses are equal in a scope-conscious manner. */
 #endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */
 #endif
 
 #ifdef KERNEL                  /* non standard */
 /* see if two addresses are equal in a scope-conscious manner. */

-#define SA6_ARE_ADDR_EQUAL(a, b) \
+#define        SA6_ARE_ADDR_EQUAL(a, b) \

        (((a)->sin6_scope_id == 0 || (b)->sin6_scope_id == 0 || \
        (((a)->sin6_scope_id == 0 || (b)->sin6_scope_id == 0 || \

-         ((a)->sin6_scope_id == (b)->sin6_scope_id)) && \
-        (bcmp(&(a)->sin6_addr, &(b)->sin6_addr, sizeof(struct in6_addr)) == 0))
+       ((a)->sin6_scope_id == (b)->sin6_scope_id)) && \
+       (bcmp(&(a)->sin6_addr, &(b)->sin6_addr, sizeof (struct in6_addr)) == 0))

 #endif
 
 /*
  * Unspecified
  */
 #endif
 
 /*
  * Unspecified
  */

-#define IN6_IS_ADDR_UNSPECIFIED(a)     \
+#define        IN6_IS_ADDR_UNSPECIFIED(a)      \

        ((*(const __uint32_t *)(const void *)(&(a)->s6_addr[0]) == 0) && \
        ((*(const __uint32_t *)(const void *)(&(a)->s6_addr[0]) == 0) && \

-        (*(const __uint32_t *)(const void *)(&(a)->s6_addr[4]) == 0) && \
-        (*(const __uint32_t *)(const void *)(&(a)->s6_addr[8]) == 0) && \
-        (*(const __uint32_t *)(const void *)(&(a)->s6_addr[12]) == 0))
+       (*(const __uint32_t *)(const void *)(&(a)->s6_addr[4]) == 0) && \
+       (*(const __uint32_t *)(const void *)(&(a)->s6_addr[8]) == 0) && \
+       (*(const __uint32_t *)(const void *)(&(a)->s6_addr[12]) == 0))

 
 /*
  * Loopback
  */
 
 /*
  * Loopback
  */

-#define IN6_IS_ADDR_LOOPBACK(a)                \
+#define        IN6_IS_ADDR_LOOPBACK(a)         \

        ((*(const __uint32_t *)(const void *)(&(a)->s6_addr[0]) == 0) && \
        ((*(const __uint32_t *)(const void *)(&(a)->s6_addr[0]) == 0) && \

-        (*(const __uint32_t *)(const void *)(&(a)->s6_addr[4]) == 0) && \
-        (*(const __uint32_t *)(const void *)(&(a)->s6_addr[8]) == 0) && \
-        (*(const __uint32_t *)(const void *)(&(a)->s6_addr[12]) == ntohl(1)))
+       (*(const __uint32_t *)(const void *)(&(a)->s6_addr[4]) == 0) && \
+       (*(const __uint32_t *)(const void *)(&(a)->s6_addr[8]) == 0) && \
+       (*(const __uint32_t *)(const void *)(&(a)->s6_addr[12]) == ntohl(1)))

 
 /*
  * IPv4 compatible
  */
 
 /*
  * IPv4 compatible
  */

-#define IN6_IS_ADDR_V4COMPAT(a)                \
+#define        IN6_IS_ADDR_V4COMPAT(a)         \

        ((*(const __uint32_t *)(const void *)(&(a)->s6_addr[0]) == 0) && \
        ((*(const __uint32_t *)(const void *)(&(a)->s6_addr[0]) == 0) && \

-        (*(const __uint32_t *)(const void *)(&(a)->s6_addr[4]) == 0) && \
-        (*(const __uint32_t *)(const void *)(&(a)->s6_addr[8]) == 0) && \
-        (*(const __uint32_t *)(const void *)(&(a)->s6_addr[12]) != 0) && \
-        (*(const __uint32_t *)(const void *)(&(a)->s6_addr[12]) != ntohl(1)))
+       (*(const __uint32_t *)(const void *)(&(a)->s6_addr[4]) == 0) && \
+       (*(const __uint32_t *)(const void *)(&(a)->s6_addr[8]) == 0) && \
+       (*(const __uint32_t *)(const void *)(&(a)->s6_addr[12]) != 0) && \
+       (*(const __uint32_t *)(const void *)(&(a)->s6_addr[12]) != ntohl(1)))

 
 /*
  * Mapped
  */
 
 /*
  * Mapped
  */

-#define IN6_IS_ADDR_V4MAPPED(a)                      \
+#define        IN6_IS_ADDR_V4MAPPED(a)               \

        ((*(const __uint32_t *)(const void *)(&(a)->s6_addr[0]) == 0) && \
        ((*(const __uint32_t *)(const void *)(&(a)->s6_addr[0]) == 0) && \

-        (*(const __uint32_t *)(const void *)(&(a)->s6_addr[4]) == 0) && \
-        (*(const __uint32_t *)(const void *)(&(a)->s6_addr[8]) == ntohl(0x0000ffff)))
+       (*(const __uint32_t *)(const void *)(&(a)->s6_addr[4]) == 0) && \
+       (*(const __uint32_t *)(const void *)(&(a)->s6_addr[8]) == \
+       ntohl(0x0000ffff)))

 
 /*
  * 6to4
 
 /*
  * 6to4


@@ -351,125 +353,137 @@ extern const struct in6_addr in6addr_linklocal_allv2routers;
  * KAME Scope Values
  */
 
  * KAME Scope Values
  */
 

-#ifdef KERNEL  /*XXX nonstandard*/
-#define IPV6_ADDR_SCOPE_NODELOCAL      0x01
+#ifdef KERNEL  /* XXX nonstandard */
+#define        IPV6_ADDR_SCOPE_NODELOCAL       0x01

 #define        IPV6_ADDR_SCOPE_INTFACELOCAL    0x01
 #define        IPV6_ADDR_SCOPE_INTFACELOCAL    0x01

-#define IPV6_ADDR_SCOPE_LINKLOCAL      0x02
-#define IPV6_ADDR_SCOPE_SITELOCAL      0x05
-#define IPV6_ADDR_SCOPE_ORGLOCAL       0x08    /* just used in this file */
-#define IPV6_ADDR_SCOPE_GLOBAL         0x0e
+#define        IPV6_ADDR_SCOPE_LINKLOCAL       0x02
+#define        IPV6_ADDR_SCOPE_SITELOCAL       0x05
+#define        IPV6_ADDR_SCOPE_ORGLOCAL        0x08    /* just used in this file */
+#define        IPV6_ADDR_SCOPE_GLOBAL          0x0e

 #else
 #else

-#define __IPV6_ADDR_SCOPE_NODELOCAL    0x01
-#define __IPV6_ADDR_SCOPE_INTFACELOCAL 0x01
-#define __IPV6_ADDR_SCOPE_LINKLOCAL    0x02
-#define __IPV6_ADDR_SCOPE_SITELOCAL    0x05
-#define __IPV6_ADDR_SCOPE_ORGLOCAL     0x08    /* just used in this file */
-#define __IPV6_ADDR_SCOPE_GLOBAL       0x0e
+#define        __IPV6_ADDR_SCOPE_NODELOCAL     0x01
+#define        __IPV6_ADDR_SCOPE_INTFACELOCAL  0x01
+#define        __IPV6_ADDR_SCOPE_LINKLOCAL     0x02
+#define        __IPV6_ADDR_SCOPE_SITELOCAL     0x05
+#define        __IPV6_ADDR_SCOPE_ORGLOCAL      0x08    /* just used in this file */
+#define        __IPV6_ADDR_SCOPE_GLOBAL        0x0e

 #endif
 
 /*
  * Unicast Scope
  * Note that we must check topmost 10 bits only, not 16 bits (see RFC2373).
  */
 #endif
 
 /*
  * Unicast Scope
  * Note that we must check topmost 10 bits only, not 16 bits (see RFC2373).
  */

-#define IN6_IS_ADDR_LINKLOCAL(a)       \
+#define        IN6_IS_ADDR_LINKLOCAL(a)        \

        (((a)->s6_addr[0] == 0xfe) && (((a)->s6_addr[1] & 0xc0) == 0x80))
        (((a)->s6_addr[0] == 0xfe) && (((a)->s6_addr[1] & 0xc0) == 0x80))

-#define IN6_IS_ADDR_SITELOCAL(a)       \
+#define        IN6_IS_ADDR_SITELOCAL(a)        \

        (((a)->s6_addr[0] == 0xfe) && (((a)->s6_addr[1] & 0xc0) == 0xc0))
 
 /*
  * Multicast
  */
        (((a)->s6_addr[0] == 0xfe) && (((a)->s6_addr[1] & 0xc0) == 0xc0))
 
 /*
  * Multicast
  */

-#define IN6_IS_ADDR_MULTICAST(a)       ((a)->s6_addr[0] == 0xff)
+#define        IN6_IS_ADDR_MULTICAST(a)        ((a)->s6_addr[0] == 0xff)

 
 /*
  * Unique Local IPv6 Unicast Addresses (per RFC 4193)
  */
 
 /*
  * Unique Local IPv6 Unicast Addresses (per RFC 4193)
  */

-#define IN6_IS_ADDR_UNIQUE_LOCAL(a)    (((a)->s6_addr[0] == 0xfc) || ((a)->s6_addr[0] == 0xfd))
+#define        IN6_IS_ADDR_UNIQUE_LOCAL(a) \
+       (((a)->s6_addr[0] == 0xfc) || ((a)->s6_addr[0] == 0xfd))

 
 

-#ifdef KERNEL  /*XXX nonstandard*/
-#define IPV6_ADDR_MC_SCOPE(a)          ((a)->s6_addr[1] & 0x0f)
+#ifdef KERNEL  /* XXX nonstandard */
+#define        IPV6_ADDR_MC_SCOPE(a)           ((a)->s6_addr[1] & 0x0f)

 #else
 #else

-#define __IPV6_ADDR_MC_SCOPE(a)                ((a)->s6_addr[1] & 0x0f)
+#define        __IPV6_ADDR_MC_SCOPE(a)         ((a)->s6_addr[1] & 0x0f)

 #endif
 
 /*
  * Multicast Scope
  */
 #endif
 
 /*
  * Multicast Scope
  */

-#ifdef KERNEL  /*refers nonstandard items */
-#define IN6_IS_ADDR_MC_NODELOCAL(a)    \
+#ifdef KERNEL  /* refers nonstandard items */
+#define        IN6_IS_ADDR_MC_NODELOCAL(a)     \

        (IN6_IS_ADDR_MULTICAST(a) &&    \
        (IN6_IS_ADDR_MULTICAST(a) &&    \

-        (IPV6_ADDR_MC_SCOPE(a) == IPV6_ADDR_SCOPE_NODELOCAL))
+       (IPV6_ADDR_MC_SCOPE(a) == IPV6_ADDR_SCOPE_NODELOCAL))

 #define        IN6_IS_ADDR_MC_INTFACELOCAL(a)  \
        (IN6_IS_ADDR_MULTICAST(a) &&    \
        (IPV6_ADDR_MC_SCOPE(a) == IPV6_ADDR_SCOPE_INTFACELOCAL))
 #define        IN6_IS_ADDR_MC_INTFACELOCAL(a)  \
        (IN6_IS_ADDR_MULTICAST(a) &&    \
        (IPV6_ADDR_MC_SCOPE(a) == IPV6_ADDR_SCOPE_INTFACELOCAL))

-#define IN6_IS_ADDR_MC_LINKLOCAL(a)    \
+#define        IN6_IS_ADDR_MC_LINKLOCAL(a)     \

        (IN6_IS_ADDR_MULTICAST(a) &&    \
        (IN6_IS_ADDR_MULTICAST(a) &&    \

-        (IPV6_ADDR_MC_SCOPE(a) == IPV6_ADDR_SCOPE_LINKLOCAL))
-#define IN6_IS_ADDR_MC_SITELOCAL(a)    \
+       (IPV6_ADDR_MC_SCOPE(a) == IPV6_ADDR_SCOPE_LINKLOCAL))
+#define        IN6_IS_ADDR_MC_SITELOCAL(a)     \

        (IN6_IS_ADDR_MULTICAST(a) &&    \
        (IN6_IS_ADDR_MULTICAST(a) &&    \

-        (IPV6_ADDR_MC_SCOPE(a) == IPV6_ADDR_SCOPE_SITELOCAL))
-#define IN6_IS_ADDR_MC_ORGLOCAL(a)     \
+       (IPV6_ADDR_MC_SCOPE(a) == IPV6_ADDR_SCOPE_SITELOCAL))
+#define        IN6_IS_ADDR_MC_ORGLOCAL(a)      \

        (IN6_IS_ADDR_MULTICAST(a) &&    \
        (IN6_IS_ADDR_MULTICAST(a) &&    \

-        (IPV6_ADDR_MC_SCOPE(a) == IPV6_ADDR_SCOPE_ORGLOCAL))
-#define IN6_IS_ADDR_MC_GLOBAL(a)       \
+       (IPV6_ADDR_MC_SCOPE(a) == IPV6_ADDR_SCOPE_ORGLOCAL))
+#define        IN6_IS_ADDR_MC_GLOBAL(a)        \

        (IN6_IS_ADDR_MULTICAST(a) &&    \
        (IN6_IS_ADDR_MULTICAST(a) &&    \

-        (IPV6_ADDR_MC_SCOPE(a) == IPV6_ADDR_SCOPE_GLOBAL))
+       (IPV6_ADDR_MC_SCOPE(a) == IPV6_ADDR_SCOPE_GLOBAL))

 #else
 #else

-#define IN6_IS_ADDR_MC_NODELOCAL(a)    \
+#define        IN6_IS_ADDR_MC_NODELOCAL(a)     \

        (IN6_IS_ADDR_MULTICAST(a) &&    \
        (IN6_IS_ADDR_MULTICAST(a) &&    \

-        (__IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_NODELOCAL))
-#define IN6_IS_ADDR_MC_LINKLOCAL(a)    \
+       (__IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_NODELOCAL))
+#define        IN6_IS_ADDR_MC_LINKLOCAL(a)     \

        (IN6_IS_ADDR_MULTICAST(a) &&    \
        (IN6_IS_ADDR_MULTICAST(a) &&    \

-        (__IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_LINKLOCAL))
-#define IN6_IS_ADDR_MC_SITELOCAL(a)    \
+       (__IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_LINKLOCAL))
+#define        IN6_IS_ADDR_MC_SITELOCAL(a)     \

        (IN6_IS_ADDR_MULTICAST(a) &&    \
        (IN6_IS_ADDR_MULTICAST(a) &&    \

-        (__IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_SITELOCAL))
-#define IN6_IS_ADDR_MC_ORGLOCAL(a)     \
+       (__IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_SITELOCAL))
+#define        IN6_IS_ADDR_MC_ORGLOCAL(a)      \

        (IN6_IS_ADDR_MULTICAST(a) &&    \
        (IN6_IS_ADDR_MULTICAST(a) &&    \

-        (__IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_ORGLOCAL))
-#define IN6_IS_ADDR_MC_GLOBAL(a)       \
+       (__IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_ORGLOCAL))
+#define        IN6_IS_ADDR_MC_GLOBAL(a)        \

        (IN6_IS_ADDR_MULTICAST(a) &&    \
        (IN6_IS_ADDR_MULTICAST(a) &&    \

-        (__IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_GLOBAL))
+       (__IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_GLOBAL))

 #endif
 
 #endif
 

-#ifdef KERNEL  /*nonstandard*/
+#ifdef KERNEL  /* nonstandard */

 /*
  * KAME Scope
  */
 /*
  * KAME Scope
  */

-#define IN6_IS_SCOPE_LINKLOCAL(a)      \
+#define        IN6_IS_SCOPE_LINKLOCAL(a)       \

        ((IN6_IS_ADDR_LINKLOCAL(a)) ||  \
        ((IN6_IS_ADDR_LINKLOCAL(a)) ||  \

-        (IN6_IS_ADDR_MC_LINKLOCAL(a)))
+       (IN6_IS_ADDR_MC_LINKLOCAL(a)))

 
 

-#define IN6_IS_SCOPE_EMBED(a)                  \
+#define        IN6_IS_SCOPE_EMBED(a)                   \

        ((IN6_IS_ADDR_LINKLOCAL(a)) ||          \
        (IN6_IS_ADDR_MC_LINKLOCAL(a)) ||        \
        (IN6_IS_ADDR_MC_INTFACELOCAL(a)))
 
        ((IN6_IS_ADDR_LINKLOCAL(a)) ||          \
        (IN6_IS_ADDR_MC_LINKLOCAL(a)) ||        \
        (IN6_IS_ADDR_MC_INTFACELOCAL(a)))
 

-#define IFA6_IS_DEPRECATED(a) \
-       ((a)->ia6_lifetime.ia6t_preferred != 0 && \
-        (a)->ia6_lifetime.ia6t_preferred < timenow.tv_sec)
-#define IFA6_IS_INVALID(a) \
-       ((a)->ia6_lifetime.ia6t_expire != 0 && \
-        (a)->ia6_lifetime.ia6t_expire < timenow.tv_sec)
+#define        IFA6_IS_DEPRECATED(a, t) \
+       ((a)->ia6_lifetime.ia6ti_preferred != 0 && \
+       (a)->ia6_lifetime.ia6ti_preferred < (t))
+#define        IFA6_IS_INVALID(a, t) \
+       ((a)->ia6_lifetime.ia6ti_expire != 0 && \
+       (a)->ia6_lifetime.ia6ti_expire < (t))

 #endif /* KERNEL */
 
 #endif /* KERNEL */
 

+#ifdef PRIVATE
+struct route_in6_old {
+       void            *ro_rt;
+       uint32_t        ro_flags;
+       struct sockaddr_in6 ro_dst;
+};
+#endif /* PRIVATE */
+
+#ifdef BSD_KERNEL_PRIVATE

 /*
  * IP6 route structure
 /*
  * IP6 route structure

+ *
+ * A route consists of a destination address and a reference
+ * to a routing entry.  These are often held by protocols
+ * in their control blocks, e.g. inpcb.

  */
  */

-#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
-#ifdef PRIVATE

 struct route_in6 {
        /*
 struct route_in6 {
        /*

-        * N.B: struct route_in6 must begin with ro_rt and ro_flags
+        * N.B: struct route_in6 must begin with ro_{rt,srcia,flags}

         * because the code does some casts of a 'struct route_in6 *'
         * to a 'struct route *'.
         */
        struct rtentry  *ro_rt;
         * because the code does some casts of a 'struct route_in6 *'
         * to a 'struct route *'.
         */
        struct rtentry  *ro_rt;

-       __uint32_t      ro_flags;       /* route flags */
+       struct ifaddr   *ro_srcia;
+       uint32_t        ro_flags;       /* route flags */

        struct sockaddr_in6 ro_dst;
 };
        struct sockaddr_in6 ro_dst;
 };

-#endif /* PRIVATE */
-#endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */
+#endif /* BSD_KERNEL_PRIVATE */

 
 /*
  * Options for use with [gs]etsockopt at the IPV6 level.
 
 /*
  * Options for use with [gs]etsockopt at the IPV6 level.


@@ -478,7 +492,7 @@ struct route_in6 {
 /* no hdrincl */
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 /*
 /* no hdrincl */
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 /*

- * RFC 3542 define the following socket options in a manner incompatible 
+ * RFC 3542 define the following socket options in a manner incompatible

  * with RFC 2292:
  *   IPV6_PKTINFO
  *   IPV6_HOPLIMIT
  * with RFC 2292:
  *   IPV6_PKTINFO
  *   IPV6_HOPLIMIT


@@ -486,152 +500,161 @@ struct route_in6 {
  *   IPV6_HOPOPTS
  *   IPV6_DSTOPTS
  *   IPV6_RTHDR
  *   IPV6_HOPOPTS
  *   IPV6_DSTOPTS
  *   IPV6_RTHDR

- * 
+ *

  * To use the new IPv6 Sockets options introduced by RFC 3542
  * To use the new IPv6 Sockets options introduced by RFC 3542

- * the constant __APPLE_USE_RFC_3542 must be defined before 
+ * the constant __APPLE_USE_RFC_3542 must be defined before

  * including <netinet/in.h>
  *
  * To use the old IPv6 Sockets options from RFC 2292
  * the constant __APPLE_USE_RFC_2292 must be defined before
  * including <netinet/in.h>
  *
  * including <netinet/in.h>
  *
  * To use the old IPv6 Sockets options from RFC 2292
  * the constant __APPLE_USE_RFC_2292 must be defined before
  * including <netinet/in.h>
  *

- * Note that eventually RFC 3542 is going to be the 
+ * Note that eventually RFC 3542 is going to be the

  * default and RFC 2292 will be obsolete.
  */
  * default and RFC 2292 will be obsolete.
  */

-#ifdef XNU_KERNEL_PRIVATE
-#define __APPLE_USE_RFC_3542 1
-#endif /* XNU_KERNEL_PRIVATE */
+#ifdef BSD_KERNEL_PRIVATE
+#define        __APPLE_USE_RFC_3542 1
+#endif /* BSD_KERNEL_PRIVATE */

 
 #if defined(__APPLE_USE_RFC_3542) && defined(__APPLE_USE_RFC_2292)
 #error "__APPLE_USE_RFC_3542 and __APPLE_USE_RFC_2292 cannot be both defined"
 #endif
 
 #if 0 /* the followings are relic in IPv4 and hence are disabled */
 
 #if defined(__APPLE_USE_RFC_3542) && defined(__APPLE_USE_RFC_2292)
 #error "__APPLE_USE_RFC_3542 and __APPLE_USE_RFC_2292 cannot be both defined"
 #endif
 
 #if 0 /* the followings are relic in IPv4 and hence are disabled */

-#define IPV6_OPTIONS           1  /* buf/ip6_opts; set/get IP6 options */
-#define IPV6_RECVOPTS          5  /* bool; receive all IP6 opts w/dgram */
-#define IPV6_RECVRETOPTS       6  /* bool; receive IP6 opts for response */
-#define IPV6_RECVDSTADDR       7  /* bool; receive IP6 dst addr w/dgram */
-#define IPV6_RETOPTS           8  /* ip6_opts; set/get IP6 options */
+#define        IPV6_OPTIONS            1  /* buf/ip6_opts; set/get IP6 options */
+#define        IPV6_RECVOPTS           5  /* bool; receive all IP6 opts w/dgram */
+#define        IPV6_RECVRETOPTS        6  /* bool; receive IP6 opts for response */
+#define        IPV6_RECVDSTADDR        7  /* bool; receive IP6 dst addr w/dgram */
+#define        IPV6_RETOPTS            8  /* ip6_opts; set/get IP6 options */

 #endif /* 0 */
 #endif /* 0 */

-#define IPV6_SOCKOPT_RESERVED1 3  /* reserved for future use */
+#define        IPV6_SOCKOPT_RESERVED1  3  /* reserved for future use */

 #endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */
 #endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */

-#define IPV6_UNICAST_HOPS      4  /* int; IP6 hops */
-#define IPV6_MULTICAST_IF      9  /* __uint8_t; set/get IP6 multicast i/f  */
-#define IPV6_MULTICAST_HOPS    10 /* __uint8_t; set/get IP6 multicast hops */
-#define IPV6_MULTICAST_LOOP    11 /* __uint8_t; set/get IP6 mcast loopback */
-#define IPV6_JOIN_GROUP                12 /* ip6_mreq; join a group membership */
-#define IPV6_LEAVE_GROUP       13 /* ip6_mreq; leave a group membership */
+#define        IPV6_UNICAST_HOPS       4  /* int; IP6 hops */
+#define        IPV6_MULTICAST_IF       9  /* __uint8_t; set/get IP6 multicast i/f  */
+#define        IPV6_MULTICAST_HOPS     10 /* __uint8_t; set/get IP6 multicast hops */
+#define        IPV6_MULTICAST_LOOP     11 /* __uint8_t; set/get IP6 mcast loopback */
+#define        IPV6_JOIN_GROUP         12 /* ip6_mreq; join a group membership */
+#define        IPV6_LEAVE_GROUP        13 /* ip6_mreq; leave a group membership */

 
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)

-#define IPV6_PORTRANGE         14 /* int; range to choose for unspec port */
-#define ICMP6_FILTER           18 /* icmp6_filter; icmp6 filter */
-#define IPV6_2292PKTINFO       19 /* bool; send/recv if, src/dst addr */
-#define IPV6_2292HOPLIMIT      20 /* bool; hop limit */
-#define IPV6_2292NEXTHOP       21 /* bool; next hop addr */
-#define IPV6_2292HOPOPTS       22 /* bool; hop-by-hop option */
-#define IPV6_2292DSTOPTS       23 /* bool; destinaion option */
-#define IPV6_2292RTHDR         24 /* ip6_rthdr: routing header */
-#define IPV6_2292PKTOPTIONS    25 /* buf/cmsghdr; set/get IPv6 options */
-                                  /* obsoleted by RFC3542 */
+#define        IPV6_PORTRANGE          14 /* int; range to choose for unspec port */
+#define        ICMP6_FILTER            18 /* icmp6_filter; icmp6 filter */
+#define        IPV6_2292PKTINFO        19 /* bool; send/recv if, src/dst addr */
+#define        IPV6_2292HOPLIMIT       20 /* bool; hop limit */
+#define        IPV6_2292NEXTHOP        21 /* bool; next hop addr */
+#define        IPV6_2292HOPOPTS        22 /* bool; hop-by-hop option */
+#define        IPV6_2292DSTOPTS        23 /* bool; destinaion option */
+#define        IPV6_2292RTHDR          24 /* ip6_rthdr: routing header */
+
+/* buf/cmsghdr; set/get IPv6 options [obsoleted by RFC3542] */
+#define        IPV6_2292PKTOPTIONS     25

 
 #ifdef __APPLE_USE_RFC_2292
 
 #ifdef __APPLE_USE_RFC_2292

-#define IPV6_PKTINFO        IPV6_2292PKTINFO
-#define IPV6_HOPLIMIT       IPV6_2292HOPLIMIT
-#define IPV6_NEXTHOP        IPV6_2292NEXTHOP
-#define IPV6_HOPOPTS        IPV6_2292HOPOPTS
-#define IPV6_DSTOPTS        IPV6_2292DSTOPTS
-#define IPV6_RTHDR          IPV6_2292RTHDR
-#define IPV6_PKTOPTIONS     IPV6_2292PKTOPTIONS
+#define        IPV6_PKTINFO    IPV6_2292PKTINFO
+#define        IPV6_HOPLIMIT   IPV6_2292HOPLIMIT
+#define        IPV6_NEXTHOP    IPV6_2292NEXTHOP
+#define        IPV6_HOPOPTS    IPV6_2292HOPOPTS
+#define        IPV6_DSTOPTS    IPV6_2292DSTOPTS
+#define        IPV6_RTHDR      IPV6_2292RTHDR
+#define        IPV6_PKTOPTIONS IPV6_2292PKTOPTIONS

 #endif /* __APPLE_USE_RFC_2292 */
 
 #endif /* __APPLE_USE_RFC_2292 */
 

-#define IPV6_CHECKSUM          26 /* int; checksum offset for raw socket */
+#define        IPV6_CHECKSUM           26 /* int; checksum offset for raw socket */

 #endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */
 #endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */

-#define IPV6_V6ONLY            27 /* bool; only bind INET6 at wildcard bind */
+#define        IPV6_V6ONLY             27 /* bool; only bind INET6 at wildcard bind */

 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 #ifndef KERNEL
 #if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
 #ifndef KERNEL

-#define IPV6_BINDV6ONLY                IPV6_V6ONLY
+#define        IPV6_BINDV6ONLY         IPV6_V6ONLY

 #endif /* KERNEL */
 
 
 #endif /* KERNEL */
 
 

-#if 1 /*IPSEC*/
-#define IPV6_IPSEC_POLICY      28 /* struct; get/set security policy */
+#if 1 /* IPSEC */
+#define        IPV6_IPSEC_POLICY       28 /* struct; get/set security policy */

 #endif /* 1 */
 #endif /* 1 */

-#define IPV6_FAITH             29 /* bool; accept FAITH'ed connections */
-
-#if 1 /*IPV6FIREWALL*/
-#define IPV6_FW_ADD            30 /* add a firewall rule to chain */
-#define IPV6_FW_DEL            31 /* delete a firewall rule from chain */
-#define IPV6_FW_FLUSH          32 /* flush firewall rule chain */
-#define IPV6_FW_ZERO           33 /* clear single/all firewall counter(s) */
-#define IPV6_FW_GET            34 /* get entire firewall rule chain */
+#define        IPV6_FAITH              29 /* deprecated */
+
+#if 1 /* IPV6FIREWALL */
+#define        IPV6_FW_ADD             30 /* add a firewall rule to chain */
+#define        IPV6_FW_DEL             31 /* delete a firewall rule from chain */
+#define        IPV6_FW_FLUSH           32 /* flush firewall rule chain */
+#define        IPV6_FW_ZERO            33 /* clear single/all firewall counter(s) */
+#define        IPV6_FW_GET             34 /* get entire firewall rule chain */

 #endif /* 1 */
 
 #endif /* 1 */
 

-/* APPLE: NOTE the value of those 2 options is kept unchanged from 
- *       previous version of darwin/OS X for binary compatibility reasons
- *       and differ from FreeBSD (values 57 and 61). See below.
+/*
+ * APPLE: NOTE the value of those 2 options is kept unchanged from
+ *   previous version of darwin/OS X for binary compatibility reasons
+ *   and differ from FreeBSD (values 57 and 61). See below.

  */
  */

-#define IPV6_RECVTCLASS                35 /* bool; recv traffic class values */
-#define IPV6_TCLASS            36 /* int; send traffic class value */
+#define        IPV6_RECVTCLASS         35 /* bool; recv traffic class values */
+#define        IPV6_TCLASS             36 /* int; send traffic class value */

 
 #ifdef __APPLE_USE_RFC_3542
 /* new socket options introduced in RFC3542 */
 
 #ifdef __APPLE_USE_RFC_3542
 /* new socket options introduced in RFC3542 */

-#define IPV6_RTHDRDSTOPTS      57 /* ip6_dest; send dst option before rthdr
-                                   * APPLE: Value purposely different than FreeBSD (35) to avoid
-                                   * collision with definition of IPV6_RECVTCLASS in previous
-                                   * darwin implementations */
-
-#define IPV6_RECVPKTINFO       61 /* bool; recv if, dst addr 
-                                   * APPLE: Value purposely different than FreeBSD (36) to avoid
-                                   * collision with definition of IPV6_TCLASS in previous
-                                   * darwin implementations */
-
-#define IPV6_RECVHOPLIMIT      37 /* bool; recv hop limit */
-#define IPV6_RECVRTHDR         38 /* bool; recv routing header */
-#define IPV6_RECVHOPOPTS       39 /* bool; recv hop-by-hop option */
-#define IPV6_RECVDSTOPTS       40 /* bool; recv dst option after rthdr */
+/*
+ * ip6_dest; send dst option before rthdr
+ * APPLE: Value purposely different than FreeBSD (35) to avoid
+ * collision with definition of IPV6_RECVTCLASS in previous
+ * darwin implementations
+ */
+#define        IPV6_RTHDRDSTOPTS       57
+
+/*
+ * bool; recv if, dst addr
+ * APPLE: Value purposely different than FreeBSD(36) to avoid
+ * collision with definition of IPV6_TCLASS in previous
+ * darwin implementations
+ */
+#define        IPV6_RECVPKTINFO        61
+
+#define        IPV6_RECVHOPLIMIT       37 /* bool; recv hop limit */
+#define        IPV6_RECVRTHDR          38 /* bool; recv routing header */
+#define        IPV6_RECVHOPOPTS        39 /* bool; recv hop-by-hop option */
+#define        IPV6_RECVDSTOPTS        40 /* bool; recv dst option after rthdr */

 #ifdef KERNEL
 #ifdef KERNEL

-#define IPV6_RECVRTHDRDSTOPTS  41 /* bool; recv dst option before rthdr */
+#define        IPV6_RECVRTHDRDSTOPTS   41 /* bool; recv dst option before rthdr */

 #endif
 
 #endif
 

-#define IPV6_USE_MIN_MTU       42 /* bool; send packets at the minimum MTU */
-#define IPV6_RECVPATHMTU       43 /* bool; notify an according MTU */
+#define        IPV6_USE_MIN_MTU        42 /* bool; send packets at the minimum MTU */
+#define        IPV6_RECVPATHMTU        43 /* bool; notify an according MTU */

 
 

-#define IPV6_PATHMTU           44 /* mtuinfo; get the current path MTU (sopt),
-                                     4 bytes int; MTU notification (cmsg) */
-#if 0 /*obsoleted during 2292bis -> 3542*/
-#define IPV6_REACHCONF         45 /* no data; ND reachability confirm
-                                     (cmsg only/not in of RFC3542) */
+/*
+ * mtuinfo; get the current path MTU (sopt), 4 bytes int;
+ * MTU notification (cmsg)
+ */
+#define        IPV6_PATHMTU            44
+
+#if 0 /* obsoleted during 2292bis -> 3542 */
+/* no data; ND reachability confirm (cmsg only/not in of RFC3542) */
+#define        IPV6_REACHCONF          45

 #endif
 /* more new socket options introduced in RFC3542 */
 #endif
 /* more new socket options introduced in RFC3542 */

-#define IPV6_3542PKTINFO       46 /* in6_pktinfo; send if, src addr */
-#define IPV6_3542HOPLIMIT      47 /* int; send hop limit */
-#define IPV6_3542NEXTHOP       48 /* sockaddr; next hop addr */
-#define IPV6_3542HOPOPTS       49 /* ip6_hbh; send hop-by-hop option */
-#define IPV6_3542DSTOPTS       50 /* ip6_dest; send dst option befor rthdr */
-#define IPV6_3542RTHDR         51 /* ip6_rthdr; send routing header */
+#define        IPV6_3542PKTINFO        46 /* in6_pktinfo; send if, src addr */
+#define        IPV6_3542HOPLIMIT       47 /* int; send hop limit */
+#define        IPV6_3542NEXTHOP        48 /* sockaddr; next hop addr */
+#define        IPV6_3542HOPOPTS        49 /* ip6_hbh; send hop-by-hop option */
+#define        IPV6_3542DSTOPTS        50 /* ip6_dest; send dst option befor rthdr */
+#define        IPV6_3542RTHDR          51 /* ip6_rthdr; send routing header */

 
 

-#define IPV6_PKTINFO        IPV6_3542PKTINFO
-#define IPV6_HOPLIMIT       IPV6_3542HOPLIMIT
-#define IPV6_NEXTHOP        IPV6_3542NEXTHOP
-#define IPV6_HOPOPTS        IPV6_3542HOPOPTS
-#define IPV6_DSTOPTS        IPV6_3542DSTOPTS
-#define IPV6_RTHDR          IPV6_3542RTHDR
+#define        IPV6_PKTINFO    IPV6_3542PKTINFO
+#define        IPV6_HOPLIMIT   IPV6_3542HOPLIMIT
+#define        IPV6_NEXTHOP    IPV6_3542NEXTHOP
+#define        IPV6_HOPOPTS    IPV6_3542HOPOPTS
+#define        IPV6_DSTOPTS    IPV6_3542DSTOPTS
+#define        IPV6_RTHDR      IPV6_3542RTHDR

 
 

-#define IPV6_AUTOFLOWLABEL     59 /* bool; attach flowlabel automagically */
+#define        IPV6_AUTOFLOWLABEL      59 /* bool; attach flowlabel automagically */

 
 

-#define IPV6_DONTFRAG          62 /* bool; disable IPv6 fragmentation */
+#define        IPV6_DONTFRAG           62 /* bool; disable IPv6 fragmentation */

 
 

-#define IPV6_PREFER_TEMPADDR   63 /* int; prefer temporary addresses as
-                                   * the source address.
-                                   */
+/* int; prefer temporary addresses as the source address. */
+#define        IPV6_PREFER_TEMPADDR    63

 
 /*
  * The following option is private; do not use it from user applications.
  * It is deliberately defined to the same value as IP_MSFILTER.
  */
 
 /*
  * The following option is private; do not use it from user applications.
  * It is deliberately defined to the same value as IP_MSFILTER.
  */

-#define        IPV6_MSFILTER           74 /* struct __msfilterreq;
-                                   * set/get multicast source filter list.
-                                   */
+#define        IPV6_MSFILTER           74 /* struct __msfilterreq; */

 #endif /* __APPLE_USE_RFC_3542 */
 
 #define        IPV6_BOUND_IF           125 /* int; set/get bound interface */
 #endif /* __APPLE_USE_RFC_3542 */
 
 #define        IPV6_BOUND_IF           125 /* int; set/get bound interface */


@@ -643,15 +666,15 @@ struct route_in6 {
 
 /* to define items, should talk with KAME guys first, for *BSD compatibility */
 
 
 /* to define items, should talk with KAME guys first, for *BSD compatibility */
 

-#define IPV6_RTHDR_LOOSE     0 /* this hop need not be a neighbor. XXX old spec */
-#define IPV6_RTHDR_STRICT    1 /* this hop must be a neighbor. XXX old spec */
-#define IPV6_RTHDR_TYPE_0    0 /* IPv6 routing header type 0 */
+#define        IPV6_RTHDR_LOOSE        0 /* this hop need not be a neighbor. */
+#define        IPV6_RTHDR_STRICT       1 /* this hop must be a neighbor. */
+#define        IPV6_RTHDR_TYPE_0       0 /* IPv6 routing header type 0 */

 
 /*
  * Defaults and limits for options
  */
 
 /*
  * Defaults and limits for options
  */

-#define IPV6_DEFAULT_MULTICAST_HOPS 1  /* normally limit m'casts to 1 hop  */
-#define IPV6_DEFAULT_MULTICAST_LOOP 1  /* normally hear sends if a member  */
+#define        IPV6_DEFAULT_MULTICAST_HOPS 1   /* normally limit m'casts to 1 hop  */
+#define        IPV6_DEFAULT_MULTICAST_LOOP 1   /* normally hear sends if a member  */

 
 /*
  * The im6o_membership vector for each socket is now dynamically allocated at
 
 /*
  * The im6o_membership vector for each socket is now dynamically allocated at


@@ -706,67 +729,67 @@ struct ip6_mtuinfo {
  * Third level is protocol number.
  * Fourth level is desired variable within that protocol.
  */
  * Third level is protocol number.
  * Fourth level is desired variable within that protocol.
  */

-#define IPV6PROTO_MAXID        (IPPROTO_PIM + 1)       /* don't list to IPV6PROTO_MAX */
+#define        IPV6PROTO_MAXID (IPPROTO_PIM + 1)  /* don't list to IPV6PROTO_MAX */

 
 /*
  * Names for IP sysctl objects
  */
 
 /*
  * Names for IP sysctl objects
  */

-#define IPV6CTL_FORWARDING     1       /* act as router */
-#define IPV6CTL_SENDREDIRECTS  2       /* may send redirects when forwarding*/
-#define IPV6CTL_DEFHLIM                3       /* default Hop-Limit */
+#define        IPV6CTL_FORWARDING      1       /* act as router */
+#define        IPV6CTL_SENDREDIRECTS   2       /* may send redirects when forwarding */
+#define        IPV6CTL_DEFHLIM         3       /* default Hop-Limit */

 #ifdef notyet
 #ifdef notyet

-#define IPV6CTL_DEFMTU         4       /* default MTU */
+#define        IPV6CTL_DEFMTU          4       /* default MTU */

 #endif
 #endif

-#define IPV6CTL_FORWSRCRT      5       /* forward source-routed dgrams */
-#define IPV6CTL_STATS          6       /* stats */
-#define IPV6CTL_MRTSTATS       7       /* multicast forwarding stats */
-#define IPV6CTL_MRTPROTO       8       /* multicast routing protocol */
-#define IPV6CTL_MAXFRAGPACKETS 9       /* max packets reassembly queue */
-#define IPV6CTL_SOURCECHECK    10      /* verify source route and intf */
-#define IPV6CTL_SOURCECHECK_LOGINT 11  /* minimume logging interval */
-#define IPV6CTL_ACCEPT_RTADV   12
-#define IPV6CTL_KEEPFAITH      13
-#define IPV6CTL_LOG_INTERVAL   14
-#define IPV6CTL_HDRNESTLIMIT   15
-#define IPV6CTL_DAD_COUNT      16
-#define IPV6CTL_AUTO_FLOWLABEL 17
-#define IPV6CTL_DEFMCASTHLIM   18
-#define IPV6CTL_GIF_HLIM       19      /* default HLIM for gif encap packet */
-#define IPV6CTL_KAME_VERSION   20
-#define IPV6CTL_USE_DEPRECATED 21      /* use deprecated addr (RFC2462 5.5.4) */
-#define IPV6CTL_RR_PRUNE       22      /* walk timer for router renumbering */
-#if 0  /*obsolete*/
-#define IPV6CTL_MAPPED_ADDR    23
+#define        IPV6CTL_FORWSRCRT       5       /* forward source-routed dgrams */
+#define        IPV6CTL_STATS           6       /* stats */
+#define        IPV6CTL_MRTSTATS        7       /* multicast forwarding stats */
+#define        IPV6CTL_MRTPROTO        8       /* multicast routing protocol */
+#define        IPV6CTL_MAXFRAGPACKETS  9       /* max packets reassembly queue */
+#define        IPV6CTL_SOURCECHECK     10      /* verify source route and intf */
+#define        IPV6CTL_SOURCECHECK_LOGINT 11   /* minimume logging interval */
+#define        IPV6CTL_ACCEPT_RTADV    12
+#define        IPV6CTL_KEEPFAITH       13      /* deprecated */
+#define        IPV6CTL_LOG_INTERVAL    14
+#define        IPV6CTL_HDRNESTLIMIT    15
+#define        IPV6CTL_DAD_COUNT       16
+#define        IPV6CTL_AUTO_FLOWLABEL  17
+#define        IPV6CTL_DEFMCASTHLIM    18
+#define        IPV6CTL_GIF_HLIM        19      /* default HLIM for gif encap packet */
+#define        IPV6CTL_KAME_VERSION    20
+#define        IPV6CTL_USE_DEPRECATED  21      /* use deprec addr (RFC2462 5.5.4) */
+#define        IPV6CTL_RR_PRUNE        22      /* walk timer for router renumbering */
+#if 0  /* obsolete */
+#define        IPV6CTL_MAPPED_ADDR     23

 #endif
 #endif

-#define IPV6CTL_V6ONLY         24
-#define IPV6CTL_RTEXPIRE       25      /* cloned route expiration time */
-#define IPV6CTL_RTMINEXPIRE    26      /* min value for expiration time */
-#define IPV6CTL_RTMAXCACHE     27      /* trigger level for dynamic expire */
-
-#define IPV6CTL_USETEMPADDR    32      /* use temporary addresses [RFC 4941] */
-#define IPV6CTL_TEMPPLTIME     33      /* preferred lifetime for tmpaddrs */
-#define IPV6CTL_TEMPVLTIME     34      /* valid lifetime for tmpaddrs */
-#define IPV6CTL_AUTO_LINKLOCAL 35      /* automatic link-local addr assign */
-#define IPV6CTL_RIP6STATS      36      /* raw_ip6 stats */
-#define IPV6CTL_PREFER_TEMPADDR        37      /* prefer temporary addr as src */
-#define IPV6CTL_ADDRCTLPOLICY  38      /* get/set address selection policy */
-#define IPV6CTL_USE_DEFAULTZONE        39      /* use default scope zone */
-
-#define IPV6CTL_MAXFRAGS       41      /* max fragments */
-#define IPV6CTL_MCAST_PMTU     44      /* enable pMTU discovery for multicast? */
-
-#define IPV6CTL_NEIGHBORGCTHRESH 46
-#define IPV6CTL_MAXIFPREFIXES  47
-#define IPV6CTL_MAXIFDEFROUTERS 48
-#define IPV6CTL_MAXDYNROUTES   49
+#define        IPV6CTL_V6ONLY          24
+#define        IPV6CTL_RTEXPIRE        25      /* cloned route expiration time */
+#define        IPV6CTL_RTMINEXPIRE     26      /* min value for expiration time */
+#define        IPV6CTL_RTMAXCACHE      27      /* trigger level for dynamic expire */
+
+#define        IPV6CTL_USETEMPADDR     32      /* use temporary addresses [RFC 4941] */
+#define        IPV6CTL_TEMPPLTIME      33      /* preferred lifetime for tmpaddrs */
+#define        IPV6CTL_TEMPVLTIME      34      /* valid lifetime for tmpaddrs */
+#define        IPV6CTL_AUTO_LINKLOCAL  35      /* automatic link-local addr assign */
+#define        IPV6CTL_RIP6STATS       36      /* raw_ip6 stats */
+#define        IPV6CTL_PREFER_TEMPADDR 37      /* prefer temporary addr as src */
+#define        IPV6CTL_ADDRCTLPOLICY   38      /* get/set address selection policy */
+#define        IPV6CTL_USE_DEFAULTZONE 39      /* use default scope zone */
+
+#define        IPV6CTL_MAXFRAGS        41      /* max fragments */
+#define        IPV6CTL_MCAST_PMTU      44      /* enable pMTU discovery for mcast? */
+
+#define        IPV6CTL_NEIGHBORGCTHRESH 46
+#define        IPV6CTL_MAXIFPREFIXES   47
+#define        IPV6CTL_MAXIFDEFROUTERS 48
+#define        IPV6CTL_MAXDYNROUTES    49

 #define        ICMPV6CTL_ND6_ONLINKNSRFC4861   50
 
 /* New entries should be added here from current IPV6CTL_MAXID value. */
 /* to define items, should talk with KAME guys first, for *BSD compatibility */
 #define        ICMPV6CTL_ND6_ONLINKNSRFC4861   50
 
 /* New entries should be added here from current IPV6CTL_MAXID value. */
 /* to define items, should talk with KAME guys first, for *BSD compatibility */

-#define IPV6CTL_MAXID          51
+#define        IPV6CTL_MAXID           51

 
 

-#ifdef KERNEL_PRIVATE
-#define CTL_IPV6PROTO_NAMES { \
+#ifdef BSD_KERNEL_PRIVATE
+#define        CTL_IPV6PROTO_NAMES { \

        { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \
        { 0, 0 }, \
        { "tcp6", CTLTYPE_NODE }, \
        { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, { 0, 0 }, \
        { 0, 0 }, \
        { "tcp6", CTLTYPE_NODE }, \


@@ -810,7 +833,7 @@ struct ip6_mtuinfo {
        { 0, 0 }, \
        { 0, 0 }, \
        { 0, 0 }, \
        { 0, 0 }, \
        { 0, 0 }, \
        { 0, 0 }, \

-       { "pim6", CTLTYPE_NODE }, \
+       { 0, 0 }, \

 }
 /*
  * Redefinition of mbuf flags
 }
 /*
  * Redefinition of mbuf flags


@@ -824,16 +847,17 @@ struct mbuf;
 struct ifnet;
 struct in6_aliasreq;
 
 struct ifnet;
 struct in6_aliasreq;
 

-#define        in6_cksum(m, n, o, l)   inet6_cksum(m, n, o, l)
+extern uint16_t in6_pseudo(const struct in6_addr *, const struct in6_addr *,
+    uint32_t);
+extern u_int16_t inet6_cksum(struct mbuf *, uint32_t, uint32_t, uint32_t);

 
 

-extern u_int16_t inet6_cksum(struct mbuf *m, unsigned int proto,
-    unsigned int offset, unsigned int transport_len);
+#define        in6_cksum(_m, _n, _o, _l)               \
+       inet6_cksum(_m, _n, _o, _l)

 
 

-extern int in6_localaddr(struct in6_addr *);

 extern int in6_addrscope(struct in6_addr *);
 extern struct in6_ifaddr *in6_ifawithscope(struct ifnet *, struct in6_addr *);
 extern struct in6_ifaddr *in6_ifawithifp(struct ifnet *, struct in6_addr *);
 extern int in6_addrscope(struct in6_addr *);
 extern struct in6_ifaddr *in6_ifawithscope(struct ifnet *, struct in6_addr *);
 extern struct in6_ifaddr *in6_ifawithifp(struct ifnet *, struct in6_addr *);

-extern int in6_if_up(struct ifnet *, struct in6_aliasreq *);
+

 struct sockaddr;
 
 extern void in6_sin6_2_sin(struct sockaddr_in *sin, struct sockaddr_in6 *sin6);
 struct sockaddr;
 
 extern void in6_sin6_2_sin(struct sockaddr_in *sin, struct sockaddr_in6 *sin6);


@@ -841,65 +865,20 @@ extern void in6_sin_2_v4mapsin6(struct sockaddr_in *sin,
     struct sockaddr_in6 *sin6);
 extern void in6_sin6_2_sin_in_sock(struct sockaddr *nam);
 extern int in6_sin_2_v4mapsin6_in_sock(struct sockaddr **nam);
     struct sockaddr_in6 *sin6);
 extern void in6_sin6_2_sin_in_sock(struct sockaddr *nam);
 extern int in6_sin_2_v4mapsin6_in_sock(struct sockaddr **nam);

-extern void in6_delayed_cksum(struct mbuf *, u_int16_t);

 
 

-#define        satosin6(sa)    ((struct sockaddr_in6 *)(sa))
-#define        sin6tosa(sin6)  ((struct sockaddr *)(sin6))
-#define        ifatoia6(ifa)   ((struct in6_ifaddr *)(ifa))
+extern uint32_t in6_finalize_cksum(struct mbuf *, uint32_t, int32_t,
+    int32_t, uint32_t);

 
 

-extern int in6addr_local(struct in6_addr *);
+#define        in6_delayed_cksum(_m)                   \
+       ((void) in6_finalize_cksum(_m, 0, 0, -1, CSUM_DELAY_IPV6_DATA))
+#define        in6_delayed_cksum_offset(_m, _o, _s, _p)        \
+       ((void) in6_finalize_cksum(_m, _o, _s, _p, CSUM_DELAY_IPV6_DATA))
+#endif /* BSD_KERNEL_PRIVATE */

 
 

-#define DEBUG_HWCKSUM 1 /* IPv6 Hardware checksum on/off */
-/*
- * in6_cksum_phdr:
- *
- *     Compute significant parts of the IPv6 checksum pseudo-header
- *     for use in a delayed TCP/UDP checksum calculation.
- *
- *     Args:
- *
- *             src             Source IPv6 address
- *             dst             Destination IPv6 address
- *             len             htonl(proto-hdr-len)
- *             nxt             htonl(next-proto-number)
- *
- *     NOTE: We expect the src and dst addresses to be 16-bit
- *     aligned!
- */
-static __inline u_int16_t __unused
-in6_cksum_phdr(const struct in6_addr *src, const struct in6_addr *dst,
-    u_int32_t len, u_int32_t nxt)
-{
-       u_int32_t sum = 0;
-       const u_int16_t *w;
-
-       /*LINTED*/
-       w = (const u_int16_t *) src;
-       sum += w[0];
-       if (!IN6_IS_SCOPE_LINKLOCAL(src))
-               sum += w[1];
-       sum += w[2]; sum += w[3]; sum += w[4]; sum += w[5];
-       sum += w[6]; sum += w[7];
-
-       /*LINTED*/
-       w = (const u_int16_t *) dst;
-       sum += w[0];
-       if (!IN6_IS_SCOPE_LINKLOCAL(dst))
-               sum += w[1];
-       sum += w[2]; sum += w[3]; sum += w[4]; sum += w[5];
-       sum += w[6]; sum += w[7];
-
-       sum += (u_int16_t)(len >> 16) + (u_int16_t)(len /*& 0xffff*/);
-
-       sum += (u_int16_t)(nxt >> 16) + (u_int16_t)(nxt /*& 0xffff*/);
-
-       sum = (u_int16_t)(sum >> 16) + (u_int16_t)(sum /*& 0xffff*/);
-
-       if (sum > 0xffff)
-               sum -= 0xffff;
-
-       return (sum);
-}
+#ifdef KERNEL_PRIVATE
+/* exporte for ApplicationFirewall */
+extern int in6_localaddr(struct in6_addr *);
+extern int in6addr_local(struct in6_addr *);

 #endif /* KERNEL_PRIVATE */
 
 #ifndef KERNEL
 #endif /* KERNEL_PRIVATE */
 
 #ifndef KERNEL


@@ -908,8 +887,7 @@ struct cmsghdr;
 
 extern int inet6_option_space(int);
 extern int inet6_option_init(void *, struct cmsghdr **, int);
 
 extern int inet6_option_space(int);
 extern int inet6_option_init(void *, struct cmsghdr **, int);

-extern int inet6_option_append(struct cmsghdr *, const __uint8_t *,
-       int, int);
+extern int inet6_option_append(struct cmsghdr *, const __uint8_t *, int, int);

 extern __uint8_t *inet6_option_alloc(struct cmsghdr *, int, int, int);
 extern int inet6_option_next(const struct cmsghdr *, __uint8_t **);
 extern int inet6_option_find(const struct cmsghdr *, __uint8_t **, int);
 extern __uint8_t *inet6_option_alloc(struct cmsghdr *, int, int, int);
 extern int inet6_option_next(const struct cmsghdr *, __uint8_t **);
 extern int inet6_option_find(const struct cmsghdr *, __uint8_t **, int);


@@ -917,7 +895,7 @@ extern int inet6_option_find(const struct cmsghdr *, __uint8_t **, int);
 extern size_t inet6_rthdr_space(int, int);
 extern struct cmsghdr *inet6_rthdr_init(void *, int);
 extern int inet6_rthdr_add(struct cmsghdr *, const struct in6_addr *,
 extern size_t inet6_rthdr_space(int, int);
 extern struct cmsghdr *inet6_rthdr_init(void *, int);
 extern int inet6_rthdr_add(struct cmsghdr *, const struct in6_addr *,

-               unsigned int);
+    unsigned int);

 extern int inet6_rthdr_lasthop(struct cmsghdr *, unsigned int);
 #if 0 /* not implemented yet */
 extern int inet6_rthdr_reverse(const struct cmsghdr *, struct cmsghdr *);
 extern int inet6_rthdr_lasthop(struct cmsghdr *, unsigned int);
 #if 0 /* not implemented yet */
 extern int inet6_rthdr_reverse(const struct cmsghdr *, struct cmsghdr *);


@@ -927,15 +905,15 @@ extern struct in6_addr *inet6_rthdr_getaddr(struct cmsghdr *, int);
 extern int inet6_rthdr_getflags(const struct cmsghdr *, int);
 
 extern int inet6_opt_init(void *, socklen_t);
 extern int inet6_rthdr_getflags(const struct cmsghdr *, int);
 
 extern int inet6_opt_init(void *, socklen_t);

-extern int inet6_opt_append(void *, socklen_t, int, __uint8_t,
-                                socklen_t, __uint8_t, void **);
+extern int inet6_opt_append(void *, socklen_t, int, __uint8_t, socklen_t,
+    __uint8_t, void **);

 extern int inet6_opt_finish(void *, socklen_t, int);
 extern int inet6_opt_set_val(void *, int, void *, socklen_t);
 
 extern int inet6_opt_finish(void *, socklen_t, int);
 extern int inet6_opt_set_val(void *, int, void *, socklen_t);
 

-extern int inet6_opt_next(void *, socklen_t, int, __uint8_t *,
-                              socklen_t *, void **);
-extern int inet6_opt_find(void *, socklen_t, int, __uint8_t,
-                         socklen_t *, void **);
+extern int inet6_opt_next(void *, socklen_t, int, __uint8_t *, socklen_t *,
+    void **);
+extern int inet6_opt_find(void *, socklen_t, int, __uint8_t, socklen_t *,
+    void **);

 extern int inet6_opt_get_val(void *, int, void *, socklen_t);
 extern socklen_t inet6_rth_space(int, int);
 extern void *inet6_rth_init(void *, socklen_t, int, int);
 extern int inet6_opt_get_val(void *, int, void *, socklen_t);
 extern socklen_t inet6_rth_space(int, int);
 extern void *inet6_rth_init(void *, socklen_t, int, int);


@@ -944,6 +922,7 @@ extern int inet6_rth_reverse(const void *, void *);
 extern int inet6_rth_segments(const void *);
 extern struct in6_addr *inet6_rth_getaddr(const void *, int);
 extern void addrsel_policy_init(void);
 extern int inet6_rth_segments(const void *);
 extern struct in6_addr *inet6_rth_getaddr(const void *, int);
 extern void addrsel_policy_init(void);

+

 __END_DECLS
 #endif /* !KERNEL */
 #endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */
 __END_DECLS
 #endif /* !KERNEL */
 #endif /* (_POSIX_C_SOURCE && !_DARWIN_C_SOURCE) */