From 0420d8885a4889dca3b874c934fd5f42f2e99e5f Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 17 Oct 2002 21:51:21 +0000 Subject: Update. 2002-10-15 Jakub Jelinek * include/resolv.h (__libc_res_nquery, __libc_res_nsearch, __libc_res_nsend): New prototypes. * resolv/res_query.c (QUERYSIZE): Define. (__libc_res_nquery): Renamed from res_nquery. Added answerp argument. Allocate only QUERYSIZE bytes first, if res_nmkquery fails use MAXPACKET buffer. Call __libc_res_nsend instead of res_nsend, pass answerp. (res_nquery): Changed into wrapper around __libc_res_nquery. (__libc_res_nsearch): Renamed from res_nsearch. Added answerp argument. Call __libc_res_nquerydomain and __libc_res_nquery instead of the non-__libc_ variants, pass them answerp. (res_nsearch): Changed into wrapper around __libc_res_nsearch. (__libc_res_nquerydomain): Renamed from res_nquerydomain. Added answerp argument. Call __libc_res_nquery instead of res_nquery, pass answerp. (res_nquerydomain): Changed into wrapper around __libc_res_nquerydomain. * resolv/res_send.c: Include sys/ioctl.h. (MAXPACKET): Define. (send_vc): Change arguments. Reallocate answer buffer if it is too small. (send_dg): Likewise. (__libc_res_nsend): Renamed from res_nsend. Added ansp argument. Reallocate answer buffer if it is too small and hooks are in use. Adjust calls to send_vc and send_dg. (res_nsend): Changed into wrapper around __libc_res_nsend. * resolv/nss_dns/dns-host.c (_nss_dns_gethostbyname2_r): Allocate just 1K answer buffer on the stack, use __libc_res_nsearch instead of res_nsearch. (_nss_dns_gethostbyaddr_r): Similarly with __libc_res_nquery. * resolv/nss_dns/dns-network.c (_nss_dns_getnetbyaddr_r): Likewise. (_nss_dns_getnetbyname_r): Similarly with __libc_res_nsearch. * resolv/gethnamaddr.c (gethostbyname2): Likewise. (gethostbyaddr): Similarly with __libc_res_nquery. * resolv/Versions (libresolv): Export __libc_res_nquery and __libc_res_nsearch at GLIBC_PRIVATE. --- resolv/nss_dns/dns-network.c | 50 +++++++++++++------------------------------- 1 file changed, 14 insertions(+), 36 deletions(-) (limited to 'resolv/nss_dns/dns-network.c') diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c index 9a366aca65..5956c84382 100644 --- a/resolv/nss_dns/dns-network.c +++ b/resolv/nss_dns/dns-network.c @@ -110,8 +110,8 @@ _nss_dns_getnetbyname_r (const char *name, struct netent *result, int *herrnop) { /* Return entry for network with NAME. */ - querybuf *net_buffer; - int anslen, use_malloc = 0; + querybuf *net_buffer, *orig_net_buffer; + int anslen; char *qbuf; enum nss_status status; @@ -120,26 +120,15 @@ _nss_dns_getnetbyname_r (const char *name, struct netent *result, qbuf = strdupa (name); - if (!__libc_use_alloca (MAXPACKET)) - { - net_buffer = (querybuf *) malloc (sizeof (querybuf)); - if (net_buffer == NULL) - { - *errnop = ENOMEM; - return NSS_STATUS_UNAVAIL; - } - use_malloc = 1; - } - else - net_buffer = (querybuf *) alloca (sizeof (querybuf)); + net_buffer = orig_net_buffer = (querybuf *) alloca (1024); - anslen = res_nsearch (&_res, qbuf, C_IN, T_PTR, net_buffer->buf, - sizeof (net_buffer->buf)); + anslen = __libc_res_nsearch (&_res, qbuf, C_IN, T_PTR, net_buffer->buf, + 1024, (u_char **) &net_buffer); if (anslen < 0) { /* Nothing found. */ *errnop = errno; - if (use_malloc) + if (net_buffer != orig_net_buffer) free (net_buffer); return (errno == ECONNREFUSED || errno == EPFNOSUPPORT @@ -148,7 +137,7 @@ _nss_dns_getnetbyname_r (const char *name, struct netent *result, } status = getanswer_r (net_buffer, anslen, result, buffer, buflen, BYNAME); - if (use_malloc) + if (net_buffer != orig_net_buffer) free (net_buffer); return status; } @@ -161,10 +150,10 @@ _nss_dns_getnetbyaddr_r (uint32_t net, int type, struct netent *result, { /* Return entry for network with NAME. */ enum nss_status status; - querybuf *net_buffer; + querybuf *net_buffer, *orig_net_buffer; unsigned int net_bytes[4]; char qbuf[MAXDNAME]; - int cnt, anslen, use_malloc = 0; + int cnt, anslen; u_int32_t net2; int olderr = errno; @@ -201,27 +190,16 @@ _nss_dns_getnetbyaddr_r (uint32_t net, int type, struct netent *result, break; } - if (!__libc_use_alloca (MAXPACKET)) - { - net_buffer = (querybuf *) malloc (sizeof (querybuf)); - if (net_buffer == NULL) - { - *errnop = ENOMEM; - return NSS_STATUS_UNAVAIL; - } - use_malloc = 1; - } - else - net_buffer = (querybuf *) alloca (sizeof (querybuf)); + net_buffer = orig_net_buffer = (querybuf *) alloca (1024); - anslen = res_nquery (&_res, qbuf, C_IN, T_PTR, net_buffer->buf, - sizeof (net_buffer->buf)); + anslen = __libc_res_nquery (&_res, qbuf, C_IN, T_PTR, net_buffer->buf, + 1024, (u_char **) &net_buffer); if (anslen < 0) { /* Nothing found. */ int err = errno; __set_errno (olderr); - if (use_malloc) + if (net_buffer != orig_net_buffer) free (net_buffer); return (err == ECONNREFUSED || err == EPFNOSUPPORT @@ -230,7 +208,7 @@ _nss_dns_getnetbyaddr_r (uint32_t net, int type, struct netent *result, } status = getanswer_r (net_buffer, anslen, result, buffer, buflen, BYADDR); - if (use_malloc) + if (net_buffer != orig_net_buffer) free (net_buffer); if (status == NSS_STATUS_SUCCESS) { -- cgit v1.2.3