2019-01-01 00:11:28 +00:00
|
|
|
/* Copyright (C) 1991-2019 Free Software Foundation, Inc.
|
1997-05-22 02:19:00 +00:00
|
|
|
This file is part of the GNU C Library.
|
|
|
|
|
1997-06-23 21:55:26 +00:00
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
2001-07-06 04:58:11 +00:00
|
|
|
modify it under the terms of the GNU Lesser General Public
|
|
|
|
License as published by the Free Software Foundation; either
|
|
|
|
version 2.1 of the License, or (at your option) any later version.
|
1997-05-22 02:19:00 +00:00
|
|
|
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
1997-06-23 21:55:26 +00:00
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
2001-07-06 04:58:11 +00:00
|
|
|
Lesser General Public License for more details.
|
1997-05-22 02:19:00 +00:00
|
|
|
|
2001-07-06 04:58:11 +00:00
|
|
|
You should have received a copy of the GNU Lesser General Public
|
2012-02-09 23:18:22 +00:00
|
|
|
License along with the GNU C Library; if not, see
|
Prefer https to http for gnu.org and fsf.org URLs
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
2019-09-07 05:40:42 +00:00
|
|
|
<https://www.gnu.org/licenses/>. */
|
1997-05-22 02:19:00 +00:00
|
|
|
|
|
|
|
#ifndef _NETINET_ICMP6_H
|
|
|
|
#define _NETINET_ICMP6_H 1
|
|
|
|
|
1997-07-28 22:35:20 +00:00
|
|
|
#include <inttypes.h>
|
|
|
|
#include <string.h>
|
1997-05-22 02:19:00 +00:00
|
|
|
#include <sys/types.h>
|
1997-05-29 12:06:58 +00:00
|
|
|
#include <netinet/in.h>
|
1997-05-22 02:19:00 +00:00
|
|
|
|
1998-11-16 18:44:53 +00:00
|
|
|
#define ICMP6_FILTER 1
|
1997-05-22 02:19:00 +00:00
|
|
|
|
1998-11-16 18:44:53 +00:00
|
|
|
#define ICMP6_FILTER_BLOCK 1
|
|
|
|
#define ICMP6_FILTER_PASS 2
|
|
|
|
#define ICMP6_FILTER_BLOCKOTHERS 3
|
|
|
|
#define ICMP6_FILTER_PASSONLY 4
|
1997-05-22 02:19:00 +00:00
|
|
|
|
1997-07-28 22:35:20 +00:00
|
|
|
struct icmp6_filter
|
1997-05-22 02:19:00 +00:00
|
|
|
{
|
2005-11-16 07:52:07 +00:00
|
|
|
uint32_t icmp6_filt[8];
|
1997-05-22 02:19:00 +00:00
|
|
|
};
|
|
|
|
|
2000-08-16 02:05:38 +00:00
|
|
|
struct icmp6_hdr
|
1997-05-22 02:19:00 +00:00
|
|
|
{
|
1997-07-28 22:35:20 +00:00
|
|
|
uint8_t icmp6_type; /* type field */
|
|
|
|
uint8_t icmp6_code; /* code field */
|
|
|
|
uint16_t icmp6_cksum; /* checksum field */
|
2000-08-16 02:05:38 +00:00
|
|
|
union
|
1997-05-22 02:19:00 +00:00
|
|
|
{
|
1997-07-28 22:35:20 +00:00
|
|
|
uint32_t icmp6_un_data32[1]; /* type-specific field */
|
|
|
|
uint16_t icmp6_un_data16[2]; /* type-specific field */
|
|
|
|
uint8_t icmp6_un_data8[4]; /* type-specific field */
|
|
|
|
} icmp6_dataun;
|
2000-08-16 02:05:38 +00:00
|
|
|
};
|
1997-07-28 22:35:20 +00:00
|
|
|
|
|
|
|
#define icmp6_data32 icmp6_dataun.icmp6_un_data32
|
|
|
|
#define icmp6_data16 icmp6_dataun.icmp6_un_data16
|
|
|
|
#define icmp6_data8 icmp6_dataun.icmp6_un_data8
|
|
|
|
#define icmp6_pptr icmp6_data32[0] /* parameter prob */
|
|
|
|
#define icmp6_mtu icmp6_data32[0] /* packet too big */
|
|
|
|
#define icmp6_id icmp6_data16[0] /* echo request/reply */
|
|
|
|
#define icmp6_seq icmp6_data16[1] /* echo request/reply */
|
|
|
|
#define icmp6_maxdelay icmp6_data16[0] /* mcast group membership */
|
|
|
|
|
|
|
|
#define ICMP6_DST_UNREACH 1
|
|
|
|
#define ICMP6_PACKET_TOO_BIG 2
|
|
|
|
#define ICMP6_TIME_EXCEEDED 3
|
|
|
|
#define ICMP6_PARAM_PROB 4
|
|
|
|
|
|
|
|
#define ICMP6_INFOMSG_MASK 0x80 /* all informational messages */
|
|
|
|
|
|
|
|
#define ICMP6_ECHO_REQUEST 128
|
|
|
|
#define ICMP6_ECHO_REPLY 129
|
2005-11-16 07:52:07 +00:00
|
|
|
#define MLD_LISTENER_QUERY 130
|
|
|
|
#define MLD_LISTENER_REPORT 131
|
|
|
|
#define MLD_LISTENER_REDUCTION 132
|
1997-07-28 22:35:20 +00:00
|
|
|
|
|
|
|
#define ICMP6_DST_UNREACH_NOROUTE 0 /* no route to destination */
|
|
|
|
#define ICMP6_DST_UNREACH_ADMIN 1 /* communication with destination */
|
|
|
|
/* administratively prohibited */
|
2005-11-16 07:52:07 +00:00
|
|
|
#define ICMP6_DST_UNREACH_BEYONDSCOPE 2 /* beyond scope of source address */
|
1997-07-28 22:35:20 +00:00
|
|
|
#define ICMP6_DST_UNREACH_ADDR 3 /* address unreachable */
|
|
|
|
#define ICMP6_DST_UNREACH_NOPORT 4 /* bad port */
|
|
|
|
|
|
|
|
#define ICMP6_TIME_EXCEED_TRANSIT 0 /* Hop Limit == 0 in transit */
|
|
|
|
#define ICMP6_TIME_EXCEED_REASSEMBLY 1 /* Reassembly time out */
|
|
|
|
|
|
|
|
#define ICMP6_PARAMPROB_HEADER 0 /* erroneous header field */
|
|
|
|
#define ICMP6_PARAMPROB_NEXTHEADER 1 /* unrecognized Next Header */
|
|
|
|
#define ICMP6_PARAMPROB_OPTION 2 /* unrecognized IPv6 option */
|
|
|
|
|
|
|
|
#define ICMP6_FILTER_WILLPASS(type, filterp) \
|
2005-11-16 07:52:07 +00:00
|
|
|
((((filterp)->icmp6_filt[(type) >> 5]) & (1 << ((type) & 31))) == 0)
|
1997-05-22 02:19:00 +00:00
|
|
|
|
1997-07-28 22:35:20 +00:00
|
|
|
#define ICMP6_FILTER_WILLBLOCK(type, filterp) \
|
2005-11-16 07:52:07 +00:00
|
|
|
((((filterp)->icmp6_filt[(type) >> 5]) & (1 << ((type) & 31))) != 0)
|
1997-05-22 02:19:00 +00:00
|
|
|
|
1997-07-28 22:35:20 +00:00
|
|
|
#define ICMP6_FILTER_SETPASS(type, filterp) \
|
2005-11-16 07:52:07 +00:00
|
|
|
((((filterp)->icmp6_filt[(type) >> 5]) &= ~(1 << ((type) & 31))))
|
1997-05-22 02:19:00 +00:00
|
|
|
|
1997-07-28 22:35:20 +00:00
|
|
|
#define ICMP6_FILTER_SETBLOCK(type, filterp) \
|
2005-11-16 07:52:07 +00:00
|
|
|
((((filterp)->icmp6_filt[(type) >> 5]) |= (1 << ((type) & 31))))
|
1997-05-22 02:19:00 +00:00
|
|
|
|
1997-07-28 22:35:20 +00:00
|
|
|
#define ICMP6_FILTER_SETPASSALL(filterp) \
|
|
|
|
memset (filterp, 0, sizeof (struct icmp6_filter));
|
1997-05-22 02:19:00 +00:00
|
|
|
|
1997-07-28 22:35:20 +00:00
|
|
|
#define ICMP6_FILTER_SETBLOCKALL(filterp) \
|
|
|
|
memset (filterp, 0xFF, sizeof (struct icmp6_filter));
|
1997-05-22 02:19:00 +00:00
|
|
|
|
1997-07-28 22:35:20 +00:00
|
|
|
#define ND_ROUTER_SOLICIT 133
|
|
|
|
#define ND_ROUTER_ADVERT 134
|
|
|
|
#define ND_NEIGHBOR_SOLICIT 135
|
|
|
|
#define ND_NEIGHBOR_ADVERT 136
|
|
|
|
#define ND_REDIRECT 137
|
1997-05-22 02:19:00 +00:00
|
|
|
|
1997-07-28 22:35:20 +00:00
|
|
|
struct nd_router_solicit /* router solicitation */
|
1997-05-22 02:19:00 +00:00
|
|
|
{
|
1997-07-28 22:35:20 +00:00
|
|
|
struct icmp6_hdr nd_rs_hdr;
|
|
|
|
/* could be followed by options */
|
1997-05-22 02:19:00 +00:00
|
|
|
};
|
|
|
|
|
1997-07-28 22:35:20 +00:00
|
|
|
#define nd_rs_type nd_rs_hdr.icmp6_type
|
|
|
|
#define nd_rs_code nd_rs_hdr.icmp6_code
|
|
|
|
#define nd_rs_cksum nd_rs_hdr.icmp6_cksum
|
|
|
|
#define nd_rs_reserved nd_rs_hdr.icmp6_data32[0]
|
|
|
|
|
|
|
|
struct nd_router_advert /* router advertisement */
|
1997-05-22 02:19:00 +00:00
|
|
|
{
|
1997-07-28 22:35:20 +00:00
|
|
|
struct icmp6_hdr nd_ra_hdr;
|
|
|
|
uint32_t nd_ra_reachable; /* reachable time */
|
|
|
|
uint32_t nd_ra_retransmit; /* retransmit timer */
|
|
|
|
/* could be followed by options */
|
1997-05-22 02:19:00 +00:00
|
|
|
};
|
|
|
|
|
1997-07-28 22:35:20 +00:00
|
|
|
#define nd_ra_type nd_ra_hdr.icmp6_type
|
|
|
|
#define nd_ra_code nd_ra_hdr.icmp6_code
|
|
|
|
#define nd_ra_cksum nd_ra_hdr.icmp6_cksum
|
|
|
|
#define nd_ra_curhoplimit nd_ra_hdr.icmp6_data8[0]
|
|
|
|
#define nd_ra_flags_reserved nd_ra_hdr.icmp6_data8[1]
|
|
|
|
#define ND_RA_FLAG_MANAGED 0x80
|
|
|
|
#define ND_RA_FLAG_OTHER 0x40
|
2000-08-16 02:05:38 +00:00
|
|
|
#define ND_RA_FLAG_HOME_AGENT 0x20
|
1997-07-28 22:35:20 +00:00
|
|
|
#define nd_ra_router_lifetime nd_ra_hdr.icmp6_data16[1]
|
1997-05-22 02:19:00 +00:00
|
|
|
|
1997-07-28 22:35:20 +00:00
|
|
|
struct nd_neighbor_solicit /* neighbor solicitation */
|
1997-05-22 02:19:00 +00:00
|
|
|
{
|
1997-07-28 22:35:20 +00:00
|
|
|
struct icmp6_hdr nd_ns_hdr;
|
|
|
|
struct in6_addr nd_ns_target; /* target address */
|
|
|
|
/* could be followed by options */
|
1997-05-22 02:19:00 +00:00
|
|
|
};
|
|
|
|
|
1997-07-28 22:35:20 +00:00
|
|
|
#define nd_ns_type nd_ns_hdr.icmp6_type
|
|
|
|
#define nd_ns_code nd_ns_hdr.icmp6_code
|
|
|
|
#define nd_ns_cksum nd_ns_hdr.icmp6_cksum
|
|
|
|
#define nd_ns_reserved nd_ns_hdr.icmp6_data32[0]
|
1997-05-22 02:19:00 +00:00
|
|
|
|
1997-07-28 22:35:20 +00:00
|
|
|
struct nd_neighbor_advert /* neighbor advertisement */
|
1997-05-22 02:19:00 +00:00
|
|
|
{
|
1997-07-28 22:35:20 +00:00
|
|
|
struct icmp6_hdr nd_na_hdr;
|
|
|
|
struct in6_addr nd_na_target; /* target address */
|
|
|
|
/* could be followed by options */
|
1997-05-22 02:19:00 +00:00
|
|
|
};
|
|
|
|
|
1997-07-28 22:35:20 +00:00
|
|
|
#define nd_na_type nd_na_hdr.icmp6_type
|
|
|
|
#define nd_na_code nd_na_hdr.icmp6_code
|
|
|
|
#define nd_na_cksum nd_na_hdr.icmp6_cksum
|
|
|
|
#define nd_na_flags_reserved nd_na_hdr.icmp6_data32[0]
|
Installed-header hygiene (BZ#20366): Simple self-contained fixes.
Some headers did not include all of their prerequisite headers.
* rpcsvc/nislib.h: Include rpcsvc/nis.h.
* sysdeps/unix/sysv/linux/netrose/rose.h:
Include sys/socket.h and netax25/ax25.h.
<endian.h> only defines BYTE_ORDER, BIG_ENDIAN, LITTLE_ENDIAN,
etc. under __USE_MISC; glibc's headers should use __BYTE_ORDER,
__BIG_ENDIAN, __LITTLE_ENDIAN, etc. instead.
* inet/netinet/icmp6.h, inet/netinet/ip6.h
* resolv/arpa/nameser_compat.h:
Use __BYTE_ORDER etc. instead of BYTE_ORDER etc.
sys/types.h only conditionally defines caddr_t and clockid_t.
* sysdeps/unix/sysv/linux/sys/quota.h:
Use __caddr_t instead of caddr_t.
* sysdeps/unix/sysv/linux/sys/timerfd.h:
Use __clockid_t instead of clockid_t.
Remove a #warning that was the sole actual problem with using sys/ipc.h
without _GNU_SOURCE/_XOPEN_SOURCE.
* sysvipc/sys/ipc.h: Remove unnecessary #warning.
_LIBC, __USE_XOPEN2K8, and __STDC_VERSION__ are not always defined.
It seems to me that _LIBC should not appear in installed headers, but
avoiding that for argp specifically would require more surgery than
feels appropriate for this patch set. It's possible that
"#ifdef _LIBC" would be sufficient, but I wanted to be conservative.
All three versions of bits/socket.h want to know whether __flexarr
will produce a real flexible array member -- specifically, one that
doesn't alter sizeof(the structure containing it). They were testing
for this with a complicated #if condition that did not agree with
sys/cdefs.h and that tripped -Wundef warnings under -std=c90.
I added a new macro to sys/cdefs.h, __glibc_c99_flexarr_available,
which reveals exactly what these headers want to know. I also took
the opportunity to flatten the rather messy conditional nest defining
__flexarr.
* argp/argp.h: Check whether _LIBC is defined before expanding it.
* posix/glob.h: Check whether __USE_XOPEN2K8 is defined instead
of expanding it.
* misc/sys/cdefs.h: Tidy up conditional nest defining __flexarr.
Define __glibc_c99_flexarr_available to 1 when the compiler
supports C99-compatible flexible array members, 0 otherwise.
* sysdeps/unix/sysv/linux/bits/socket.h
* sysdeps/mach/hurd/bits/socket.h
* bits/socket.h: Use __glibc_c99_flexarr_available in
definitions of struct cmsghdr and CMSG_DATA.
2016-08-22 12:06:30 +00:00
|
|
|
#if __BYTE_ORDER == __BIG_ENDIAN
|
1997-07-28 22:35:20 +00:00
|
|
|
#define ND_NA_FLAG_ROUTER 0x80000000
|
|
|
|
#define ND_NA_FLAG_SOLICITED 0x40000000
|
|
|
|
#define ND_NA_FLAG_OVERRIDE 0x20000000
|
Installed-header hygiene (BZ#20366): Simple self-contained fixes.
Some headers did not include all of their prerequisite headers.
* rpcsvc/nislib.h: Include rpcsvc/nis.h.
* sysdeps/unix/sysv/linux/netrose/rose.h:
Include sys/socket.h and netax25/ax25.h.
<endian.h> only defines BYTE_ORDER, BIG_ENDIAN, LITTLE_ENDIAN,
etc. under __USE_MISC; glibc's headers should use __BYTE_ORDER,
__BIG_ENDIAN, __LITTLE_ENDIAN, etc. instead.
* inet/netinet/icmp6.h, inet/netinet/ip6.h
* resolv/arpa/nameser_compat.h:
Use __BYTE_ORDER etc. instead of BYTE_ORDER etc.
sys/types.h only conditionally defines caddr_t and clockid_t.
* sysdeps/unix/sysv/linux/sys/quota.h:
Use __caddr_t instead of caddr_t.
* sysdeps/unix/sysv/linux/sys/timerfd.h:
Use __clockid_t instead of clockid_t.
Remove a #warning that was the sole actual problem with using sys/ipc.h
without _GNU_SOURCE/_XOPEN_SOURCE.
* sysvipc/sys/ipc.h: Remove unnecessary #warning.
_LIBC, __USE_XOPEN2K8, and __STDC_VERSION__ are not always defined.
It seems to me that _LIBC should not appear in installed headers, but
avoiding that for argp specifically would require more surgery than
feels appropriate for this patch set. It's possible that
"#ifdef _LIBC" would be sufficient, but I wanted to be conservative.
All three versions of bits/socket.h want to know whether __flexarr
will produce a real flexible array member -- specifically, one that
doesn't alter sizeof(the structure containing it). They were testing
for this with a complicated #if condition that did not agree with
sys/cdefs.h and that tripped -Wundef warnings under -std=c90.
I added a new macro to sys/cdefs.h, __glibc_c99_flexarr_available,
which reveals exactly what these headers want to know. I also took
the opportunity to flatten the rather messy conditional nest defining
__flexarr.
* argp/argp.h: Check whether _LIBC is defined before expanding it.
* posix/glob.h: Check whether __USE_XOPEN2K8 is defined instead
of expanding it.
* misc/sys/cdefs.h: Tidy up conditional nest defining __flexarr.
Define __glibc_c99_flexarr_available to 1 when the compiler
supports C99-compatible flexible array members, 0 otherwise.
* sysdeps/unix/sysv/linux/bits/socket.h
* sysdeps/mach/hurd/bits/socket.h
* bits/socket.h: Use __glibc_c99_flexarr_available in
definitions of struct cmsghdr and CMSG_DATA.
2016-08-22 12:06:30 +00:00
|
|
|
#else /* __BYTE_ORDER == __LITTLE_ENDIAN */
|
1997-07-28 22:35:20 +00:00
|
|
|
#define ND_NA_FLAG_ROUTER 0x00000080
|
|
|
|
#define ND_NA_FLAG_SOLICITED 0x00000040
|
|
|
|
#define ND_NA_FLAG_OVERRIDE 0x00000020
|
|
|
|
#endif
|
|
|
|
|
|
|
|
struct nd_redirect /* redirect */
|
1997-05-22 02:19:00 +00:00
|
|
|
{
|
1997-07-28 22:35:20 +00:00
|
|
|
struct icmp6_hdr nd_rd_hdr;
|
|
|
|
struct in6_addr nd_rd_target; /* target address */
|
|
|
|
struct in6_addr nd_rd_dst; /* destination address */
|
|
|
|
/* could be followed by options */
|
1997-05-22 02:19:00 +00:00
|
|
|
};
|
2000-08-16 02:05:38 +00:00
|
|
|
|
1997-07-28 22:35:20 +00:00
|
|
|
#define nd_rd_type nd_rd_hdr.icmp6_type
|
|
|
|
#define nd_rd_code nd_rd_hdr.icmp6_code
|
|
|
|
#define nd_rd_cksum nd_rd_hdr.icmp6_cksum
|
|
|
|
#define nd_rd_reserved nd_rd_hdr.icmp6_data32[0]
|
1997-05-22 02:19:00 +00:00
|
|
|
|
1997-07-28 22:35:20 +00:00
|
|
|
struct nd_opt_hdr /* Neighbor discovery option header */
|
1997-05-22 02:19:00 +00:00
|
|
|
{
|
1997-07-28 22:35:20 +00:00
|
|
|
uint8_t nd_opt_type;
|
|
|
|
uint8_t nd_opt_len; /* in units of 8 octets */
|
|
|
|
/* followed by option specific data */
|
1997-05-22 02:19:00 +00:00
|
|
|
};
|
|
|
|
|
[BZ #2693]
* inet/Makefile (routines): Add inet6_opt and inet6_rth.
* inet/Versions (libc, GLIBC_2.5): Add inet6_opt_init,
inet6_opt_append, inet6_opt_finish, inet6_opt_set_val, inet6_opt_next,
inet6_opt_find, inet6_opt_get_val, inet6_rth_space, inet6_rth_init,
inet6_rth_add, inet6_rth_reverse, inet6_rth_segments,
and inet6_rth_getaddr.
* inet/netinet/ip6.h (struct ip6_rthdr0): Make ip6r0_addr a flexible
array.
* inet/netinet/in.h (struct ip6_mtuinfo): Define.
Mark inet6_option_* interfaces as deprecated.
Declare inet6_opt_init, inet6_opt_append, inet6_opt_finish,
inet6_opt_set_val, inet6_opt_next, inet6_opt_find, inet6_opt_get_val,
inet6_rth_space, inet6_rth_init, inet6_rth_add, inet6_rth_reverse,
inet6_rth_segments, and inet6_rth_getaddr.
* inet/inet6_opt.c: New file.
* inet/inet6_rth.c: New file.
* inet/netinet/icmp6.h: Pretty printing.
2006-05-25 04:50:06 +00:00
|
|
|
#define ND_OPT_SOURCE_LINKADDR 1
|
|
|
|
#define ND_OPT_TARGET_LINKADDR 2
|
|
|
|
#define ND_OPT_PREFIX_INFORMATION 3
|
|
|
|
#define ND_OPT_REDIRECTED_HEADER 4
|
|
|
|
#define ND_OPT_MTU 5
|
|
|
|
#define ND_OPT_RTR_ADV_INTERVAL 7
|
|
|
|
#define ND_OPT_HOME_AGENT_INFO 8
|
1997-07-28 22:35:20 +00:00
|
|
|
|
|
|
|
struct nd_opt_prefix_info /* prefix information */
|
1997-05-22 02:19:00 +00:00
|
|
|
{
|
1997-07-28 22:35:20 +00:00
|
|
|
uint8_t nd_opt_pi_type;
|
|
|
|
uint8_t nd_opt_pi_len;
|
|
|
|
uint8_t nd_opt_pi_prefix_len;
|
|
|
|
uint8_t nd_opt_pi_flags_reserved;
|
|
|
|
uint32_t nd_opt_pi_valid_time;
|
|
|
|
uint32_t nd_opt_pi_preferred_time;
|
|
|
|
uint32_t nd_opt_pi_reserved2;
|
|
|
|
struct in6_addr nd_opt_pi_prefix;
|
1997-05-22 02:19:00 +00:00
|
|
|
};
|
|
|
|
|
[BZ #2693]
* inet/Makefile (routines): Add inet6_opt and inet6_rth.
* inet/Versions (libc, GLIBC_2.5): Add inet6_opt_init,
inet6_opt_append, inet6_opt_finish, inet6_opt_set_val, inet6_opt_next,
inet6_opt_find, inet6_opt_get_val, inet6_rth_space, inet6_rth_init,
inet6_rth_add, inet6_rth_reverse, inet6_rth_segments,
and inet6_rth_getaddr.
* inet/netinet/ip6.h (struct ip6_rthdr0): Make ip6r0_addr a flexible
array.
* inet/netinet/in.h (struct ip6_mtuinfo): Define.
Mark inet6_option_* interfaces as deprecated.
Declare inet6_opt_init, inet6_opt_append, inet6_opt_finish,
inet6_opt_set_val, inet6_opt_next, inet6_opt_find, inet6_opt_get_val,
inet6_rth_space, inet6_rth_init, inet6_rth_add, inet6_rth_reverse,
inet6_rth_segments, and inet6_rth_getaddr.
* inet/inet6_opt.c: New file.
* inet/inet6_rth.c: New file.
* inet/netinet/icmp6.h: Pretty printing.
2006-05-25 04:50:06 +00:00
|
|
|
#define ND_OPT_PI_FLAG_ONLINK 0x80
|
|
|
|
#define ND_OPT_PI_FLAG_AUTO 0x40
|
|
|
|
#define ND_OPT_PI_FLAG_RADDR 0x20
|
1997-05-22 02:19:00 +00:00
|
|
|
|
1997-07-28 22:35:20 +00:00
|
|
|
struct nd_opt_rd_hdr /* redirected header */
|
1997-05-22 02:19:00 +00:00
|
|
|
{
|
1997-07-28 22:35:20 +00:00
|
|
|
uint8_t nd_opt_rh_type;
|
|
|
|
uint8_t nd_opt_rh_len;
|
|
|
|
uint16_t nd_opt_rh_reserved1;
|
|
|
|
uint32_t nd_opt_rh_reserved2;
|
|
|
|
/* followed by IP header and data */
|
1997-05-22 02:19:00 +00:00
|
|
|
};
|
|
|
|
|
1997-07-28 22:35:20 +00:00
|
|
|
struct nd_opt_mtu /* MTU option */
|
|
|
|
{
|
|
|
|
uint8_t nd_opt_mtu_type;
|
|
|
|
uint8_t nd_opt_mtu_len;
|
|
|
|
uint16_t nd_opt_mtu_reserved;
|
|
|
|
uint32_t nd_opt_mtu_mtu;
|
|
|
|
};
|
|
|
|
|
2005-11-16 07:52:07 +00:00
|
|
|
struct mld_hdr
|
|
|
|
{
|
|
|
|
struct icmp6_hdr mld_icmp6_hdr;
|
|
|
|
struct in6_addr mld_addr; /* multicast address */
|
|
|
|
};
|
|
|
|
|
|
|
|
#define mld_type mld_icmp6_hdr.icmp6_type
|
|
|
|
#define mld_code mld_icmp6_hdr.icmp6_code
|
|
|
|
#define mld_cksum mld_icmp6_hdr.icmp6_cksum
|
|
|
|
#define mld_maxdelay mld_icmp6_hdr.icmp6_data16[0]
|
|
|
|
#define mld_reserved mld_icmp6_hdr.icmp6_data16[1]
|
|
|
|
|
|
|
|
#define ICMP6_ROUTER_RENUMBERING 138
|
|
|
|
|
|
|
|
struct icmp6_router_renum /* router renumbering header */
|
|
|
|
{
|
|
|
|
struct icmp6_hdr rr_hdr;
|
|
|
|
uint8_t rr_segnum;
|
|
|
|
uint8_t rr_flags;
|
|
|
|
uint16_t rr_maxdelay;
|
|
|
|
uint32_t rr_reserved;
|
|
|
|
};
|
|
|
|
|
|
|
|
#define rr_type rr_hdr.icmp6_type
|
|
|
|
#define rr_code rr_hdr.icmp6_code
|
|
|
|
#define rr_cksum rr_hdr.icmp6_cksum
|
|
|
|
#define rr_seqnum rr_hdr.icmp6_data32[0]
|
|
|
|
|
|
|
|
/* Router renumbering flags */
|
|
|
|
#define ICMP6_RR_FLAGS_TEST 0x80
|
|
|
|
#define ICMP6_RR_FLAGS_REQRESULT 0x40
|
|
|
|
#define ICMP6_RR_FLAGS_FORCEAPPLY 0x20
|
|
|
|
#define ICMP6_RR_FLAGS_SPECSITE 0x10
|
|
|
|
#define ICMP6_RR_FLAGS_PREVDONE 0x08
|
|
|
|
|
|
|
|
struct rr_pco_match /* match prefix part */
|
|
|
|
{
|
|
|
|
uint8_t rpm_code;
|
|
|
|
uint8_t rpm_len;
|
|
|
|
uint8_t rpm_ordinal;
|
|
|
|
uint8_t rpm_matchlen;
|
|
|
|
uint8_t rpm_minlen;
|
|
|
|
uint8_t rpm_maxlen;
|
|
|
|
uint16_t rpm_reserved;
|
|
|
|
struct in6_addr rpm_prefix;
|
|
|
|
};
|
|
|
|
|
|
|
|
/* PCO code values */
|
|
|
|
#define RPM_PCO_ADD 1
|
|
|
|
#define RPM_PCO_CHANGE 2
|
|
|
|
#define RPM_PCO_SETGLOBAL 3
|
|
|
|
|
|
|
|
struct rr_pco_use /* use prefix part */
|
|
|
|
{
|
|
|
|
uint8_t rpu_uselen;
|
|
|
|
uint8_t rpu_keeplen;
|
|
|
|
uint8_t rpu_ramask;
|
|
|
|
uint8_t rpu_raflags;
|
|
|
|
uint32_t rpu_vltime;
|
|
|
|
uint32_t rpu_pltime;
|
|
|
|
uint32_t rpu_flags;
|
|
|
|
struct in6_addr rpu_prefix;
|
|
|
|
};
|
|
|
|
|
|
|
|
#define ICMP6_RR_PCOUSE_RAFLAGS_ONLINK 0x20
|
|
|
|
#define ICMP6_RR_PCOUSE_RAFLAGS_AUTO 0x10
|
|
|
|
|
Installed-header hygiene (BZ#20366): Simple self-contained fixes.
Some headers did not include all of their prerequisite headers.
* rpcsvc/nislib.h: Include rpcsvc/nis.h.
* sysdeps/unix/sysv/linux/netrose/rose.h:
Include sys/socket.h and netax25/ax25.h.
<endian.h> only defines BYTE_ORDER, BIG_ENDIAN, LITTLE_ENDIAN,
etc. under __USE_MISC; glibc's headers should use __BYTE_ORDER,
__BIG_ENDIAN, __LITTLE_ENDIAN, etc. instead.
* inet/netinet/icmp6.h, inet/netinet/ip6.h
* resolv/arpa/nameser_compat.h:
Use __BYTE_ORDER etc. instead of BYTE_ORDER etc.
sys/types.h only conditionally defines caddr_t and clockid_t.
* sysdeps/unix/sysv/linux/sys/quota.h:
Use __caddr_t instead of caddr_t.
* sysdeps/unix/sysv/linux/sys/timerfd.h:
Use __clockid_t instead of clockid_t.
Remove a #warning that was the sole actual problem with using sys/ipc.h
without _GNU_SOURCE/_XOPEN_SOURCE.
* sysvipc/sys/ipc.h: Remove unnecessary #warning.
_LIBC, __USE_XOPEN2K8, and __STDC_VERSION__ are not always defined.
It seems to me that _LIBC should not appear in installed headers, but
avoiding that for argp specifically would require more surgery than
feels appropriate for this patch set. It's possible that
"#ifdef _LIBC" would be sufficient, but I wanted to be conservative.
All three versions of bits/socket.h want to know whether __flexarr
will produce a real flexible array member -- specifically, one that
doesn't alter sizeof(the structure containing it). They were testing
for this with a complicated #if condition that did not agree with
sys/cdefs.h and that tripped -Wundef warnings under -std=c90.
I added a new macro to sys/cdefs.h, __glibc_c99_flexarr_available,
which reveals exactly what these headers want to know. I also took
the opportunity to flatten the rather messy conditional nest defining
__flexarr.
* argp/argp.h: Check whether _LIBC is defined before expanding it.
* posix/glob.h: Check whether __USE_XOPEN2K8 is defined instead
of expanding it.
* misc/sys/cdefs.h: Tidy up conditional nest defining __flexarr.
Define __glibc_c99_flexarr_available to 1 when the compiler
supports C99-compatible flexible array members, 0 otherwise.
* sysdeps/unix/sysv/linux/bits/socket.h
* sysdeps/mach/hurd/bits/socket.h
* bits/socket.h: Use __glibc_c99_flexarr_available in
definitions of struct cmsghdr and CMSG_DATA.
2016-08-22 12:06:30 +00:00
|
|
|
#if __BYTE_ORDER == __BIG_ENDIAN
|
[BZ #2693]
* inet/Makefile (routines): Add inet6_opt and inet6_rth.
* inet/Versions (libc, GLIBC_2.5): Add inet6_opt_init,
inet6_opt_append, inet6_opt_finish, inet6_opt_set_val, inet6_opt_next,
inet6_opt_find, inet6_opt_get_val, inet6_rth_space, inet6_rth_init,
inet6_rth_add, inet6_rth_reverse, inet6_rth_segments,
and inet6_rth_getaddr.
* inet/netinet/ip6.h (struct ip6_rthdr0): Make ip6r0_addr a flexible
array.
* inet/netinet/in.h (struct ip6_mtuinfo): Define.
Mark inet6_option_* interfaces as deprecated.
Declare inet6_opt_init, inet6_opt_append, inet6_opt_finish,
inet6_opt_set_val, inet6_opt_next, inet6_opt_find, inet6_opt_get_val,
inet6_rth_space, inet6_rth_init, inet6_rth_add, inet6_rth_reverse,
inet6_rth_segments, and inet6_rth_getaddr.
* inet/inet6_opt.c: New file.
* inet/inet6_rth.c: New file.
* inet/netinet/icmp6.h: Pretty printing.
2006-05-25 04:50:06 +00:00
|
|
|
# define ICMP6_RR_PCOUSE_FLAGS_DECRVLTIME 0x80000000
|
|
|
|
# define ICMP6_RR_PCOUSE_FLAGS_DECRPLTIME 0x40000000
|
Installed-header hygiene (BZ#20366): Simple self-contained fixes.
Some headers did not include all of their prerequisite headers.
* rpcsvc/nislib.h: Include rpcsvc/nis.h.
* sysdeps/unix/sysv/linux/netrose/rose.h:
Include sys/socket.h and netax25/ax25.h.
<endian.h> only defines BYTE_ORDER, BIG_ENDIAN, LITTLE_ENDIAN,
etc. under __USE_MISC; glibc's headers should use __BYTE_ORDER,
__BIG_ENDIAN, __LITTLE_ENDIAN, etc. instead.
* inet/netinet/icmp6.h, inet/netinet/ip6.h
* resolv/arpa/nameser_compat.h:
Use __BYTE_ORDER etc. instead of BYTE_ORDER etc.
sys/types.h only conditionally defines caddr_t and clockid_t.
* sysdeps/unix/sysv/linux/sys/quota.h:
Use __caddr_t instead of caddr_t.
* sysdeps/unix/sysv/linux/sys/timerfd.h:
Use __clockid_t instead of clockid_t.
Remove a #warning that was the sole actual problem with using sys/ipc.h
without _GNU_SOURCE/_XOPEN_SOURCE.
* sysvipc/sys/ipc.h: Remove unnecessary #warning.
_LIBC, __USE_XOPEN2K8, and __STDC_VERSION__ are not always defined.
It seems to me that _LIBC should not appear in installed headers, but
avoiding that for argp specifically would require more surgery than
feels appropriate for this patch set. It's possible that
"#ifdef _LIBC" would be sufficient, but I wanted to be conservative.
All three versions of bits/socket.h want to know whether __flexarr
will produce a real flexible array member -- specifically, one that
doesn't alter sizeof(the structure containing it). They were testing
for this with a complicated #if condition that did not agree with
sys/cdefs.h and that tripped -Wundef warnings under -std=c90.
I added a new macro to sys/cdefs.h, __glibc_c99_flexarr_available,
which reveals exactly what these headers want to know. I also took
the opportunity to flatten the rather messy conditional nest defining
__flexarr.
* argp/argp.h: Check whether _LIBC is defined before expanding it.
* posix/glob.h: Check whether __USE_XOPEN2K8 is defined instead
of expanding it.
* misc/sys/cdefs.h: Tidy up conditional nest defining __flexarr.
Define __glibc_c99_flexarr_available to 1 when the compiler
supports C99-compatible flexible array members, 0 otherwise.
* sysdeps/unix/sysv/linux/bits/socket.h
* sysdeps/mach/hurd/bits/socket.h
* bits/socket.h: Use __glibc_c99_flexarr_available in
definitions of struct cmsghdr and CMSG_DATA.
2016-08-22 12:06:30 +00:00
|
|
|
#elif __BYTE_ORDER == __LITTLE_ENDIAN
|
[BZ #2693]
* inet/Makefile (routines): Add inet6_opt and inet6_rth.
* inet/Versions (libc, GLIBC_2.5): Add inet6_opt_init,
inet6_opt_append, inet6_opt_finish, inet6_opt_set_val, inet6_opt_next,
inet6_opt_find, inet6_opt_get_val, inet6_rth_space, inet6_rth_init,
inet6_rth_add, inet6_rth_reverse, inet6_rth_segments,
and inet6_rth_getaddr.
* inet/netinet/ip6.h (struct ip6_rthdr0): Make ip6r0_addr a flexible
array.
* inet/netinet/in.h (struct ip6_mtuinfo): Define.
Mark inet6_option_* interfaces as deprecated.
Declare inet6_opt_init, inet6_opt_append, inet6_opt_finish,
inet6_opt_set_val, inet6_opt_next, inet6_opt_find, inet6_opt_get_val,
inet6_rth_space, inet6_rth_init, inet6_rth_add, inet6_rth_reverse,
inet6_rth_segments, and inet6_rth_getaddr.
* inet/inet6_opt.c: New file.
* inet/inet6_rth.c: New file.
* inet/netinet/icmp6.h: Pretty printing.
2006-05-25 04:50:06 +00:00
|
|
|
# define ICMP6_RR_PCOUSE_FLAGS_DECRVLTIME 0x80
|
|
|
|
# define ICMP6_RR_PCOUSE_FLAGS_DECRPLTIME 0x40
|
2005-11-16 07:52:07 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
struct rr_result /* router renumbering result message */
|
|
|
|
{
|
|
|
|
uint16_t rrr_flags;
|
|
|
|
uint8_t rrr_ordinal;
|
|
|
|
uint8_t rrr_matchedlen;
|
|
|
|
uint32_t rrr_ifid;
|
|
|
|
struct in6_addr rrr_prefix;
|
|
|
|
};
|
|
|
|
|
Installed-header hygiene (BZ#20366): Simple self-contained fixes.
Some headers did not include all of their prerequisite headers.
* rpcsvc/nislib.h: Include rpcsvc/nis.h.
* sysdeps/unix/sysv/linux/netrose/rose.h:
Include sys/socket.h and netax25/ax25.h.
<endian.h> only defines BYTE_ORDER, BIG_ENDIAN, LITTLE_ENDIAN,
etc. under __USE_MISC; glibc's headers should use __BYTE_ORDER,
__BIG_ENDIAN, __LITTLE_ENDIAN, etc. instead.
* inet/netinet/icmp6.h, inet/netinet/ip6.h
* resolv/arpa/nameser_compat.h:
Use __BYTE_ORDER etc. instead of BYTE_ORDER etc.
sys/types.h only conditionally defines caddr_t and clockid_t.
* sysdeps/unix/sysv/linux/sys/quota.h:
Use __caddr_t instead of caddr_t.
* sysdeps/unix/sysv/linux/sys/timerfd.h:
Use __clockid_t instead of clockid_t.
Remove a #warning that was the sole actual problem with using sys/ipc.h
without _GNU_SOURCE/_XOPEN_SOURCE.
* sysvipc/sys/ipc.h: Remove unnecessary #warning.
_LIBC, __USE_XOPEN2K8, and __STDC_VERSION__ are not always defined.
It seems to me that _LIBC should not appear in installed headers, but
avoiding that for argp specifically would require more surgery than
feels appropriate for this patch set. It's possible that
"#ifdef _LIBC" would be sufficient, but I wanted to be conservative.
All three versions of bits/socket.h want to know whether __flexarr
will produce a real flexible array member -- specifically, one that
doesn't alter sizeof(the structure containing it). They were testing
for this with a complicated #if condition that did not agree with
sys/cdefs.h and that tripped -Wundef warnings under -std=c90.
I added a new macro to sys/cdefs.h, __glibc_c99_flexarr_available,
which reveals exactly what these headers want to know. I also took
the opportunity to flatten the rather messy conditional nest defining
__flexarr.
* argp/argp.h: Check whether _LIBC is defined before expanding it.
* posix/glob.h: Check whether __USE_XOPEN2K8 is defined instead
of expanding it.
* misc/sys/cdefs.h: Tidy up conditional nest defining __flexarr.
Define __glibc_c99_flexarr_available to 1 when the compiler
supports C99-compatible flexible array members, 0 otherwise.
* sysdeps/unix/sysv/linux/bits/socket.h
* sysdeps/mach/hurd/bits/socket.h
* bits/socket.h: Use __glibc_c99_flexarr_available in
definitions of struct cmsghdr and CMSG_DATA.
2016-08-22 12:06:30 +00:00
|
|
|
#if __BYTE_ORDER == __BIG_ENDIAN
|
2005-11-16 07:52:07 +00:00
|
|
|
# define ICMP6_RR_RESULT_FLAGS_OOB 0x0002
|
|
|
|
# define ICMP6_RR_RESULT_FLAGS_FORBIDDEN 0x0001
|
Installed-header hygiene (BZ#20366): Simple self-contained fixes.
Some headers did not include all of their prerequisite headers.
* rpcsvc/nislib.h: Include rpcsvc/nis.h.
* sysdeps/unix/sysv/linux/netrose/rose.h:
Include sys/socket.h and netax25/ax25.h.
<endian.h> only defines BYTE_ORDER, BIG_ENDIAN, LITTLE_ENDIAN,
etc. under __USE_MISC; glibc's headers should use __BYTE_ORDER,
__BIG_ENDIAN, __LITTLE_ENDIAN, etc. instead.
* inet/netinet/icmp6.h, inet/netinet/ip6.h
* resolv/arpa/nameser_compat.h:
Use __BYTE_ORDER etc. instead of BYTE_ORDER etc.
sys/types.h only conditionally defines caddr_t and clockid_t.
* sysdeps/unix/sysv/linux/sys/quota.h:
Use __caddr_t instead of caddr_t.
* sysdeps/unix/sysv/linux/sys/timerfd.h:
Use __clockid_t instead of clockid_t.
Remove a #warning that was the sole actual problem with using sys/ipc.h
without _GNU_SOURCE/_XOPEN_SOURCE.
* sysvipc/sys/ipc.h: Remove unnecessary #warning.
_LIBC, __USE_XOPEN2K8, and __STDC_VERSION__ are not always defined.
It seems to me that _LIBC should not appear in installed headers, but
avoiding that for argp specifically would require more surgery than
feels appropriate for this patch set. It's possible that
"#ifdef _LIBC" would be sufficient, but I wanted to be conservative.
All three versions of bits/socket.h want to know whether __flexarr
will produce a real flexible array member -- specifically, one that
doesn't alter sizeof(the structure containing it). They were testing
for this with a complicated #if condition that did not agree with
sys/cdefs.h and that tripped -Wundef warnings under -std=c90.
I added a new macro to sys/cdefs.h, __glibc_c99_flexarr_available,
which reveals exactly what these headers want to know. I also took
the opportunity to flatten the rather messy conditional nest defining
__flexarr.
* argp/argp.h: Check whether _LIBC is defined before expanding it.
* posix/glob.h: Check whether __USE_XOPEN2K8 is defined instead
of expanding it.
* misc/sys/cdefs.h: Tidy up conditional nest defining __flexarr.
Define __glibc_c99_flexarr_available to 1 when the compiler
supports C99-compatible flexible array members, 0 otherwise.
* sysdeps/unix/sysv/linux/bits/socket.h
* sysdeps/mach/hurd/bits/socket.h
* bits/socket.h: Use __glibc_c99_flexarr_available in
definitions of struct cmsghdr and CMSG_DATA.
2016-08-22 12:06:30 +00:00
|
|
|
#elif __BYTE_ORDER == __LITTLE_ENDIAN
|
2005-11-16 07:52:07 +00:00
|
|
|
# define ICMP6_RR_RESULT_FLAGS_OOB 0x0200
|
|
|
|
# define ICMP6_RR_RESULT_FLAGS_FORBIDDEN 0x0100
|
|
|
|
#endif
|
|
|
|
|
2000-08-21 19:15:14 +00:00
|
|
|
/* Mobile IPv6 extension: Advertisement Interval. */
|
|
|
|
struct nd_opt_adv_interval
|
|
|
|
{
|
|
|
|
uint8_t nd_opt_adv_interval_type;
|
|
|
|
uint8_t nd_opt_adv_interval_len;
|
|
|
|
uint16_t nd_opt_adv_interval_reserved;
|
|
|
|
uint32_t nd_opt_adv_interval_ival;
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Mobile IPv6 extension: Home Agent Info. */
|
|
|
|
struct nd_opt_home_agent_info
|
|
|
|
{
|
|
|
|
uint8_t nd_opt_home_agent_info_type;
|
|
|
|
uint8_t nd_opt_home_agent_info_len;
|
|
|
|
uint16_t nd_opt_home_agent_info_reserved;
|
2009-06-16 03:33:39 +00:00
|
|
|
uint16_t nd_opt_home_agent_info_preference;
|
2000-08-21 19:15:14 +00:00
|
|
|
uint16_t nd_opt_home_agent_info_lifetime;
|
|
|
|
};
|
1997-07-28 22:35:20 +00:00
|
|
|
|
1997-06-21 02:59:26 +00:00
|
|
|
#endif /* netinet/icmpv6.h */
|