diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2008-08-01 17:16:31 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2008-08-01 17:16:31 +0000 |
| commit | cd5743fdec932002473cf170f57d7a83c8f615d1 (patch) | |
| tree | 12512a12338958cfa81aedb585961473ce4f6b29 /include | |
| parent | 17756df399bdab230152c8ed6591e28a9bed8368 (diff) | |
| download | glibc-cd5743fdec932002473cf170f57d7a83c8f615d1.tar glibc-cd5743fdec932002473cf170f57d7a83c8f615d1.tar.gz glibc-cd5743fdec932002473cf170f57d7a83c8f615d1.tar.bz2 glibc-cd5743fdec932002473cf170f57d7a83c8f615d1.zip | |
* Versions.def: Add GLIBC_2.9 to libresolv.
* include/resolv.h: Remove hidden proto declarations for __ns_*
functions. Add them for __dn_count_labels and __p_secstodate.
* include/arpa/nameser.h: Add a number of hidden proto declarations.
Define ns_msg_getflags macro here.
* resolv/res_debug.c: Add hidden definition for __dn_count_labels
and __p_secstodate.
* resolv/Versions: Export functions from <arpa/nameser.h> from
libresolv in version GLIBC_2.9.
* resolv/ns_name.c: Integrate changes from bind 9.5.0. Add necessary
hidden definitions.
* resolv/ns_netint.c: Likewise.
* resolv/ns_parse.c: Likewise.
* resolv/ns_print.c: Likewise.
* resolv/ns_samedomain.c: Likewise.
* resolv/ns_ttl.c: Likewise.
* resolv/arpa/nameser_compat.h: Likewise.
* resolv/arpa/nameser.h: Likewise. Remove macros which redirect
function calls.
* resolv/nss_dns/dns-canon.c (_nss_dns_getcanonname_r): Use __ns_get16
instead of ns_get16.
* resolv/nss_dns/dns-host.c (getanswer_r): Use __ns_get16 and
__ns_get32 instead of ns_get16 and ns_get32 respectively.
(gaih_getanswer_slice): Likewise.
* resolv/Makefile (libresolv-routines): Add ns_date.
* resolv/ns_date.c: New file.
Diffstat (limited to 'include')
| -rw-r--r-- | include/arpa/nameser.h | 29 | ||||
| -rw-r--r-- | include/resolv.h | 6 |
2 files changed, 30 insertions, 5 deletions
diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h index efbe956602..89ee6b031c 100644 --- a/include/arpa/nameser.h +++ b/include/arpa/nameser.h @@ -7,7 +7,7 @@ #include <stdint.h> #include <netinet/in.h> -extern struct _ns_flagdata _ns_flagdata[] attribute_hidden; +extern const struct _ns_flagdata _ns_flagdata[] attribute_hidden; #if _STRING_ARCH_unaligned @@ -44,3 +44,30 @@ extern struct _ns_flagdata _ns_flagdata[] attribute_hidden; } while (0) #endif + +extern u_int __ns_get16 (const u_char *) __THROW; +extern u_long __ns_get32 (const u_char *) __THROW; + +#define ns_msg_getflag(handle, flag) \ + (((handle)._flags & _ns_flagdata[flag].mask) >> _ns_flagdata[flag].shift) + +libresolv_hidden_proto (ns_get16) +libresolv_hidden_proto (ns_get32) +libresolv_hidden_proto (ns_put16) +libresolv_hidden_proto (ns_put32) +libresolv_hidden_proto (ns_initparse) +libresolv_hidden_proto (ns_skiprr) +libresolv_hidden_proto (ns_parserr) +libresolv_hidden_proto (ns_name_ntop) +libresolv_hidden_proto (ns_name_pton) +libresolv_hidden_proto (ns_name_pack) +libresolv_hidden_proto (ns_name_skip) +libresolv_hidden_proto (ns_name_unpack) +libresolv_hidden_proto (ns_name_compress) +libresolv_hidden_proto (ns_name_uncompress) +libresolv_hidden_proto (ns_sprintrr) +libresolv_hidden_proto (ns_sprintrrf) +libresolv_hidden_proto (ns_samedomain) +libresolv_hidden_proto (ns_samename) +libresolv_hidden_proto (ns_makecanon) +libresolv_hidden_proto (ns_format_ttl) diff --git a/include/resolv.h b/include/resolv.h index 6dae0495b2..7ab7f8779d 100644 --- a/include/resolv.h +++ b/include/resolv.h @@ -98,11 +98,9 @@ libresolv_hidden_proto (__res_nameinquery) libresolv_hidden_proto (__res_queriesmatch) libresolv_hidden_proto (__res_nsend) libresolv_hidden_proto (__b64_ntop) -libresolv_hidden_proto (__ns_name_ntop) -libresolv_hidden_proto (__ns_name_unpack) -libresolv_hidden_proto (__ns_get16) -libresolv_hidden_proto (__ns_get32) libresolv_hidden_proto (__res_nopt) +libresolv_hidden_proto (__dn_count_labels) +libresolv_hidden_proto (__p_secstodate) extern const char *_res_opcodes[]; libresolv_hidden_proto (_res_opcodes) |