2024-01-01 18:12:26 +00:00
|
|
|
/* Copyright (C) 2006-2024 Free Software Foundation, Inc.
|
[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
|
|
|
This file is part of the GNU C Library.
|
|
|
|
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
|
|
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.
|
|
|
|
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
Lesser General Public License for more details.
|
|
|
|
|
|
|
|
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/>. */
|
[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
|
|
|
|
|
|
|
#include <string.h>
|
|
|
|
#include <netinet/in.h>
|
|
|
|
#include <netinet/ip6.h>
|
|
|
|
|
|
|
|
|
|
|
|
/* RFC 3542, 7.1
|
|
|
|
|
|
|
|
This function returns the number of bytes required to hold a
|
|
|
|
Routing header of the specified type containing the specified
|
|
|
|
number of segments (addresses). For an IPv6 Type 0 Routing header,
|
|
|
|
the number of segments must be between 0 and 127, inclusive. */
|
|
|
|
socklen_t
|
|
|
|
inet6_rth_space (int type, int segments)
|
|
|
|
{
|
|
|
|
switch (type)
|
|
|
|
{
|
|
|
|
case IPV6_RTHDR_TYPE_0:
|
|
|
|
if (segments < 0 || segments > 127)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return sizeof (struct ip6_rthdr0) + segments * sizeof (struct in6_addr);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* RFC 3542, 7.2
|
|
|
|
|
|
|
|
This function initializes the buffer pointed to by BP to contain a
|
|
|
|
Routing header of the specified type and sets ip6r_len based on the
|
|
|
|
segments parameter. */
|
|
|
|
void *
|
|
|
|
inet6_rth_init (void *bp, socklen_t bp_len, int type, int segments)
|
|
|
|
{
|
|
|
|
struct ip6_rthdr *rthdr = (struct ip6_rthdr *) bp;
|
|
|
|
|
|
|
|
switch (type)
|
|
|
|
{
|
|
|
|
case IPV6_RTHDR_TYPE_0:
|
|
|
|
/* Make sure the parameters are valid and the buffer is large enough. */
|
|
|
|
if (segments < 0 || segments > 127)
|
|
|
|
break;
|
|
|
|
|
|
|
|
socklen_t len = (sizeof (struct ip6_rthdr0)
|
|
|
|
+ segments * sizeof (struct in6_addr));
|
|
|
|
if (len > bp_len)
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* Some implementations seem to initialize the whole memory area. */
|
|
|
|
memset (bp, '\0', len);
|
|
|
|
|
|
|
|
/* Length in units of 8 octets. */
|
|
|
|
rthdr->ip6r_len = segments * sizeof (struct in6_addr) / 8;
|
|
|
|
rthdr->ip6r_type = IPV6_RTHDR_TYPE_0;
|
|
|
|
return bp;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* RFC 3542, 7.3
|
|
|
|
|
|
|
|
This function adds the IPv6 address pointed to by addr to the end of
|
|
|
|
the Routing header being constructed. */
|
|
|
|
int
|
|
|
|
inet6_rth_add (void *bp, const struct in6_addr *addr)
|
|
|
|
{
|
|
|
|
struct ip6_rthdr *rthdr = (struct ip6_rthdr *) bp;
|
|
|
|
|
|
|
|
switch (rthdr->ip6r_type)
|
|
|
|
{
|
|
|
|
struct ip6_rthdr0 *rthdr0;
|
|
|
|
case IPV6_RTHDR_TYPE_0:
|
|
|
|
rthdr0 = (struct ip6_rthdr0 *) rthdr;
|
2009-03-15 19:16:16 +00:00
|
|
|
if (rthdr0->ip6r0_len * 8 / sizeof (struct in6_addr)
|
|
|
|
- rthdr0->ip6r0_segleft < 1)
|
|
|
|
return -1;
|
[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
|
|
|
|
|
|
|
memcpy (&rthdr0->ip6r0_addr[rthdr0->ip6r0_segleft++],
|
|
|
|
addr, sizeof (struct in6_addr));
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* RFC 3542, 7.4
|
|
|
|
|
|
|
|
This function takes a Routing header extension header (pointed to by
|
|
|
|
the first argument) and writes a new Routing header that sends
|
|
|
|
datagrams along the reverse of that route. The function reverses the
|
|
|
|
order of the addresses and sets the segleft member in the new Routing
|
|
|
|
header to the number of segments. */
|
|
|
|
int
|
|
|
|
inet6_rth_reverse (const void *in, void *out)
|
|
|
|
{
|
|
|
|
struct ip6_rthdr *in_rthdr = (struct ip6_rthdr *) in;
|
|
|
|
|
|
|
|
switch (in_rthdr->ip6r_type)
|
|
|
|
{
|
|
|
|
struct ip6_rthdr0 *in_rthdr0;
|
|
|
|
struct ip6_rthdr0 *out_rthdr0;
|
|
|
|
case IPV6_RTHDR_TYPE_0:
|
|
|
|
in_rthdr0 = (struct ip6_rthdr0 *) in;
|
|
|
|
out_rthdr0 = (struct ip6_rthdr0 *) out;
|
|
|
|
|
|
|
|
/* Copy header, not the addresses. The memory regions can overlap. */
|
|
|
|
memmove (out_rthdr0, in_rthdr0, sizeof (struct ip6_rthdr0));
|
|
|
|
|
2009-03-15 20:35:02 +00:00
|
|
|
int total = in_rthdr0->ip6r0_len * 8 / sizeof (struct in6_addr);
|
[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
|
|
|
for (int i = 0; i < total / 2; ++i)
|
|
|
|
{
|
|
|
|
/* Remember, IN_RTHDR0 and OUT_RTHDR0 might overlap. */
|
|
|
|
struct in6_addr temp = in_rthdr0->ip6r0_addr[i];
|
|
|
|
out_rthdr0->ip6r0_addr[i] = in_rthdr0->ip6r0_addr[total - 1 - i];
|
|
|
|
out_rthdr0->ip6r0_addr[total - 1 - i] = temp;
|
|
|
|
}
|
|
|
|
if (total % 2 != 0 && in != out)
|
|
|
|
out_rthdr0->ip6r0_addr[total / 2] = in_rthdr0->ip6r0_addr[total / 2];
|
|
|
|
|
2009-03-15 20:35:02 +00:00
|
|
|
out_rthdr0->ip6r0_segleft = total;
|
|
|
|
|
[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
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* RFC 3542, 7.5
|
|
|
|
|
|
|
|
This function returns the number of segments (addresses) contained in
|
|
|
|
the Routing header described by BP. */
|
|
|
|
int
|
|
|
|
inet6_rth_segments (const void *bp)
|
|
|
|
{
|
|
|
|
struct ip6_rthdr *rthdr = (struct ip6_rthdr *) bp;
|
|
|
|
|
|
|
|
switch (rthdr->ip6r_type)
|
|
|
|
{
|
|
|
|
case IPV6_RTHDR_TYPE_0:
|
|
|
|
|
|
|
|
return rthdr->ip6r_len * 8 / sizeof (struct in6_addr);
|
|
|
|
}
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* RFC 3542, 7.6
|
|
|
|
|
|
|
|
This function returns a pointer to the IPv6 address specified by
|
|
|
|
index (which must have a value between 0 and one less than the
|
|
|
|
value returned by 'inet6_rth_segments') in the Routing header
|
|
|
|
described by BP. */
|
|
|
|
struct in6_addr *
|
|
|
|
inet6_rth_getaddr (const void *bp, int index)
|
|
|
|
{
|
|
|
|
struct ip6_rthdr *rthdr = (struct ip6_rthdr *) bp;
|
|
|
|
|
|
|
|
switch (rthdr->ip6r_type)
|
|
|
|
{
|
|
|
|
struct ip6_rthdr0 *rthdr0;
|
|
|
|
case IPV6_RTHDR_TYPE_0:
|
|
|
|
rthdr0 = (struct ip6_rthdr0 *) rthdr;
|
|
|
|
|
|
|
|
if (index >= rthdr0->ip6r0_len * 8 / sizeof (struct in6_addr))
|
|
|
|
break;
|
|
|
|
|
|
|
|
return &rthdr0->ip6r0_addr[index];
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|