diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2008-08-02 08:26:10 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2008-08-02 08:26:10 +0000 |
| commit | 2fb513c60061821c7e5e7fb6014d2afd0308b7e9 (patch) | |
| tree | c7d9546bed03277ec2921a1b2cbda1f78620450b /include | |
| parent | c7045198ca8f4ff5b97205340d51127f8503c2bd (diff) | |
Updated to fedora-glibc-20080802T0809cvs/fedora-glibc-2_8_90-11
Diffstat (limited to 'include')
| -rw-r--r-- | include/arpa/nameser.h | 37 | ||||
| -rw-r--r-- | include/resolv.h | 6 |
2 files changed, 36 insertions, 7 deletions
diff --git a/include/arpa/nameser.h b/include/arpa/nameser.h index efbe956602..57f7457848 100644 --- a/include/arpa/nameser.h +++ b/include/arpa/nameser.h @@ -1,3 +1,5 @@ +#ifndef _ARPA_NAMESER_H_ + #include <resolv/arpa/nameser.h> /* If the machine allows unaligned access we can do better than using @@ -7,14 +9,14 @@ #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 # undef NS_GET16 # define NS_GET16(s, cp) \ do { \ - uint16_t *t_cp = (uint16_t *) (cp); \ + const uint16_t *t_cp = (const uint16_t *) (cp); \ (s) = ntohs (*t_cp); \ (cp) += NS_INT16SZ; \ } while (0) @@ -22,7 +24,7 @@ extern struct _ns_flagdata _ns_flagdata[] attribute_hidden; # undef NS_GET32 # define NS_GET32(l, cp) \ do { \ - uint32_t *t_cp = (uint32_t *) (cp); \ + const uint32_t *t_cp = (const uint32_t *) (cp); \ (l) = ntohl (*t_cp); \ (cp) += NS_INT32SZ; \ } while (0) @@ -44,3 +46,32 @@ 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) + +#endif 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) |