sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libc/netdb: query IPv6 first than IPv4

Browse Source 
since some host have multiple IPv4 address, the dns cache may fill in all
Ipv4 address and refuse to accept any IPv6 address if we query IPv4 first

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
Change-Id: I229a7a524fb9daa7498c66913a2de61f11d6fb43
This commit is contained in:
Xiang Xiao 2020-04-01 17:20:13 +08:00 committed by patacongo
parent 0b662d60fc
commit 4addf6c308
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
libs/libc/netdb/lib_dnsquery.c
View File

@ -581,35 +581,6 @@ static int dns_query_callback(FAR void *arg, FAR struct sockaddr *addr,
for (retries = 0; retries < CONFIG_NETDB_DNSCLIENT_RETRIES; retries++)
{
#ifdef CONFIG_NET_IPv4
/* Send the IPv4 query */
ret = dns_send_query(query->sd, query->hostname,
(FAR union dns_addr_u *)addr,
DNS_RECTYPE_A, &qinfo);
if (ret < 0)
{
nerr("ERROR: IPv4 dns_send_query failed: %d\n", ret);
query->result = ret;
}
else
{
/* Obtain the IPv4 response */
ret = dns_recv_response(query->sd, &query->addr[next],
*query->naddr - next, &qinfo);
if (ret >= 0)
{
next += ret;
}
else
{
nerr("ERROR: IPv4 dns_recv_response failed: %d\n", ret);
query->result = ret;
}
}
#endif /* CONFIG_NET_IPv4 */
#ifdef CONFIG_NET_IPv6
/* Send the IPv6 query */
@ -639,6 +610,35 @@ static int dns_query_callback(FAR void *arg, FAR struct sockaddr *addr,
}
#endif
#ifdef CONFIG_NET_IPv4
/* Send the IPv4 query */
ret = dns_send_query(query->sd, query->hostname,
(FAR union dns_addr_u *)addr,
DNS_RECTYPE_A, &qinfo);
if (ret < 0)
{
nerr("ERROR: IPv4 dns_send_query failed: %d\n", ret);
query->result = ret;
}
else
{
/* Obtain the IPv4 response */
ret = dns_recv_response(query->sd, &query->addr[next],
*query->naddr - next, &qinfo);
if (ret >= 0)
{
next += ret;
}
else
{
nerr("ERROR: IPv4 dns_recv_response failed: %d\n", ret);
query->result = ret;
}
}
#endif /* CONFIG_NET_IPv4 */
if (next > 0)
{
#if CONFIG_NETDB_DNSCLIENT_ENTRIES > 0