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

dns: fix dns failed when ipv4/6 dual stack enable

Browse Source 
The ipv6 address filled the cache, and the ipv4 address did not have a
place to store it, causing the resolution to fail. so if IPV6 has already
filled the buffer, rewrite ipv4 DNS results from half of the buffer.

Signed-off-by: zhanghongyu <zhanghongyu@xiaomi.com>
This commit is contained in:
zhanghongyu 2023-09-13 14:33:19 +08:00 committed by Xiang Xiao
parent 4f25c287d2
commit a41f68da84
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -712,6 +712,11 @@ static int dns_query_callback(FAR void *arg, FAR struct sockaddr *addr,
{ {
/* Obtain the IPv4 response */ /* Obtain the IPv4 response */
if (next >= *query->naddr)
{
next = *query->naddr / 2;
}
ret = dns_recv_response(sd, &query->addr[next], ret = dns_recv_response(sd, &query->addr[next],
*query->naddr - next, &qdata->qinfo, *query->naddr - next, &qdata->qinfo,
&query->ttl, qdata->buffer); &query->ttl, qdata->buffer);

8
libs/libc/netdb/lib_gethostentbynamer.c
View File

@ -502,16 +502,16 @@ static int lib_dns_lookup(FAR const char *name, FAR struct hostent_s *host,
naddr = (buflen - (namelen + 1)) / sizeof(union dns_addr_u); naddr = (buflen - (namelen + 1)) / sizeof(union dns_addr_u);
DEBUGASSERT(naddr >= 1); DEBUGASSERT(naddr >= 1);
/* We can read more than maximum, limit here. */
naddr = MIN(naddr, CONFIG_NETDB_MAX_IPADDR);
ret = lib_dns_query(name, (FAR union dns_addr_u *)ptr, &naddr); ret = lib_dns_query(name, (FAR union dns_addr_u *)ptr, &naddr);
if (ret < 0) if (ret < 0)
{ {
return ret; return ret;
} }
/* We can read more than maximum, limit here. */
naddr = MIN(naddr, CONFIG_NETDB_MAX_IPADDR);
for (i = 0; i < naddr; i++) for (i = 0; i < naddr; i++)
{ {
#ifdef CONFIG_NET_IPv4 #ifdef CONFIG_NET_IPv4