rainlance/c-ares
1
0
Fork 0
mirror of https://frontier.innolan.net/rainlance/c-ares.git synced 2025-10-06 04:39:42 +00:00
Code Releases Activity

Android: small changes to dns property part.

Browse Source 
Prefix prop vars; kill var; use DNS_PROP_NAME_PREFIX macro.
This commit is contained in:
Guenter Knauf
2012-04-20 20:42:41 +02:00
parent b3afe9cbde
commit 05346c25cb
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ares_init.c
View File

@ -62,7 +62,9 @@
#if defined(ANDROID) || defined(__ANDROID__)
#include <sys/system_properties.h>
#define MAX_DNS_PROPERTIES 8 /* From the Bionic sources */
/* From the Bionic sources */
#define DNS_PROP_NAME_PREFIX "net.dns"
#define MAX_DNS_PROPERTIES 8
#endif
#include "ares.h"
@ -955,17 +957,16 @@ DhcpNameServer
#elif defined(ANDROID) || defined(__ANDROID__)
unsigned int i;
char name[PROP_NAME_MAX];
char value[PROP_VALUE_MAX]="";
int len;
char propname[PROP_NAME_MAX];
char propvalue[PROP_VALUE_MAX]="";
for (i = 1; i <= MAX_DNS_PROPERTIES; i++) {
snprintf(name, sizeof(name), "net.dns%u", i);
len = __system_property_get(name, value);
if (len < 1) {
snprintf(propname, sizeof(propname), "%s%u", DNS_PROP_NAME_PREFIX, i);
if (__system_property_get(propname, propvalue) < 1) {
status = ARES_EOF;
break;
}
status = config_nameserver(&servers, &nservers, value);
status = config_nameserver(&servers, &nservers, propvalue);
if (status != ARES_SUCCESS)
break;
status = ARES_EOF;