tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Change how DNS resolver handle no default iface"

Browse source
This commit is contained in:
Robert Greenwalt 2013-08-24 12:35:08 +00:00 committed by Gerrit Code Review
commit c6135ba76d
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 (iface == NULL || *iface == '\0') return true;
if_len = _resolv_get_default_iface(buf, sizeof(buf)); if_len = _resolv_get_default_iface(buf, sizeof(buf));
if (if_len + 1 <= sizeof(buf)) { if (if_len != 0 && if_len + 1 <= sizeof(buf)) {
if (strcmp(buf, iface) != 0) return false; if (strcmp(buf, iface) == 0) return true;
} }
return true; return false;
} }
/*ARGSUSED*/ /*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 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') { 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 len = strlen(ifname);
if (ifname) { if (len < buffLen) {
len = strlen(ifname); strncpy(buff, ifname, len);
if (len < buffLen) { buff[len] = '\0';
strncpy(buff, ifname, len);
buff[len] = '\0';
}
} else { } else {
buff[0] = '\0'; buff[0] = '\0';
} }