mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
176804300b
conform/ namespace tests of arpa/inet.h, netdb.h and netinet/in.h fail for UNIX98 and XPG42 because of inclusion of stdint.h, which defines macros not permitted in those headers for those standards. UNIX98 allows them to include inttypes.h, but (predating C99) has restricted inttypes.h contents (not yet tested in the conform/ tests) not including those macros; XPG4.2 has no such permission and no inttypes.h / stdint.h at all. This patch rearranges the headers to avoid this issue. intN_t definitions move to bits/stdint-intn.h, and uintN_t definitions to bits/stdint-uintn.h. (These are not bits/types/ headers because they each define four types. They are separate rather than just a single header because sys/types.h defines intN_t but u_intN_t rather than uintN_t - and while sys/types.h could define uintN_t because of the POSIX reservation of *_t, existing practice there is largely to condition types on appropriate feature test macros, and indeed there is at least one open bug report (14553) about a type that's not so-conditioned, so maybe types there should actually have conditions added where appropriate.) The affected network headers are then made to include bits/stdint-uintn.h instead of stdint.h. This allows six XFAILs to be removed. This doesn't do anything about inttypes.h defining more than it should for UNIX98, but we don't have conformtest expectations for that case at present (and my inclination is that a fix for that should be as local as possible - affecting only inttypes.h, not stdint.h, only for the case of __USE_UNIX98 && !__USE_ISOC99). Tested for x86_64. [BZ #21455] * bits/stdint-intn.h: New file. * bits/stdint-uintn.h: Likewise. * stdlib/Makefile (headers): Add bits/stdint-intn.h and bits/stdint-uintn.h. * inet/netinet/in.h: Include <bits/stdint-uintn.h> instead of <stdint.h>. * posix/sys/types.h: Include <bits/stdint-intn.h>. (__int8_t_defined): Do not define here. (int8_t): Likewise. (int16_t): Likewise. (int32_t): Likewise. (int64_t): Likewise. [__GNUC_PREREQ (2, 7)] (__intN_t): Likewise. * resolv/netdb.h: Include <bits/stdint-uintn.h> instead of <stdint.h>. * include/netdb.h [_ISOMAC]: Do not include <stdint.h>. * sysdeps/generic/stdint.h: Include <bits/stdint-intn.h> and <bits/stdint-uintn.h>. (int8_t): Do not define here. (int16_t): Likewise. (int32_t): Likewise. (int64_t): Likewise. (uint8_t): Likewise. (uint16_t): Likewise. (uint32_t): Likewise. (uint64_t): Likewise. * conform/Makefile (test-xfail-XPG42/arpa/inet.h/conform): Remove variable. (test-xfail-XPG42/netdb.h/conform): Likewise. (test-xfail-XPG42/netinet/in.h/conform): Likewise. (test-xfail-UNIX98/arpa/inet.h/conform): Likewise. (test-xfail-UNIX98/netdb.h/conform): Likewise. (test-xfail-UNIX98/netinet/in.h/conform): Likewise. |
||
---|---|---|
.. | ||
arpa | ||
nss_dns | ||
rpc | ||
sys | ||
Banner | ||
base64.c | ||
compat-gethnamaddr.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 | ||
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-internal.h | ||
resolv.h | ||
tst-aton.c | ||
tst-bug18665-tcp.c | ||
tst-bug18665.c | ||
tst-inet_ntop.c | ||
tst-leaks2.c | ||
tst-leaks.c | ||
tst-ns_name_compress.c | ||
tst-ns_name.c | ||
tst-ns_name.data | ||
tst-res_hconf_reorder.c | ||
tst-res_use_inet6.c | ||
tst-resolv-basic.c | ||
tst-resolv-canonname.c | ||
tst-resolv-edns.c | ||
tst-resolv-network.c | ||
tst-resolv-qtypes.c | ||
tst-resolv-search.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. 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.