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

resolved conflicts for merge of 937c3742 to klp-dev-plus-aosp

Browse Source 
Change-Id: I4c0ad42ea3802cd232c80e5589af8a8e25f88a60
This commit is contained in:
Robert Greenwalt 2013-08-24 08:21:41 -07:00
commit e5911f3128
2 changed files with 10 additions and 13 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*/

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

@ -2603,19 +2603,16 @@ _resolv_get_default_iface(char* buff, size_t buffLen)
char* ifname = _get_default_iface_locked(); // never null, but may be empty char* 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;
} }
size_t len = 0; size_t len = strlen(ifname);
// if we got the default iface or if (no-default) the find_any call gave an answer if (len < buffLen) {
if (ifname) { strncpy(buff, ifname, len);
len = strlen(ifname); buff[len] = '\0';
if (len < buffLen) {
strncpy(buff, ifname, len);
buff[len] = '\0';
}
} else { } else {
buff[0] = '\0'; buff[0] = '\0';
} }