diff options
author | Ulrich Drepper <drepper@redhat.com> | 1997-07-28 22:35:20 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1997-07-28 22:35:20 +0000 |
commit | 3996f34b46043ed8ea8fdc6f44377d969d64396b (patch) | |
tree | 563f433dab9b5299d81ced72885bf1e8c29b9159 /inet/netinet/ip6.h | |
parent | 0a54e4010fe0085cd36deaff9442a7e88de3270d (diff) | |
download | glibc-3996f34b46043ed8ea8fdc6f44377d969d64396b.zip glibc-3996f34b46043ed8ea8fdc6f44377d969d64396b.tar.gz glibc-3996f34b46043ed8ea8fdc6f44377d969d64396b.tar.bz2 |
Update.cvs/libc-ud-970729
1997-07-28 23:35 Ulrich Drepper <drepper@cygnus.com>
* csu/gmon-start.c (__gmon_start__): Call __monstartup not
monstartup.
* gmon/gmon.c: Rename moncontrol to __moncontrol and monstartup
to __monstartup.
* gmon/sys/gmon.h: Fix prototypes.
* gmon/sys/gmon_out.h: Pretty print.
* gmon/bb_exit_func.c (__bb_exit_func): Use memcpy instead of bcopy.
* gmon/gmon.c (__monstartup): Likewise.
(write_hist): Remove dependency on 32 int.
(_mcleanup): Don't call perror, use fprintf.
* elf/dl-load.c: Fix handling of current directory in search path.
* elf/Makefile (dl-routines): Add dl-profile.
* elf/dl-profile.c: New file.
* elf/dl-runtime.c (fixup): Add new parameter with address to store
relocation result in to elf_machine_relplt.
(profile_fixup): New function.
* elf/do-rel.h (elf_dynamic_do_rel): Add new parameter with address
to store relocation result in to elf_machine_relplt.
* elf/dl-support.c: Define _dl_profile and _dl_profile_map.
* elf/dynamic-link.h (ELF_DYNAMIC_RELOCATE): Add new parameter and
call elf_machine_runtime_setup with extra argument.
* elf/dl-reloc.c (_dl_relocate_object): Add new argument to
ELF_DYNAMIC_RELOCATE.
* elf/link.h: Add prototypes for new functions and variables.
* elf/rtld.c: Parse LD_PROFILE and LD_PROFILE_OUTPUT environment
variables and call _dl_start_profile if necessary.
* include/sys/gmon_out.h: New file.
* sysdeps/alpha/dl-machine.h (elf_machine_runtime_setup): Add
new parameter to enable profiling.
(elf_machine_rela): Add new parameter to specify place to store
result in.
* sysdeps/m68k/dl-machine.h: Likewise.
* sysdeps/mips/dl-machine.h: Likewise.
* sysdeps/mips/mips64/dl-machine.h: Likewise.
* sysdeps/powerpc/dl-machine.h: Likewise.
* sysdeps/sparc/dl-machine.h: Likewise.
* sysdeps/sparc64/dl-machine.h: Likewise.
* sysdeps/i386/dl-machine.h: Likewise.
(elf_machine_runtime_setup): Setup got[2] to _dl_runtime_resolve if
we do profiling.
(ELF_MACHINE_RUNTIME_TRAMPOLINE): Add code for _dl_runtime_profile.
* nis/nss_compat/compat-grp.c (internal_setgrent): Set FD_CLOEXEC
for stream on input file.
* nis/nss_compat/compat-pwd.c (internal_setpwent): Likewise.
* nis/nss_compat/compat-spwd.c (internal_setspent): Likewise.
* nss/nss_db/db-XXX.c (internal_setent): Likewise.
* nss/nss_db/db-alias.c (internal_setent): Likewise.
* nss/nss_db/db-netgrp.c (internal_setent): Likewise.
* nss/nss_files/files-XXX.c (internal_setent): Likewise.
* nss/nss_files/files-alias.c (internal_setent): Likewise.
* nss/nss_files/files-netgrp.c (internal_setent): Likewise.
* string/string.h: Pretty print.
* sysdeps/i386/fpu/bits/mathinline.h: Major update by John Bowman.
Add float and long double versions.
1997-07-27 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* elf/rtld.c (print_unresolved): Replace empty object name by main
program name.
1997-07-27 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/generic/htons.c (htons): Renamed from __htons.
1997-07-27 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* sysdeps/m68k/bits/byteswap.h: New file.
1997-07-27 23:50 Philip Blundell <Philip.Blundell@pobox.com>
* inet/netinet/icmp6.h: Update for new drafts of POSIX.1g and IPv6
advanced API.
* inet/netinet/in.h: Likewise.
* inet/netinet/ip6.h: Likewise.
* sysdeps/unix/sysv/linux/bits/socket.h: Likewise.
* posix/sys/types.h: Add socklen_t.
* manual/socket.texi: Document some more IPv6 things.
* manual/libc.texinfo: Likewise.
1997-07-26 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* libc.map: Define missing symbol.
1997-07-27 14:31 Thorsten Kukuk <kukuk@vt.uni-paderborn.de>
* nis/Makefile: Add nis_findserv.
* nis/lckcache.c: Fix typo.
* nis/nis_call.c: Fix problems with multihomed servers.
* nis/nis_findserv.c: New file.
* nis/nis_intern.h: Add more prototypes.
* nis/nis_lookup.c (nis_lookup): Don't try the next server if network
is unreachable.
* nis/nis_table.c (nis_list): Likewise.
* nis/nis_ping.c (nis_ping): Use MASTER_ONLY, don't call abort()
in error case.
* nis/nis_util.c (__nis_finddirectory): Give the right error code
back.
* nis/ypclnt.c: Make sure, that all sockets are closed.
Diffstat (limited to 'inet/netinet/ip6.h')
-rw-r--r-- | inet/netinet/ip6.h | 101 |
1 files changed, 81 insertions, 20 deletions
diff --git a/inet/netinet/ip6.h b/inet/netinet/ip6.h index 2930578..cd42ef6 100644 --- a/inet/netinet/ip6.h +++ b/inet/netinet/ip6.h @@ -19,27 +19,88 @@ #ifndef _NETINET_IP6_H #define _NETINET_IP6_H 1 +#include <inttypes.h> #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 + +struct ip6_hdr + { + union + { + struct ip6_hdrctl + { + uint32_t ip6_un1_flow; /* 24 bits of flow-ID */ + uint16_t ip6_un1_plen; /* payload length */ + uint8_t ip6_un1_nxt; /* next header */ + uint8_t ip6_un1_hlim; /* hop limit */ + } ip6_un1; + uint8_t ip6_un2_vfc; /* 4 bits version, 4 bits priority */ + } ip6_ctlun; + struct in6_addr ip6_src; /* source address */ + struct in6_addr ip6_dst; /* destination address */ + }; + +#define ip6_vfc ip6_ctlun.ip6_un2_vfc +#define ip6_flow ip6_ctlun.ip6_un1.ip6_un1_flow +#define ip6_plen ip6_ctlun.ip6_un1.ip6_un1_plen +#define ip6_nxt ip6_ctlun.ip6_un1.ip6_un1_nxt +#define ip6_hlim ip6_ctlun.ip6_un1.ip6_un1_hlim +#define ip6_hops ip6_ctlun.ip6_un1.ip6_un1_hlim + +/* Hop-by-Hop options header. */ +struct ip6_hbh + { + uint8_t ip6h_nxt; /* next hesder. */ + uint8_t ip6h_len; /* length in units of 8 octets. */ + /* followed by options */ + }; + +/* Destination options header */ +struct ip6_dest + { + uint8_t ip6d_nxt; /* next header */ + uint8_t ip6d_len; /* length in units of 8 octets */ + /* followed by options */ + }; + +/* Routing header */ +struct ip6_rthdr + { + uint8_t ip6r_nxt; /* next header */ + uint8_t ip6r_len; /* length in units of 8 octets */ + uint8_t ip6r_type; /* routing type */ + uint8_t ip6r_segleft; /* segments left */ + /* followed by routing type specific data */ + }; + +/* Type 0 Routing header */ +struct ip6_rthdr0 + { + uint8_t ip6r0_nxt; /* next header */ + uint8_t ip6r0_len; /* length in units of 8 octets */ + uint8_t ip6r0_type; /* always zero */ + uint8_t ip6r0_segleft; /* segments left */ + uint8_t ip6r0_reserved; /* reserved field */ + uint8_t ip6r0_slmap[3]; /* strict/loose bit map */ + struct in6_addr ip6r0_addr[1]; /* up to 23 addresses */ + }; + +/* Fragment header */ +struct ip6_frag + { + uint8_t ip6f_nxt; /* next header */ + uint8_t ip6f_reserved; /* reserved field */ + uint16_t ip6f_offlg; /* offset, reserved, and flag */ + uint32_t ip6f_ident; /* identification */ + }; + +#if BYTE_ORDER == BIG_ENDIAN +#define IP6F_OFF_MASK 0xfff8 /* mask out offset from _offlg */ +#define IP6F_RESERVED_MASK 0x0006 /* reserved bits in ip6f_offlg */ +#define IP6F_MORE_FRAG 0x0001 /* more-fragments flag */ +#else /* BYTE_ORDER == LITTLE_ENDIAN */ +#define IP6F_OFF_MASK 0xf8ff /* mask out offset from _offlg */ +#define IP6F_RESERVED_MASK 0x0600 /* reserved bits in ip6f_offlg */ +#define IP6F_MORE_FRAG 0x0100 /* more-fragments flag */ #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 */ |