resolv: Do not copy IPv4 addresses to IPv6 address array
get_nsaddr already prefers IPv4 addresses if they are present
(af_family != 0). If we ensure that nssocks is initialized to -1
and sockets are closed even without an allocated server address,
there is no need to make these copies anymore.
2017-06-29 Florian Weimer <fweimer@redhat.com>
* resolv/bits/types/res_state.h (struct __res_state): Rename
_u._ext.nscount to _u._ext.__glibc_unused_nscount.
* resolv/res_init.c (res_vinit): Adjust. Initialize nssocks
member.
* resolv/res_send.c (__libc_res_nsend): Do not copy IPv4
nameserver addresses.
* resolv/res-close.c (__res_iclose): Close sockets even if the
name server address has not been allocated.
* support/resolv_test.c (resolv_test_start): Do not clear
_res._u._ext.nscount because it is unused.
@@ -40,7 +40,7 @@ struct __res_state {
union {
char pad[52]; /* On an i386 this means 512b total. */
struct {
- uint16_t nscount;
+ uint16_t __glibc_unused_nscount;
uint16_t nsmap[MAXNS];
int nssocks[MAXNS];
uint16_t nscount6;
@@ -97,19 +97,18 @@ __res_iclose (res_state statp, bool free_addr)
statp->_flags &= ~(RES_F_VC | RES_F_CONN);
}
for (int ns = 0; ns < statp->nscount; ns++)
- if (statp->_u._ext.nsaddrs[ns] != NULL)
- {
- if (statp->_u._ext.nssocks[ns] != -1)
- {
- close_not_cancel_no_status (statp->_u._ext.nssocks[ns]);
- statp->_u._ext.nssocks[ns] = -1;
- }
- if (free_addr)
- {
- free (statp->_u._ext.nsaddrs[ns]);
- statp->_u._ext.nsaddrs[ns] = NULL;
- }
- }
+ {
+ if (statp->_u._ext.nssocks[ns] != -1)
+ {
+ close_not_cancel_no_status (statp->_u._ext.nssocks[ns]);
+ statp->_u._ext.nssocks[ns] = -1;
+ }
+ if (free_addr)
+ {
+ free (statp->_u._ext.nsaddrs[ns]);
+ statp->_u._ext.nsaddrs[ns] = NULL;
+ }
+ }
}
libc_hidden_def (__res_iclose)
@@ -155,9 +155,12 @@ res_vinit_1 (res_state statp, bool preinit, FILE *fp, char **buffer)
statp->_flags = 0;
statp->__glibc_unused_qhook = NULL;
statp->__glibc_unused_rhook = NULL;
- statp->_u._ext.nscount = 0;
+ statp->_u._ext.__glibc_unused_nscount = 0;
for (int n = 0; n < MAXNS; n++)
- statp->_u._ext.nsaddrs[n] = NULL;
+ {
+ statp->_u._ext.nsaddrs[n] = NULL;
+ statp->_u._ext.nssocks[n] = -1;
+ }
/* Allow user to override the local domain definition. */
if ((cp = getenv ("LOCALDOMAIN")) != NULL)
@@ -328,7 +331,6 @@ res_vinit_1 (res_state statp, bool preinit, FILE *fp, char **buffer)
statp->nsaddr_list[nserv].sin_family = 0;
statp->_u._ext.nsaddrs[nserv] = sa6;
- statp->_u._ext.nssocks[nserv] = -1;
have_serv6 = true;
nserv++;
}
@@ -373,54 +373,6 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen,
terrno = ETIMEDOUT;
/*
- * If the ns_addr_list in the resolver context has changed, then
- * invalidate our cached copy and the associated timing data.
- */
- if (EXT(statp).nscount != 0) {
- int needclose = 0;
-
- if (EXT(statp).nscount != statp->nscount)
- needclose++;
- else
- for (ns = 0; ns < statp->nscount; ns++) {
- if (statp->nsaddr_list[ns].sin_family != 0
- && !sock_eq((struct sockaddr_in6 *)
- &statp->nsaddr_list[ns],
- EXT(statp).nsaddrs[ns]))
- {
- needclose++;
- break;
- }
- }
- if (needclose) {
- __res_iclose(statp, false);
- EXT(statp).nscount = 0;
- }
- }
-
- /*
- * Maybe initialize our private copy of the ns_addr_list.
- */
- if (EXT(statp).nscount == 0) {
- for (ns = 0; ns < statp->nscount; ns++) {
- EXT(statp).nssocks[ns] = -1;
- if (statp->nsaddr_list[ns].sin_family == 0)
- continue;
- if (EXT(statp).nsaddrs[ns] == NULL)
- EXT(statp).nsaddrs[ns] =
- malloc(sizeof (struct sockaddr_in6));
- if (EXT(statp).nsaddrs[ns] != NULL)
- memset (mempcpy(EXT(statp).nsaddrs[ns],
- &statp->nsaddr_list[ns],
- sizeof (struct sockaddr_in)),
- '\0',
- sizeof (struct sockaddr_in6)
- - sizeof (struct sockaddr_in));
- }
- EXT(statp).nscount = statp->nscount;
- }
-
- /*
* Some resolvers want to even out the load on their nameservers.
* Note that RES_BLAST overrides RES_ROTATE.
*/
@@ -1103,7 +1103,6 @@ resolv_test_start (struct resolv_redirect_config config)
/* Disable IPv6 name server addresses. The code below only
overrides the IPv4 addresses. */
__res_iclose (&_res, true);
- _res._u._ext.nscount = 0;
/* Redirect queries to the server socket. */
if (test_verbose)