Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reduce diff with kame. whitespace only

This commit is contained in:
itojun 2001-10-16 04:17:54 +00:00
parent 3594efccf6
commit 9bff6fde4c
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sys/netinet6/in6.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: in6.h,v 1.28 2001/10/15 09:51:16 itojun Exp $ */ /* $NetBSD: in6.h,v 1.29 2001/10/16 04:17:54 itojun Exp $ */
/* $KAME: in6.h,v 1.83 2001/03/29 02:55:07 jinmei Exp $ */ /* $KAME: in6.h,v 1.83 2001/03/29 02:55:07 jinmei Exp $ */
/* /*
@ -126,7 +126,7 @@ struct in6_addr {
}; };
#define s6_addr __u6_addr.__u6_addr8 #define s6_addr __u6_addr.__u6_addr8
#ifdef _KERNEL /*XXX nonstandard*/ #ifdef _KERNEL /* XXX nonstandard */
#define s6_addr8 __u6_addr.__u6_addr8 #define s6_addr8 __u6_addr.__u6_addr8
#define s6_addr16 __u6_addr.__u6_addr16 #define s6_addr16 __u6_addr.__u6_addr16
#define s6_addr32 __u6_addr.__u6_addr32 #define s6_addr32 __u6_addr.__u6_addr32
@ -146,13 +146,13 @@ struct sockaddr_in6 {
u_int16_t sin6_port; /* Transport layer port # (in_port_t)*/ u_int16_t sin6_port; /* Transport layer port # (in_port_t)*/
u_int32_t sin6_flowinfo; /* IP6 flow information */ u_int32_t sin6_flowinfo; /* IP6 flow information */
struct in6_addr sin6_addr; /* IP6 address */ struct in6_addr sin6_addr; /* IP6 address */
u_int32_t sin6_scope_id; /* intface scope id */ u_int32_t sin6_scope_id; /* scope zone index */
}; };
/* /*
* Local definition for masks * Local definition for masks
*/ */
#ifdef _KERNEL /*XXX nonstandard*/ #ifdef _KERNEL /* XXX nonstandard */
#define IN6MASK0 {{{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }}} #define IN6MASK0 {{{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }}}
#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 }}}
@ -177,7 +177,7 @@ extern const struct in6_addr in6mask128;
/* /*
* Macros started with IPV6_ADDR is KAME local * Macros started with IPV6_ADDR is KAME local
*/ */
#ifdef _KERNEL /*XXX nonstandard*/ #ifdef _KERNEL /* XXX nonstandard */
#if BYTE_ORDER == BIG_ENDIAN #if BYTE_ORDER == BIG_ENDIAN
#define IPV6_ADDR_INT32_ONE 1 #define IPV6_ADDR_INT32_ONE 1
#define IPV6_ADDR_INT32_TWO 2 #define IPV6_ADDR_INT32_TWO 2
@ -278,7 +278,7 @@ extern const struct in6_addr in6addr_linklocal_allrouters;
* KAME Scope Values * KAME Scope Values
*/ */
#ifdef _KERNEL /*XXX nonstandard*/ #ifdef _KERNEL /* XXX nonstandard */
#define IPV6_ADDR_SCOPE_NODELOCAL 0x01 #define IPV6_ADDR_SCOPE_NODELOCAL 0x01
#define IPV6_ADDR_SCOPE_LINKLOCAL 0x02 #define IPV6_ADDR_SCOPE_LINKLOCAL 0x02
#define IPV6_ADDR_SCOPE_SITELOCAL 0x05 #define IPV6_ADDR_SCOPE_SITELOCAL 0x05
@ -306,7 +306,7 @@ extern const struct in6_addr in6addr_linklocal_allrouters;
*/ */
#define IN6_IS_ADDR_MULTICAST(a) ((a)->s6_addr[0] == 0xff) #define IN6_IS_ADDR_MULTICAST(a) ((a)->s6_addr[0] == 0xff)
#ifdef _KERNEL /*XXX nonstandard*/ #ifdef _KERNEL /* XXX nonstandard */
#define IPV6_ADDR_MC_SCOPE(a) ((a)->s6_addr[1] & 0x0f) #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)
@ -315,7 +315,7 @@ extern const struct in6_addr in6addr_linklocal_allrouters;
/* /*
* Multicast Scope * Multicast Scope
*/ */
#ifdef _KERNEL /*refers nonstandard items */ #ifdef _KERNEL /* refers nonstandard items */
#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)) (IPV6_ADDR_MC_SCOPE(a) == IPV6_ADDR_SCOPE_NODELOCAL))
@ -349,17 +349,10 @@ extern const struct in6_addr in6addr_linklocal_allrouters;
(__IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_GLOBAL)) (__IPV6_ADDR_MC_SCOPE(a) == __IPV6_ADDR_SCOPE_GLOBAL))
#endif #endif
/* #ifdef _KERNEL /* nonstandard */
* Wildcard Socket
*/
#if 0 /*pre-RFC2553*/
#define IN6_IS_ADDR_ANY(a) IN6_IS_ADDR_UNSPECIFIED(a)
#endif
/* /*
* KAME Scope * KAME Scope
*/ */
#ifdef _KERNEL /*nonstandard*/
#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)))