diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-17 15:36:55 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-17 15:36:55 -0700 |
| commit | 4b91ef834870748a8c201035a35f5996eff4ae00 (patch) | |
| tree | 94efe4c66943c355d35d567d0c9b23620171ca31 /libc | |
| parent | 5b67764a5ab31d1ec1e4a36d82b0001f3b5df519 (diff) | |
| parent | c52c174e412fa6c829cf6353ce8dbebdf710511f (diff) | |
| download | bionic-4b91ef834870748a8c201035a35f5996eff4ae00.zip bionic-4b91ef834870748a8c201035a35f5996eff4ae00.tar.gz bionic-4b91ef834870748a8c201035a35f5996eff4ae00.tar.bz2 | |
Merge change 4025
* changes:
Make IPv6 definitions comply with RFC 3493: - Add some definitions to netinet/in6.h - Include netinet/in6.h from netinet/in.h
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/include/arpa/inet.h | 1 | ||||
| -rw-r--r-- | libc/include/netinet/in.h | 4 | ||||
| -rw-r--r-- | libc/include/netinet/in6.h | 8 | ||||
| -rw-r--r-- | libc/netbsd/resolv/res_send.c | 1 |
4 files changed, 12 insertions, 2 deletions
diff --git a/libc/include/arpa/inet.h b/libc/include/arpa/inet.h index 3ebb872..e78e7c5 100644 --- a/libc/include/arpa/inet.h +++ b/libc/include/arpa/inet.h @@ -31,7 +31,6 @@ #include <stdint.h> #include <sys/types.h> #include <netinet/in.h> -#include <netinet/in6.h> __BEGIN_DECLS diff --git a/libc/include/netinet/in.h b/libc/include/netinet/in.h index 77ae506..0ebd926 100644 --- a/libc/include/netinet/in.h +++ b/libc/include/netinet/in.h @@ -32,6 +32,7 @@ #include <linux/socket.h> #include <linux/in.h> #include <linux/in6.h> +#include <netinet/in6.h> __BEGIN_DECLS @@ -39,6 +40,9 @@ __BEGIN_DECLS extern int bindresvport (int sd, struct sockaddr_in *sin); +static const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT; +static const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT; + __END_DECLS #endif /* _NETINET_IN_H_ */ diff --git a/libc/include/netinet/in6.h b/libc/include/netinet/in6.h index e645c48..2f5fee1 100644 --- a/libc/include/netinet/in6.h +++ b/libc/include/netinet/in6.h @@ -90,4 +90,12 @@ #define INET6_ADDRSTRLEN 46 +#define IPV6_JOIN_GROUP IPV6_ADD_MEMBERSHIP +#define IPV6_LEAVE_GROUP IPV6_DROP_MEMBERSHIP + +#define IN6ADDR_ANY_INIT {{{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}}} + +#define ipv6mr_interface ipv6mr_ifindex + + #endif /* _NETINET_IN6_H */ diff --git a/libc/netbsd/resolv/res_send.c b/libc/netbsd/resolv/res_send.c index 3aca760..696f8cf 100644 --- a/libc/netbsd/resolv/res_send.c +++ b/libc/netbsd/resolv/res_send.c @@ -95,7 +95,6 @@ __RCSID("$NetBSD: res_send.c,v 1.9 2006/01/24 17:41:25 christos Exp $"); #include <sys/uio.h> #include <netinet/in.h> -#include <netinet/in6.h> #include "arpa_nameser.h" #include <arpa/inet.h> |