mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
87bb6b6c6b
2004-08-04 Jakub Jelinek <jakub@redhat.com> * hesiod/hesiod.c (__hesiod_res_get): Use calloc instead of malloc + memset. (__hesiod_res_set): Free nsaddrs. * include/resolv.h (__res_maybe_init): Add prototype. * resolv/resolv.h (struct __res_state): Add _u._ext.initstamp field. * resolv/Versions (libc): Add __res_maybe_init@@GLIBC_PRIVATE. * resolv/res_libc.c (__res_initstamp, lock): New variables. (res_init): Increase __res_initstamp. (__res_maybe_init): New function. * resolv/res_init.c (__res_vinit): Initialize _u._ext.initstamp. * hesiod/hesiod.c (__hesiod_res_get): Use __res_maybe_init instead of RES_INIT check and {res_ninit,__res_ninit,res_init} call. * sysdeps/posix/getaddrinfo.c (gaih_inet): Likewise. * resolv/nss_dns/dns-host.c (_nss_dns_gethostbyname2_r, _nss_dns_gethostbyaddr_r): Likewise. * resolv/nss_dns/dns-network.c (_nss_dns_getnetbyname_r, _nss_dns_getnetbyaddr_r): Likewise. * resolv/gethnamaddr.c (gethostbyname, gethostbyname2, gethostbyaddr): Likewise. * resolv/res_data.c (fp_nquery, res_mkquery, res_mkupdate, res_isourserver, res_sendsigned, res_update, res_search, res_querydomain): Likewise. * nss/getXXbyYY_r.c (INTERNAL (REENTRANT_NAME)): Likewise. * nss/digits_dots.c (__nss_hostname_digits_dots): Likewise. * nss/getnssent_r.c (__nss_setent, __nss_endent, __nss_getent_r): Likewise. * sysdeps/posix/getaddrinfo.c (gaih_inet): Set ai_family for V4-mapped IPv6 addresses and req->ai_family==AF_INET. Reported by A. Guru <a.guru@sympatico.ca>. * po/pl.po: Likewise. characters than necessary.
66 lines
1.8 KiB
C
66 lines
1.8 KiB
C
#ifndef _RESOLV_H_
|
|
|
|
#define RES_SET_H_ERRNO(r,x) \
|
|
do \
|
|
{ \
|
|
(r)->res_h_errno = x; \
|
|
__set_h_errno(x); \
|
|
} \
|
|
while (0)
|
|
|
|
#include <resolv/resolv.h>
|
|
|
|
#ifdef _RESOLV_H_
|
|
|
|
# ifdef _LIBC_REENTRANT
|
|
# include <tls.h>
|
|
# if USE___THREAD
|
|
# undef _res
|
|
# ifndef NOT_IN_libc
|
|
# define __resp __libc_resp
|
|
# endif
|
|
# define _res (*__resp)
|
|
extern __thread struct __res_state *__resp attribute_tls_model_ie;
|
|
# endif
|
|
# else
|
|
# ifndef __BIND_NOSTATIC
|
|
# undef _res
|
|
extern struct __res_state _res;
|
|
# endif
|
|
# endif
|
|
|
|
/* Now define the internal interfaces. */
|
|
extern int __res_vinit (res_state, int);
|
|
extern int __res_maybe_init (res_state, int);
|
|
extern void _sethtent (int);
|
|
extern void _endhtent (void);
|
|
extern struct hostent *_gethtent (void);
|
|
extern struct hostent *_gethtbyname (const char *__name);
|
|
extern struct hostent *_gethtbyname2 (const char *__name, int __af);
|
|
struct hostent *_gethtbyaddr (const char *addr, size_t __len, int __af);
|
|
extern u_int32_t _getlong (const u_char *__src);
|
|
extern u_int16_t _getshort (const u_char *__src);
|
|
extern void res_pquery (const res_state __statp, const u_char *__msg,
|
|
int __len, FILE *__file);
|
|
extern void res_send_setqhook (res_send_qhook __hook);
|
|
extern void res_send_setrhook (res_send_rhook __hook);
|
|
extern int res_ourserver_p (const res_state __statp,
|
|
const struct sockaddr_in6 *__inp);
|
|
libc_hidden_proto (__res_ninit)
|
|
libc_hidden_proto (__res_maybe_init)
|
|
libc_hidden_proto (__res_nclose)
|
|
libc_hidden_proto (__res_randomid)
|
|
libc_hidden_proto (__res_state)
|
|
|
|
int __libc_res_nquery (res_state, const char *, int, int, u_char *, int,
|
|
u_char **);
|
|
int __libc_res_nsearch (res_state, const char *, int, int, u_char *, int,
|
|
u_char **);
|
|
int __libc_res_nsend (res_state, const u_char *, int, u_char *, int,
|
|
u_char **)
|
|
attribute_hidden;
|
|
|
|
#endif
|
|
|
|
#endif
|