|
 |
00db10 |
commit cb43bb0d68f001fc3d6e054d712ab8794b5fd1de
|
|
|
00db10 |
Author: Cong Wang <xiyou.wangcong@gmail.com>
|
|
|
00db10 |
Date: Tue Jan 6 16:13:19 2015 -0800
|
|
|
00db10 |
|
|
|
00db10 |
in.h: Coordinate in6_pktinfo and ip6_mtuinfo for kernel and glibc [BZ #15850]
|
|
|
00db10 |
|
|
|
00db10 |
Similarly to what we did for in6_addr, we need a macro
|
|
|
00db10 |
to guard in6_pktinfo and ip6_mtuinfo too.
|
|
|
00db10 |
|
|
|
00db10 |
Cc: Carlos O'Donell <carlos@redhat.com>
|
|
|
00db10 |
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
|
|
|
00db10 |
|
|
|
00db10 |
diff --git a/inet/netinet/in.h b/inet/netinet/in.h
|
|
|
00db10 |
index bf3c8b1..f541c58 100644
|
|
|
00db10 |
--- a/inet/netinet/in.h
|
|
|
00db10 |
+++ b/inet/netinet/in.h
|
|
|
00db10 |
@@ -530,6 +530,7 @@ extern int bindresvport6 (int __sockfd, struct sockaddr_in6 *__sock_in)
|
|
|
00db10 |
#ifdef __USE_GNU
|
|
|
00db10 |
struct cmsghdr; /* Forward declaration. */
|
|
|
00db10 |
|
|
|
00db10 |
+#ifndef __USE_KERNEL_IPV6_DEFS
|
|
|
00db10 |
/* IPv6 packet information. */
|
|
|
00db10 |
struct in6_pktinfo
|
|
|
00db10 |
{
|
|
|
00db10 |
@@ -543,7 +544,7 @@ struct ip6_mtuinfo
|
|
|
00db10 |
struct sockaddr_in6 ip6m_addr; /* dst address including zone ID */
|
|
|
00db10 |
uint32_t ip6m_mtu; /* path MTU in host byte order */
|
|
|
00db10 |
};
|
|
|
00db10 |
-
|
|
|
00db10 |
+#endif /* !__USE_KERNEL_IPV6_DEFS */
|
|
|
00db10 |
|
|
|
00db10 |
/* Obsolete hop-by-hop and Destination Options Processing (RFC 2292). */
|
|
|
00db10 |
extern int inet6_option_space (int __nbytes)
|
|
|
00db10 |
diff --git a/sysdeps/unix/sysv/linux/bits/in.h b/sysdeps/unix/sysv/linux/bits/in.h
|
|
|
00db10 |
index b80a27f..b1d2cf6 100644
|
|
|
00db10 |
--- a/sysdeps/unix/sysv/linux/bits/in.h
|
|
|
00db10 |
+++ b/sysdeps/unix/sysv/linux/bits/in.h
|
|
|
00db10 |
@@ -23,10 +23,10 @@
|
|
|
00db10 |
|
|
|
00db10 |
/* If the application has already included linux/in6.h from a linux-based
|
|
|
00db10 |
kernel then we will not define the IPv6 IPPROTO_* defines, in6_addr (nor the
|
|
|
00db10 |
- defines), sockaddr_in6, or ipv6_mreq. The ABI used by the linux-kernel and
|
|
|
00db10 |
- glibc match exactly. Neither the linux kernel nor glibc should break this
|
|
|
00db10 |
- ABI without coordination. */
|
|
|
00db10 |
-#ifdef _UAPI_LINUX_IN6_H
|
|
|
00db10 |
+ defines), sockaddr_in6, or ipv6_mreq. Same for in6_ptkinfo or ip6_mtuinfo
|
|
|
00db10 |
+ in linux/ipv6.h. The ABI used by the linux-kernel and glibc match exactly.
|
|
|
00db10 |
+ Neither the linux kernel nor glibc should break this ABI without coordination. */
|
|
|
00db10 |
+#if defined _UAPI_LINUX_IN6_H || defined _UAPI_IPV6_H
|
|
|
00db10 |
/* This is not quite the same API since the kernel always defines s6_addr16 and
|
|
|
00db10 |
s6_addr32. This is not a violation of POSIX since POSIX says "at least the
|
|
|
00db10 |
following member" and that holds true. */
|