nuttx/nuttx-mirror
1
2
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-01-13 02:48:37 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 5d227b43d9 into a2d4d74af7

Browse source
This commit is contained in:
yjq91115 2025-01-12 16:53:52 +08:00 committed by GitHub
commit 37f862c3db
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 88 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libs/libc/netdb/Kconfig
View file

@ -237,6 +237,13 @@ config NETDB_DNSSERVER_IPv4ADDR
Default DNS server IPv4 address in host byte order. Default value Default DNS server IPv4 address in host byte order. Default value
10.0.0.1. This may be changed via dns_add_nameserver(). 10.0.0.1. This may be changed via dns_add_nameserver().
config NETDB_DNS_STREAM
bool "DNS supports TCP transmission"
depends on LIBC_NETDB
default n
---help---
Enable support for DNS Name resolution over TCP.
if NETDB_DNSSERVER_IPv6 if NETDB_DNSSERVER_IPv6
config NETDB_DNSSERVER_IPv6ADDR_1 config NETDB_DNSSERVER_IPv6ADDR_1

4
libs/libc/netdb/lib_dns.h
View file

@ -170,7 +170,11 @@ void dns_restorelock(unsigned int count);
* *
****************************************************************************/ ****************************************************************************/
#ifndef CONFIG_NETDB_DNS_STREAM
int dns_bind(sa_family_t family);
#else
int dns_bind(sa_family_t family, bool stream); int dns_bind(sa_family_t family, bool stream);
#endif
/**************************************************************************** /****************************************************************************
* Name: dns_query * Name: dns_query

12
libs/libc/netdb/lib_dnsbind.c
View file

@ -63,16 +63,28 @@
* *
****************************************************************************/ ****************************************************************************/
#ifndef CONFIG_NETDB_DNS_STREAM
int dns_bind(sa_family_t family)
#else
int dns_bind(sa_family_t family, bool stream) int dns_bind(sa_family_t family, bool stream)
#endif
{ {
#ifdef CONFIG_NETDB_DNS_STREAM
int stype = stream ? SOCK_STREAM : SOCK_DGRAM; int stype = stream ? SOCK_STREAM : SOCK_DGRAM;
#endif
struct timeval tv; struct timeval tv;
int sd; int sd;
int ret; int ret;
/* Create a new socket */ /* Create a new socket */
#ifndef CONFIG_NETDB_DNS_STREAM
sd = socket(family, SOCK_DGRAM | SOCK_CLOEXEC, 0);
#else
sd = socket(family, stype | SOCK_CLOEXEC, 0); sd = socket(family, stype | SOCK_CLOEXEC, 0);
#endif
if (sd < 0) if (sd < 0)
{ {
ret = -get_errno(); ret = -get_errno();

67
libs/libc/netdb/lib_dnsquery.c
View file

@ -124,6 +124,7 @@ struct dns_query_data_s
* *
****************************************************************************/ ****************************************************************************/
#ifdef CONFIG_NETDB_DNS_STREAM
static ssize_t stream_send(int fd, FAR const void *buf, size_t len) static ssize_t stream_send(int fd, FAR const void *buf, size_t len)
{ {
ssize_t total = 0; ssize_t total = 0;
@ -292,6 +293,7 @@ static ssize_t stream_recv_record(int fd, FAR void *buf, size_t len)
return ret; return ret;
} }
#endif
/**************************************************************************** /****************************************************************************
* Name: dns_parse_name * Name: dns_parse_name
@ -380,11 +382,18 @@ static inline uint16_t dns_alloc_id(void)
* *
****************************************************************************/ ****************************************************************************/
#ifndef CONFIG_NETDB_DNS_STREAM
static int dns_send_query(int sd, FAR const char *name,
FAR union dns_addr_u *uaddr, uint16_t rectype,
FAR struct dns_query_info_s *qinfo,
FAR uint8_t *buffer)
#else
static int dns_send_query(int sd, FAR const char *name, static int dns_send_query(int sd, FAR const char *name,
FAR union dns_addr_u *uaddr, uint16_t rectype, FAR union dns_addr_u *uaddr, uint16_t rectype,
FAR struct dns_query_info_s *qinfo, FAR struct dns_query_info_s *qinfo,
FAR uint8_t *buffer, FAR uint8_t *buffer,
bool stream) bool stream)
#endif
{ {
FAR struct dns_header_s *hdr; FAR struct dns_header_s *hdr;
FAR uint8_t *dest; FAR uint8_t *dest;
@ -488,11 +497,13 @@ static int dns_send_query(int sd, FAR const char *name,
return ret; return ret;
} }
#ifdef CONFIG_NETDB_DNS_STREAM
if (stream) if (stream)
{ {
ret = stream_send_record(sd, buffer, dest - buffer); ret = stream_send_record(sd, buffer, dest - buffer);
} }
else else
#endif
{ {
ret = send(sd, buffer, dest - buffer, 0); ret = send(sd, buffer, dest - buffer, 0);
} }
@ -519,10 +530,16 @@ static int dns_send_query(int sd, FAR const char *name,
* *
****************************************************************************/ ****************************************************************************/
#ifndef CONFIG_NETDB_DNS_STREAM
static int dns_recv_response(int sd, FAR union dns_addr_u *addr, int naddr,
FAR struct dns_query_info_s *qinfo,
FAR uint32_t *ttl, FAR uint8_t *buffer)
#else
static int dns_recv_response(int sd, FAR union dns_addr_u *addr, int naddr, static int dns_recv_response(int sd, FAR union dns_addr_u *addr, int naddr,
FAR struct dns_query_info_s *qinfo, FAR struct dns_query_info_s *qinfo,
FAR uint32_t *ttl, FAR uint8_t *buffer, FAR uint32_t *ttl, FAR uint8_t *buffer,
bool stream, bool *should_try_stream) bool stream, bool *should_try_stream)
#endif
{ {
FAR uint8_t *nameptr; FAR uint8_t *nameptr;
FAR uint8_t *namestart; FAR uint8_t *namestart;
@ -543,11 +560,13 @@ static int dns_recv_response(int sd, FAR union dns_addr_u *addr, int naddr,
/* Receive the response */ /* Receive the response */
#ifdef CONFIG_NETDB_DNS_STREAM
if (stream) if (stream)
{ {
ret = stream_recv_record(sd, buffer, RECV_BUFFER_SIZE); ret = stream_recv_record(sd, buffer, RECV_BUFFER_SIZE);
} }
else else
#endif
{ {
ret = recv(sd, buffer, RECV_BUFFER_SIZE, 0); ret = recv(sd, buffer, RECV_BUFFER_SIZE, 0);
} }
@ -579,6 +598,7 @@ static int dns_recv_response(int sd, FAR union dns_addr_u *addr, int naddr,
/* Check for error */ /* Check for error */
#ifdef CONFIG_NETDB_DNS_STREAM
if ((hdr->flags1 & DNS_FLAG1_TRUNC) != 0) if ((hdr->flags1 & DNS_FLAG1_TRUNC) != 0)
{ {
/* RFC 2181 /* RFC 2181
@ -601,6 +621,7 @@ static int dns_recv_response(int sd, FAR union dns_addr_u *addr, int naddr,
*should_try_stream = true; *should_try_stream = true;
return -EAGAIN; return -EAGAIN;
} }
#endif
if ((hdr->flags2 & DNS_FLAG2_ERR_MASK) != 0) if ((hdr->flags2 & DNS_FLAG2_ERR_MASK) != 0)
{ {
@ -851,7 +872,9 @@ static int dns_query_callback(FAR void *arg, FAR struct sockaddr *addr,
int retries; int retries;
int ret; int ret;
int sd; int sd;
#ifdef CONFIG_NETDB_DNS_STREAM
bool stream = false; bool stream = false;
#endif
/* Loop while receive timeout errors occur and there are remaining /* Loop while receive timeout errors occur and there are remaining
* retries. * retries.
@ -859,25 +882,37 @@ static int dns_query_callback(FAR void *arg, FAR struct sockaddr *addr,
for (retries = 0; retries < CONFIG_NETDB_DNSCLIENT_RETRIES; retries++) for (retries = 0; retries < CONFIG_NETDB_DNSCLIENT_RETRIES; retries++)
{ {
#ifdef CONFIG_NETDB_DNS_STREAM
bool should_try_stream; bool should_try_stream;
try_stream: try_stream:
#endif
#ifdef CONFIG_NET_IPv6 #ifdef CONFIG_NET_IPv6
if (dns_is_queryfamily(AF_INET6)) if (dns_is_queryfamily(AF_INET6))
{ {
/* Send the IPv6 query */ /* Send the IPv6 query */
#ifndef CONFIG_NETDB_DNS_STREAM
sd = dns_bind(addr->sa_family);
#else
sd = dns_bind(addr->sa_family, stream); sd = dns_bind(addr->sa_family, stream);
#endif
if (sd < 0) if (sd < 0)
{ {
query->result = sd; query->result = sd;
return 0; return 0;
} }
#ifndef CONFIG_NETDB_DNS_STREAM
ret = dns_send_query(sd, query->hostname,
(FAR union dns_addr_u *)addr,
DNS_RECTYPE_AAAA, &qdata->qinfo,
qdata->buffer);
#else
ret = dns_send_query(sd, query->hostname, ret = dns_send_query(sd, query->hostname,
(FAR union dns_addr_u *)addr, (FAR union dns_addr_u *)addr,
DNS_RECTYPE_AAAA, &qdata->qinfo, DNS_RECTYPE_AAAA, &qdata->qinfo,
qdata->buffer, stream); qdata->buffer, stream);
#endif
if (ret < 0) if (ret < 0)
{ {
dns_query_error("ERROR: IPv6 dns_send_query failed", dns_query_error("ERROR: IPv6 dns_send_query failed",
@ -887,25 +922,33 @@ try_stream:
else else
{ {
/* Obtain the IPv6 response */ /* Obtain the IPv6 response */
#ifndef CONFIG_NETDB_DNS_STREAM
ret = dns_recv_response(sd, &query->addr[next],
CONFIG_NETDB_MAX_IPv6ADDR,
&qdata->qinfo,
&query->ttl, qdata->buffer);
#else
should_try_stream = false; should_try_stream = false;
ret = dns_recv_response(sd, &query->addr[next], ret = dns_recv_response(sd, &query->addr[next],
CONFIG_NETDB_MAX_IPv6ADDR, CONFIG_NETDB_MAX_IPv6ADDR,
&qdata->qinfo, &qdata->qinfo,
&query->ttl, qdata->buffer, &query->ttl, qdata->buffer,
stream, &should_try_stream); stream, &should_try_stream);
#endif
if (ret >= 0) if (ret >= 0)
{ {
next += ret; next += ret;
} }
else else
{ {
#ifdef CONFIG_NETDB_DNS_STREAM
if (!stream && should_try_stream) if (!stream && should_try_stream)
{ {
stream = true; stream = true;
goto try_stream; /* Don't consume retry count */ goto try_stream; /* Don't consume retry count */
} }
#endif
dns_query_error("ERROR: IPv6 dns_recv_response failed", dns_query_error("ERROR: IPv6 dns_recv_response failed",
ret, (FAR union dns_addr_u *)addr); ret, (FAR union dns_addr_u *)addr);
query->result = ret; query->result = ret;
@ -914,6 +957,7 @@ try_stream:
close(sd); close(sd);
} }
#endif #endif
#ifdef CONFIG_NET_IPv4 #ifdef CONFIG_NET_IPv4
@ -921,17 +965,27 @@ try_stream:
{ {
/* Send the IPv4 query */ /* Send the IPv4 query */
#ifndef CONFIG_NETDB_DNS_STREAM
sd = dns_bind(addr->sa_family);
#else
sd = dns_bind(addr->sa_family, stream); sd = dns_bind(addr->sa_family, stream);
#endif
if (sd < 0) if (sd < 0)
{ {
query->result = sd; query->result = sd;
return 0; return 0;
} }
#ifndef CONFIG_NETDB_DNS_STREAM
ret = dns_send_query(sd, query->hostname,
(FAR union dns_addr_u *)addr,
DNS_RECTYPE_A, &qdata->qinfo, qdata->buffer);
#else
ret = dns_send_query(sd, query->hostname, ret = dns_send_query(sd, query->hostname,
(FAR union dns_addr_u *)addr, (FAR union dns_addr_u *)addr,
DNS_RECTYPE_A, &qdata->qinfo, qdata->buffer, DNS_RECTYPE_A, &qdata->qinfo, qdata->buffer,
stream); stream);
#endif
if (ret < 0) if (ret < 0)
{ {
dns_query_error("ERROR: IPv4 dns_send_query failed", dns_query_error("ERROR: IPv4 dns_send_query failed",
@ -947,24 +1001,33 @@ try_stream:
next = *query->naddr / 2; next = *query->naddr / 2;
} }
#ifndef CONFIG_NETDB_DNS_STREAM
ret = dns_recv_response(sd, &query->addr[next],
CONFIG_NETDB_MAX_IPv4ADDR,
&qdata->qinfo,
&query->ttl, qdata->buffer);
#else
should_try_stream = false; should_try_stream = false;
ret = dns_recv_response(sd, &query->addr[next], ret = dns_recv_response(sd, &query->addr[next],
CONFIG_NETDB_MAX_IPv4ADDR, CONFIG_NETDB_MAX_IPv4ADDR,
&qdata->qinfo, &qdata->qinfo,
&query->ttl, qdata->buffer, &query->ttl, qdata->buffer,
stream, &should_try_stream); stream, &should_try_stream);
#endif
if (ret >= 0) if (ret >= 0)
{ {
next += ret; next += ret;
} }
else else
{ {
#ifdef CONFIG_NETDB_DNS_STREAM
if (!stream && should_try_stream) if (!stream && should_try_stream)
{ {
stream = true; stream = true;
goto try_stream; /* Don't consume retry count */ goto try_stream; /* Don't consume retry count */
} }
#endif
dns_query_error("ERROR: IPv4 dns_recv_response failed", dns_query_error("ERROR: IPv4 dns_recv_response failed",
ret, (FAR union dns_addr_u *)addr); ret, (FAR union dns_addr_u *)addr);
query->result = ret; query->result = ret;