diff options
author | Ulrich Drepper <drepper@redhat.com> | 1997-05-22 02:19:00 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1997-05-22 02:19:00 +0000 |
commit | bfbc57545a197afff72572c3a6f0563023d553a5 (patch) | |
tree | 52096edcfa9545eecacfa230d8a5d440b8564f80 /sysdeps/generic/netinet | |
parent | 9498096c93a5755cd48a72762d2b6701bd7d796e (diff) | |
download | glibc-bfbc57545a197afff72572c3a6f0563023d553a5.tar.gz glibc-bfbc57545a197afff72572c3a6f0563023d553a5.tar.xz glibc-bfbc57545a197afff72572c3a6f0563023d553a5.zip |
Update. cvs/libc-ud-970521
1997-05-22 04:09 Ulrich Drepper <drepper@cygnus.com> * sunrpc/clnt_perr.c (clnt_sperrno): Change type of variable i to size_t to prevent warning. * sunrpc/rpcinfo.c (get_inet_address): Use UNADDR_NONE and INADDR_ANY instead of numeric values. Various cleanups. * sunrpc/xdr_mem.c: Use `const char *' instead of `const caddr_t' for xdrmem_putbytes. * sunrpc/xdr_rec.c: Likewise. * sunrpc/xdr_stdio.c: Likewise. * sunrpc/rpc/xdr.h: Likewise. * sysdeps/unix/sysv/linux/arm/syscall.s: Pretty printing. * sysdeps/unix/sysv/linux/arm/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/i386/sysdep.h: Likewise. 1997-05-21 22:22 Philip Blundell <pjb27@cam.ac.uk> * inet/Makefile (headers): Add netinet/ip6.h, netinet/icmp6.h. * sysdeps/generic/netinet/ip6.h: New file (for IPv6 Advanced API). * sysdeps/generic/netinet/icmp6.h: Likewise. * sysdeps/unix/sysv/linux/netinet/in.h: Fix typo. * sysdeps/stub/direntry.h (struct dirent): Add d_fileno (needed by glob.c). * sysdeps/standalone/arm/errnos.h: Add EPROTOTYPE, ESRCH. * sysdeps/unix/arm/sysdep.h: Avoid warning about nested comments. * sysdeps/stub/accept.c (accept): Make args match prototype. * sysdeps/stub/bind.c (bind): Likewise. * sysdeps/stub/connect.c (connect): Likewise. * sysdeps/stub/getpeername.c (getpeername): Likewise. * sysdeps/stub/getsockname.c (getsockname): Likewise. * sysdeps/stub/recvfrom.c (recvfrom): Likewise. * sysdeps/stub/send.c (send): Likewise. * sysdeps/stub/ttyname_r.c (ttyname_r): Likewise. * sysdeps/stub/readv.c (readv): Likewise. * sysdeps/stub/writev.c (writev): Likewise. * sysdeps/stub/sendto.c (sendto): Likewise. * sysdeps/unix/sysv/linux/arm/profil-counter.h: New file. 1997-05-18 12:46 Philip Blundell <pjb27@cam.ac.uk> * sysdeps/unix/sysv/linux/socketbits.h: Add new macros CMSG_SPACE, CMSG_LEN, CMSG_ALIGN (for IPv6 Advanced API). 1997-05-21 13:51 Andreas Jaeger <aj@arthur.rhein-neckar.de> * sysdeps/unix/sysv/linux/shmat.c (shmat): Add cast to prevent warning. * sunrpc/rpcsvc/rusers.x: Provide prototypes for implemented functions, include <rpc/xdr.h>. * string/strverscmp.c: Correct typos in comment. * sunrpc/rpc/xdr.h: Add more `const'. * sunrpc/xdr_stdio.c: Likewise. * sunrpc/xdr_rec.c: Likewise.
Diffstat (limited to 'sysdeps/generic/netinet')
-rw-r--r-- | sysdeps/generic/netinet/icmp6.h | 203 | ||||
-rw-r--r-- | sysdeps/generic/netinet/ip6.h | 44 |
2 files changed, 247 insertions, 0 deletions
diff --git a/sysdeps/generic/netinet/icmp6.h b/sysdeps/generic/netinet/icmp6.h new file mode 100644 index 0000000000..f41cdfeeeb --- /dev/null +++ b/sysdeps/generic/netinet/icmp6.h @@ -0,0 +1,203 @@ +/* Copyright (C) 1991, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc. + 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 General Public License as published by + the Free Software Foundation; either version 2, 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 General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#ifndef _NETINET_ICMP6_H +#define _NETINET_ICMP6_H 1 + +#include <sys/types.h> + +#define ICMPV6_FILTER 1 + +#define ICMPV6_FILTER_BLOCK 1 +#define ICMPV6_FILTER_PASS 2 +#define ICMPV6_FILTER_BLOCKOTHERS 3 +#define ICMPV6_FILTER_PASSONLY 4 + +struct icmpv6_filter + { + u_int32_t data[8]; + }; + +struct icmpv6hdr + { + u_int8_t icmpv6_type; /* type field */ + u_int8_t icmpv6_code; /* code field */ + u_int16_t icmpv6_cksum; /* checksum field */ + union + { + u_int32_t un_data32[1]; /* type-specific field */ + u_int16_t un_data16[2]; /* type-specific field */ + u_int8_t un_data8[4]; /* type-specific field */ + } icmpv6_dataun; + }; + +#define icmpv6_data32 icmpv6_dataun.un_data32 +#define icmpv6_data16 icmpv6_dataun.un_data16 +#define icmpv6_data8 icmpv6_dataun.un_data8 +#define icmpv6_pptr icmpv6_data32[0] /* parameter prob */ +#define icmpv6_mtu icmpv6_data32[0] /* packet too big */ +#define icmpv6_id icmpv6_data16[0] /* echo request/reply */ +#define icmpv6_seq icmpv6_data16[1] /* echo request/reply */ +#define icmpv6_maxdelay icmpv6_data16[0] /* mcast group membership */ + +#define ICMPV6_DEST_UNREACH 1 +#define ICMPV6_PACKET_TOOBIG 2 +#define ICMPV6_TIME_EXCEEDED 3 +#define ICMPV6_PARAMETER_PROBLEM 4 +#define ICMPV6_INFOMSG_MASK 128 /* message is info if bit set */ +#define ICMPV6_ECHOREQUEST 128 +#define ICMPV6_ECHOREPLY 129 +#define ICMPV6_MGM_QUERY 130 +#define ICMPV6_MGM_REPORT 131 +#define ICMPV6_MGM_REDUCTION 132 + +#define ICMPV6_DEST_UNREACH_NOROUTE 0 +#define ICMPV6_DEST_UNREACH_ADMIN 1 /* administratively prohibited */ +#define ICMPV6_DEST_UNREACH_NOTNEIGHBOR 2 /* not a neighbor (and must be) */ +#define ICMPV6_DEST_UNREACH_ADDR 3 +#define ICMPV6_DEST_UNREACH_NOPORT 4 +#define ICMPV6_TIME_EXCEED_HOPS 0 /* Hop Limit == 0 in transit */ +#define ICMPV6_TIME_EXCEED_REASSEMBLY 1 /* Reassembly time out */ +#define ICMPV6_PARAMPROB_HEADER 0 /* erroneous header field */ +#define ICMPV6_PARAMPROB_NEXTHEADER 1 /* unrecognized Next Header */ +#define ICMPV6_PARAMPROB_OPTION 2 /* unrecognized option */ + +#if defined(__OPTIMIZE__) +#include <asm/bitops.h> + +#define ICMPV6_FILTER_WILLPASS(type, filterp) \ + (test_bit(type, filterp) == 0) + +#define ICMPV6_FILTER_WILLBLOCK(type, filterp) \ + test_bit(type, filterp) + +#define ICMPV6_FILTER_SETPASS(type, filterp) \ + clear_bit(type & 0x1f, &((filterp)->data[type >> 5])) + +#define ICMPV6_FILTER_SETBLOCK(type, filterp) \ + set_bit(type & 0x1f, &((filterp)->data[type >> 5])) +#else +#define ICMPV6_FILTER_WILLPASS(type, filterp) \ + ((((filterp)->data[(type) >> 5]) & (1 << ((type) & 31))) == 0) + +#define ICMPV6_FILTER_WILLBLOCK(type, filterp) \ + ((((filterp)->data[(type) >> 5]) & (1 << ((type) & 31))) != 0) + +#define ICMPV6_FILTER_SETPASS(type, filterp) \ + ((((filterp)->data[(type) >> 5]) &= ~(1 << ((type) & 31)))) + +#define ICMPV6_FILTER_SETBLOCK(type, filterp) \ + ((((filterp)->data[(type) >> 5]) |= (1 << ((type) & 31)))) +#endif + +#define ICMPV6_FILTER_SETPASSALL(filterp) \ + memset(filterp, 0, sizeof(struct icmpv6_filter)); + +#define ICMPV6_FILTER_SETBLOCKALL(filterp) \ + memset(filterp, 0xFF, sizeof(struct icmpv6_filter)); + +#define ND6_ROUTER_SOLICITATION 133 +#define ND6_ROUTER_ADVERTISEMENT 134 +#define ND6_NEIGHBOR_SOLICITATION 135 +#define ND6_NEIGHBOR_ADVERTISEMENT 136 +#define ND6_REDIRECT 137 + +enum nd6_option + { + ND6_OPT_SOURCE_LINKADDR=1, + ND6_OPT_TARGET_LINKADDR=2, + ND6_OPT_PREFIX_INFORMATION=3, + ND6_OPT_REDIRECTED_HEADER=4, + ND6_OPT_MTU=5, + ND6_OPT_ENDOFLIST=256 + }; + +struct nd6_router_solicit /* router solicitation */ + { + struct icmpv6hdr rsol_hdr; + }; + +#define rsol_type rsol_hdr.icmpv6_type +#define rsol_code rsol_hdr.icmpv6_code +#define rsol_cksum rsol_hdr.icmpv6_cksum +#define rsol_reserved rsol_hdr.icmpv6_data32[0] + +struct nd6_router_advert + { + struct icmpv6hdr radv_hdr; + u_int32_t radv_reachable; /* reachable time */ + u_int32_t radv_retransmit; /* reachable retransmit time */ + }; + +#define radv_type radv_hdr.icmpv6_type +#define radv_code radv_hdr.icmpv6_code +#define radv_cksum radv_hdr.icmpv6_cksum +#define radv_maxhoplimit radv_hdr.icmpv6_data8[0] +#define radv_m_o_res radv_hdr.icmpv6_data8[1] +#define ND6_RADV_M_BIT 0x80 +#define ND6_RADV_O_BIT 0x40 +#define radv_router_lifetime radv_hdr.icmpv6_data16[1] + +struct nd6_nsolicitation /* neighbor solicitation */ + { + struct icmpv6hdr nsol6_hdr; + struct in6_addr nsol6_target; + }; + +struct nd6_nadvertisement /* neighbor advertisement */ + { + struct icmpv6hdr nadv6_hdr; + struct in6_addr nadv6_target; + }; + +#define nadv6_flags nadv6_hdr.icmpv6_data32[0] +#define ND6_NADVERFLAG_ISROUTER 0x80 +#define ND6_NADVERFLAG_SOLICITED 0x40 +#define ND6_NADVERFLAG_OVERRIDE 0x20 + +struct nd6_redirect /* redirect */ + { + struct icmpv6hdr redirect_hdr; + struct in6_addr redirect_target; + struct in6_addr redirect_destination; + }; + +struct nd6_opt_prefix_info /* prefix information */ + { + u_int8_t opt_type; + u_int8_t opt_length; + u_int8_t opt_prefix_length; + u_int8_t opt_l_a_res; + u_int32_t opt_valid_life; + u_int32_t opt_preferred_life; + u_int32_t opt_reserved2; + struct in6_addr opt_prefix; + }; + +#define ND6_OPT_PI_L_BIT 0x80 +#define ND6_OPT_PI_A_BIT 0x40 + +struct nd6_opt_mtu /* MTU option */ + { + u_int8_t opt_type; + u_int8_t opt_length; + u_int16_t opt_reserved; + u_int32_t opt_mtu; + }; + +#endif /* _NETINET6_ICMPV6_H */ diff --git a/sysdeps/generic/netinet/ip6.h b/sysdeps/generic/netinet/ip6.h new file mode 100644 index 0000000000..487cafa374 --- /dev/null +++ b/sysdeps/generic/netinet/ip6.h @@ -0,0 +1,44 @@ +/* Copyright (C) 1991, 92, 93, 94, 95, 96, 97 Free Software Foundation, Inc. + 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 General Public License as published by + the Free Software Foundation; either version 2, 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 General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#ifndef _NETINET_IP6_H +#define _NETINET_IP6_H 1 + +#include <netinet/in.h> +#include <endian.h> + +struct ipv6hdr { +#if (__BYTE_ORDER == __LITTLE_ENDIAN) + u_int8_t ipv6_version:4; + u_int8_t ipv6_priority:4; /* going away? */ + u_int32_t ipv6_flowid:24; +#elif (__BYTE_ORDER == __BIG_ENDIAN) + u_int32_t ipv6_flowid:24; + u_int8_t ipv6_priority:4; /* going away? */ + u_int8_t ipv6_version:4; +#else +#error Unknown endianness +#endif + u_int16_t ipv6_len; + u_int8_t ipv6_nextheader; + u_int8_t ipv6_hoplimit; + struct in6_addr ipv6_src; + struct in6_addr ipv6_dst; +}; + +#endif /* _NETINET_IP6_H */ |