generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am c6135ba7: Merge "Change how DNS resolver handle no default iface"

Browse Source 
* commit 'c6135ba76db027d85751f84bf648a865609c0e1b':
  Change how DNS resolver handle no default iface
This commit is contained in:
Robert Greenwalt 2013-08-24 05:40:18 -07:00 committed by Android Git Automerger
commit 937c374225
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libc/netbsd/net/getaddrinfo.c
View File

@ -1874,10 +1874,10 @@ static bool _using_default_dns(const char *iface)
if (iface == NULL || *iface == '\0') return true;
if_len = _resolv_get_default_iface(buf, sizeof(buf));
if (if_len + 1 <= sizeof(buf)) {
if (strcmp(buf, iface) != 0) return false;
if (if_len != 0 && if_len + 1 <= sizeof(buf)) {
if (strcmp(buf, iface) == 0) return true;
}
return true;
return false;
}
/*ARGSUSED*/

16
libc/netbsd/resolv/res_cache.c
View File

@ -2426,18 +2426,16 @@ _resolv_get_default_iface(char* buff, int buffLen)
ifname = _get_default_iface_locked(); // never null, but may be empty
// if default interface not set. Get first cache with an interface
// if default interface not set give up.
if (ifname[0] == '\0') {
ifname = _find_any_iface_name_locked(); // may be null
pthread_mutex_unlock(&_res_cache_list_lock);
return 0;
}
// if we got the default iface or if (no-default) the find_any call gave an answer
if (ifname) {
len = strlen(ifname);
if (len < buffLen) {
strncpy(buff, ifname, len);
buff[len] = '\0';
}
len = strlen(ifname);
if (len < buffLen) {
strncpy(buff, ifname, len);
buff[len] = '\0';
} else {
buff[0] = '\0';
}