Skip to content

Commit

Permalink
netdb:Add macro to control DNS using TCP transmission
Browse files Browse the repository at this point in the history 
Signed-off-by: yangjianqing <[email protected]>
  • Loading branch information
@yjq91115
yjq91115 committed Dec 6, 2024
1 parent 1e49cb4 commit 0e53657
Show file tree
Hide file tree
Showing 4 changed files with 86 additions and 2 deletions.
5 changes: 5 additions & 0 deletions libs/libc/netdb/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,11 @@ config NETDB_DNSSERVER_IPv4ADDR
Default DNS server IPv4 address in host byte order. Default value
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

if NETDB_DNSSERVER_IPv6

config NETDB_DNSSERVER_IPv6ADDR_1
Expand Down
4 changes: 4 additions & 0 deletions libs/libc/netdb/lib_dns.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
#endif

/****************************************************************************
* Name: dns_query
Expand Down
12 changes: 12 additions & 0 deletions libs/libc/netdb/lib_dnsbind.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
#endif
{
#ifdef CONFIG_NETDB_DNS_STREAM
int stype = stream ? SOCK_STREAM : SOCK_DGRAM;
#endif

struct timeval tv;
int sd;
int ret;

/* 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);
#endif

if (sd < 0)
{
ret = -get_errno();
Expand Down
67 changes: 65 additions & 2 deletions libs/libc/netdb/lib_dnsquery.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
ssize_t total = 0;
Expand Down Expand Up @@ -292,6 +293,7 @@ static ssize_t stream_recv_record(int fd, FAR void *buf, size_t len)

return ret;
}
#endif

/****************************************************************************
* Name: dns_parse_name
Expand Down Expand Up @@ -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,
FAR union dns_addr_u *uaddr, uint16_t rectype,
FAR struct dns_query_info_s *qinfo,
FAR uint8_t *buffer,
bool stream)
#endif
{
FAR struct dns_header_s *hdr;
FAR uint8_t *dest;
Expand Down Expand Up @@ -488,11 +497,13 @@ static int dns_send_query(int sd, FAR const char *name,
return ret;
}

#ifdef CONFIG_NETDB_DNS_STREAM
if (stream)
{
ret = stream_send_record(sd, buffer, dest - buffer);
}
else
#endif
{
ret = send(sd, buffer, dest - buffer, 0);
}
Expand All @@ -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,
FAR struct dns_query_info_s *qinfo,
FAR uint32_t *ttl, FAR uint8_t *buffer,
bool stream, bool *should_try_stream)
#endif
{
FAR uint8_t *nameptr;
FAR uint8_t *namestart;
Expand All @@ -543,11 +560,13 @@ static int dns_recv_response(int sd, FAR union dns_addr_u *addr, int naddr,

/* Receive the response */

#ifdef CONFIG_NETDB_DNS_STREAM
if (stream)
{
ret = stream_recv_record(sd, buffer, RECV_BUFFER_SIZE);
}
else
#endif
{
ret = recv(sd, buffer, RECV_BUFFER_SIZE, 0);
}
Expand Down Expand Up @@ -579,6 +598,7 @@ static int dns_recv_response(int sd, FAR union dns_addr_u *addr, int naddr,

/* Check for error */

#ifdef CONFIG_NETDB_DNS_STREAM
if ((hdr->flags1 & DNS_FLAG1_TRUNC) != 0)
{
/* RFC 2181
Expand All @@ -601,6 +621,7 @@ static int dns_recv_response(int sd, FAR union dns_addr_u *addr, int naddr,
*should_try_stream = true;
return -EAGAIN;
}
#endif

if ((hdr->flags2 & DNS_FLAG2_ERR_MASK) != 0)
{
Expand Down Expand Up @@ -851,33 +872,47 @@ static int dns_query_callback(FAR void *arg, FAR struct sockaddr *addr,
int retries;
int ret;
int sd;
#ifdef CONFIG_NETDB_DNS_STREAM
bool stream = false;
#endif

/* Loop while receive timeout errors occur and there are remaining
* retries.
*/

for (retries = 0; retries < CONFIG_NETDB_DNSCLIENT_RETRIES; retries++)
{
#ifdef CONFIG_NETDB_DNS_STREAM
bool should_try_stream;

try_stream:
#endif
#ifdef CONFIG_NET_IPv6
if (dns_is_queryfamily(AF_INET6))
{
/* Send the IPv6 query */

#ifndef CONFIG_NETDB_DNS_STREAM
sd = dns_bind(addr->sa_family);
#else
sd = dns_bind(addr->sa_family, stream);
#endif
if (sd < 0)
{
query->result = sd;
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,
(FAR union dns_addr_u *)addr,
DNS_RECTYPE_AAAA, &qdata->qinfo,
qdata->buffer, stream);
#endif
if (ret < 0)
{
dns_query_error("ERROR: IPv6 dns_send_query failed",
Expand All @@ -887,25 +922,33 @@ static int dns_query_callback(FAR void *arg, FAR struct sockaddr *addr,
else
{
/* 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;
ret = dns_recv_response(sd, &query->addr[next],
CONFIG_NETDB_MAX_IPv6ADDR,
&qdata->qinfo,
&query->ttl, qdata->buffer,
stream, &should_try_stream);
#endif
if (ret >= 0)
{
next += ret;
}
else
{
#ifdef CONFIG_NETDB_DNS_STREAM
if (!stream && should_try_stream)
{
stream = true;
goto try_stream; /* Don't consume retry count */
}

#endif
dns_query_error("ERROR: IPv6 dns_recv_response failed",
ret, (FAR union dns_addr_u *)addr);
query->result = ret;
Expand All @@ -914,24 +957,35 @@ static int dns_query_callback(FAR void *arg, FAR struct sockaddr *addr,

close(sd);
}

#endif

#ifdef CONFIG_NET_IPv4
if (dns_is_queryfamily(AF_INET))
{
/* Send the IPv4 query */

#ifndef CONFIG_NETDB_DNS_STREAM
sd = dns_bind(addr->sa_family);
#else
sd = dns_bind(addr->sa_family, stream);
#endif
if (sd < 0)
{
query->result = sd;
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,
(FAR union dns_addr_u *)addr,
DNS_RECTYPE_A, &qdata->qinfo, qdata->buffer,
stream);
#endif
if (ret < 0)
{
dns_query_error("ERROR: IPv4 dns_send_query failed",
Expand All @@ -947,24 +1001,33 @@ static int dns_query_callback(FAR void *arg, FAR struct sockaddr *addr,
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;
ret = dns_recv_response(sd, &query->addr[next],
CONFIG_NETDB_MAX_IPv4ADDR,
&qdata->qinfo,
&query->ttl, qdata->buffer,
stream, &should_try_stream);
#endif
if (ret >= 0)
{
next += ret;
}
else
{
#ifdef CONFIG_NETDB_DNS_STREAM
if (!stream && should_try_stream)
{
stream = true;
goto try_stream; /* Don't consume retry count */
}

#endif
dns_query_error("ERROR: IPv4 dns_recv_response failed",
ret, (FAR union dns_addr_u *)addr);
query->result = ret;
Expand Down

0 comments on commit 0e53657

Please sign in to comment.