mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-23 03:10:05 +00:00
11160cb76f
The types u_char, u_short, u_int, u_long, ushort, uint, ulong, u_int8_t, u_int16_t, u_int32_t, u_int64_t, quad_t, and u_quad_t are BSDisms that have never been standardized. While glibc should continue to *provide* these types for compatibility's sake, its public headers should not use them. The meat of this change was mechanically generated by the following shell command: perl -pi~ -e ' s/\b(__)?u_char\b/unsigned char/g; s/\b(__)?u_?short\b/unsigned short/g; s/\b(__)?u_?int\b/unsigned int/g; s/\b(__)?u_?long\b/unsigned long/g; s/\b(__)?u_int8_t\b/uint8_t/g; s/\b(__)?u_int16_t\b/uint16_t/g; s/\b(__)?u_int32_t\b/uint32_t/g; s/\b(__)?u_int64_t\b/uint64_t/g; s/\b(__)?u_quad_t\b/uint64_t/g; s/\b(__)?quad_t\b/uint64_t/g; ' $(grep -lE -e '\<((__)?(quad_t|u(short|int|long|_(char|short|int([0-9]+_t)?|long|quad_t))))\>' \ $(grep -LE '\<(_(SYS|BITS)_TYPES_H|rpc/(rpc|rpc_msg|types|xdr)\.h)\>' \ $(find . \( -false $(sed 's/^/-o -name /' all-installed-headers) \ \) -printf '%P\n' | sort -u))) where 'all-installed-headers' was a list of the basenames of all installed header files, manually extracted from the Makefiles. Non-installed wrapper headers in include/ are also adjusted, for consistency. I then manually fixed up indentation and line-wrapping. sys/types.h and bits/types.h are excluded because they must continue to define the u_* types (under __USE_MISC) for compatibility with applications. They do not use these types themselves. All headers that (transitively) include rpc/types.h are also excluded, for three reasons. First, the u_* types are defined by rpc/types.h, unconditionally (not just under __USE_MISC) so they are logically part of the SunRPC API. Second, many of those headers appear to be machine-generated. Third, it's my understanding that we are getting rid of as much of SunRPC as possible in the near future. (The one file under sunrpc/ that's touched, sunrpc/rpc/rpc_des.h, does *not* include rpc/types.h. This may itself be a bug.) After changing from u_intNN_t to uintNN_t, a number of headers now need to include stdint.h to pick up those types. It might be more hygenic, namespace-wise, to use __uintNN_t instead, but none of these headers are bound by ISO or POSIX to do so, and it's unlikely that anyone using them will be bothered. (The two files that were using __-prefixed versions of the u_types, sysdeps/mach/hurd/net/route.h and sysdeps/unix/sysv/linux/net/route.h, both already also contained uses of the unprefixed versions.) Some of these files directly included features.h and/or sys/cdefs.h, which I removed, as the style generally seems to be to let sys/types.h do that for us. (This does not change the set of definitions exposed by any header; sys/types.h unconditionally includes both features.h and sys/cdefs.h.) One file included asm/types.h unnecessarily. * bits/in.h, gmon/sys/gmon.h, inet/netinet/igmp.h * inet/protocols/routed.h, inet/protocols/talkd.h * inet/protocols/timed.h, io/fts.h, nptl_db/thread_db.h * resolv/arpa/nameser.h, resolv/resolv.h, sunrpc/rpc/rpc_des.h * sysdeps/generic/netinet/if_ether.h * sysdeps/generic/netinet/in_systm.h * sysdeps/generic/netinet/ip.h, sysdeps/generic/netinet/tcp.h * sysdeps/gnu/netinet/ip_icmp.h, sysdeps/gnu/netinet/tcp.h * sysdeps/gnu/netinet/udp.h, sysdeps/mach/hurd/net/ethernet.h * sysdeps/mach/hurd/net/if_arp.h * sysdeps/mach/hurd/net/if_ppp.h * sysdeps/mach/hurd/net/route.h, sysdeps/mach/sys/reboot.h * sysdeps/unix/sysv/linux/bits/in.h * sysdeps/unix/sysv/linux/net/ethernet.h * sysdeps/unix/sysv/linux/net/if_arp.h * sysdeps/unix/sysv/linux/net/if_ppp.h * sysdeps/unix/sysv/linux/net/if_shaper.h * sysdeps/unix/sysv/linux/net/route.h * sysdeps/unix/sysv/linux/netinet/if_ether.h * sysdeps/unix/sysv/linux/netinet/if_fddi.h * sysdeps/unix/sysv/linux/netinet/if_tr.h * sysdeps/unix/sysv/linux/netipx/ipx.h * sysdeps/unix/sysv/linux/sys/acct.h * include/arpa/nameser.h, include/resolv.h: Change all uses of u_char to unsigned char, u_short and ushort to unsigned short, u_int and uint to unsigned int, u_long and ulong to unsigned long, u_int8_t to uint8_t, u_int16_t to uint16_t, u_int32_t to uint32_t, quad_t to int64_t, and u_int64_t and u_quad_t to uint64_t. * mach/sys/reboot.h: Remove two casts of integer literals to the types they already have. * bits/in.h: Correct error in description of IP_MULTICAST_LOOP. * sysdeps/unix/sysv/linux/bits/in.h: Likewise. * sysdeps/unix/sysv/linux/netinet/if_ether.h: Change a comment from referring to 'unsigned char' to 'uint8_t' for consistency with the macro definition below. * gmon/sys/gmon.h, inet/netinet/igmp.h, inet/protocols/talkd.h * io/fts.h, resolv/arpa/nameser.h, resolv/resolv.h * sunrpc/rpc/rpc_des.h, sysdeps/generic/netinet/ip.h * sysdeps/gnu/netinet/tcp.h, sysdeps/gnu/netinet/udp.h * sysdeps/mach/hurd/net/if_ppp.h, sysdeps/unix/sysv/linux/net/if_ppp.h * sysdeps/unix/sysv/linux/sys/acct.h * include/arpa/nameser.h, include/resolv.h: Fix indentation disrupted by mechanical edits. * inet/protocols/talkd.h, resolv/arpa/nameser.h * sysdeps/generic/netinet/in_systm.h * sysdeps/gnu/netinet/ip_icmp.h, sysdeps/gnu/netinet/tcp.h * sysdeps/gnu/netinet/udp.h * sysdeps/unix/sysv/linux/net/ethernet.h * sysdeps/unix/sysv/linux/net/if_arp.h * sysdeps/unix/sysv/linux/net/if_ppp.h * sysdeps/unix/sysv/linux/net/if_shaper.h * sysdeps/unix/sysv/linux/netinet/if_fddi.h * sysdeps/unix/sysv/linux/netinet/if_tr.h * sysdeps/unix/sysv/linux/netipx/ipx.h * sysdeps/unix/sysv/linux/sys/acct.h Include stdint.h for uintNN_t definitions. Don't include sys/cdefs.h, features.h, or asm/types.h directly. |
||
---|---|---|
.. | ||
arpa | ||
nss_dns | ||
rpc | ||
sys | ||
Banner | ||
base64.c | ||
compat-hooks.c | ||
Depend | ||
ga_test.c | ||
gai_cancel.c | ||
gai_error.c | ||
gai_misc.c | ||
gai_misc.h | ||
gai_notify.c | ||
gai_sigqueue.c | ||
gai_suspend.c | ||
getaddrinfo_a.c | ||
gethnamaddr.c | ||
herror.c | ||
inet_addr.c | ||
inet_net_ntop.c | ||
inet_net_pton.c | ||
inet_neta.c | ||
inet_ntop.c | ||
inet_pton.c | ||
Makefile | ||
mapv4v6addr.h | ||
mapv4v6hostent.h | ||
netdb.h | ||
ns_date.c | ||
ns_name.c | ||
ns_netint.c | ||
ns_parse.c | ||
ns_print.c | ||
ns_samedomain.c | ||
ns_ttl.c | ||
nsap_addr.c | ||
README | ||
res_comp.c | ||
res_data.c | ||
res_debug.c | ||
res_debug.h | ||
res_hconf.c | ||
res_hconf.h | ||
res_init.c | ||
res_libc.c | ||
res_mkquery.c | ||
res_query.c | ||
res_send.c | ||
res-state.c | ||
resolv.h | ||
tst-aton.c | ||
tst-inet_ntop.c | ||
tst-leaks2.c | ||
tst-leaks.c | ||
tst-res_hconf_reorder.c | ||
Versions |
The resolver in the GNU C Library ********************************* Starting with version 2.2, the resolver in the GNU C Library comes from BIND 8. Only a subset of the src/lib/resolv part of libbind is included here; basically the parts that are needed to provide the functionality present in the resolver from BIND 4.9.7 that was included in the previous release of the GNU C Library, augmented by the parts needed to provide thread-safety. This means that support for things as dynamic DNS updates and TSIG keys isn't included. If you need those facilities, please take a look at the full BIND distribution. Differences =========== The resolver in the GNU C Library still differs from what's in BIND 8.2.3-T5B: * The RES_DEBUG option (`options debug' in /etc/resolv.conf) has been disabled. * The resolver in glibc allows underscores in domain names. * The <resolv.h> header in glibc includes <netinet/in.h> and <arpa/nameser.h> to make it self-contained. * The `res_close' function in glibc only tries to close open files referenced through `_res' if the RES_INIT bit is set in `_res.options'. This fixes a potential security bug with programs that bogusly call `res_close' without initialising the resolver state first. Note that the thread-safe `res_nclose' still doesn't check the RES_INIT bit. By the way, you're not really supposed to call `res_close/res_nclose' directly. * The resolver in glibc can connect to a nameserver over IPv6. Just specify the IPv6 address in /etc/resolv.conf. You cannot change the address of an IPv6 nameserver dynamically in your program though. Using the resolver in multi-threaded code ========================================= The traditional resolver interfaces `res_query', `res_search', `res_mkquery', `res_send' and `res_init', used a static (global) resolver state stored in the `_res' structure. Therefore, these interfaces are not thread-safe. Therefore, BIND 8.2 introduced a set of "new" interfaces `res_nquery', `res_nsearch', `res_nmkquery', `res_nsend' and `res_ninit' that take a `res_state' as their first argument, so you can use a per-thread resolver state. In glibc, when you link with -lpthread, such a per-thread resolver state is already present. It can be accessed using `_res', which has been redefined as a macro, in a similar way to what has been done for the `errno' and `h_errno' variables. This per-thread resolver state is also used for the `gethostby*' family of functions, which means that for example `gethostbyname_r' is now fully thread-safe and re-entrant. The traditional resolver interfaces however, continue to use a single resolver state and are therefore still thread-unsafe. The resolver state is the same resolver state that is used for the initial ("main") thread. This has the following consequences for existing binaries and source code: * Single-threaded programs will continue to work. There should be no user-visible changes when you recompile them. * Multi-threaded programs that use the traditional resolver interfaces in the "main" thread should continue to work, except that they no longer see any changes in the global resolver state caused by calls to, for example, `gethostbyname' in other threads. Again there should be no user-visible changes when you recompile these programs. * Multi-threaded programs that use the traditional resolver interfaces in more than one thread should be just as buggy as before (there are no problems if you use proper locking of course). If you recompile these programs, manipulating the _res structure in threads other than the "main" thread will seem to have no effect though. * In Multi-threaded that manipulate the _res structure, calls to functions like `gethostbyname' in threads other than the "main" thread won't be influenced by the those changes anymore. So if you set RES_USE_INET6, a call to `gethostbyname' won't return any IPv6 hosts anymore. If you recompile such programs, manipulating the _res structure will affect the thread in which you do so instead of the "main" thread. We recommend to use the new thread-safe interfaces in new code, since the traditional interfaces have been deprecated by the BIND folks. For compatibility with other (older) systems you might want to continue to use those interfaces though. Using the resolver in C++ code ============================== There resolver contains some hooks which will allow the user to install some callback functions that make it possible to filter DNS requests and responses. Although we do not encourage you to make use of this facility at all, C++ developers should realise that it isn't safe to throw exceptions from such callback functions. Source code =========== The following files come from the BIND distribution (currently version 8.2.3-T5B): src/include/ arpa/nameser.h arpa/nameser_compat.h resolv.h src/lib/resolv/ herror.c res_comp.c res_data.c res_debug.c res_debug.h res_init.c res_mkquery.c res_query.c res_send.c src/lib/nameser/ ns_name.c ns_netint.c ns_parse.c ns_print.c ns_samedomain.c ns_ttl.c src/lib/inet/ inet_addr.c inet_net_ntop.c inet_net_pton.c inet_neta.c inet_ntop.c inet_pton.c nsap_addr.c src/lib/isc/ base64.c Some of these files have been optimised a bit, and adaptations have been made to make them fit in with the rest of glibc. res_libc.c is home-brewn, although parts of it are taken from res_data.c. res_hconf.c and res_hconf.h were contributed by David Mosberger, and do not come from BIND. The files gethnamaddr.c, mapv4v6addr.h and mapv4v6hostent.h are leftovers from BIND 4.9.7.