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

apps/netutils/dnsclient: Can select to be either IPv4 or IPv6, but not both (IPv6 still does not compile)

Browse Source
This commit is contained in:
Gregory Nutt 2015-01-18 10:51:53 -06:00
parent 981ca845cd
commit bf3c7bd286
4 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/netutils/dnsclient.h
View File

@ -141,8 +141,8 @@ void dns_setserver(FAR const struct in_addr *dnsserver);
*
****************************************************************************/
#ifdef CONFIG_NET_IPv6
void dns_getserver(FAR const struct in_addr *dnsserver);
#ifdef CONFIG_NETUTILS_DNSCLIENT_IPv6
void dns_getserver(FAR struct in6_addr *dnsserver);
#else
void dns_getserver(FAR struct in_addr *dnsserver);
#endif

15
netutils/dnsclient/Kconfig
View File

@ -12,6 +12,21 @@ config NETUTILS_DNSCLIENT
if NETUTILS_DNSCLIENT
choice
prompt "Internet Protocol"
default NETUTILS_DNSCLIENT_IPv4 if NET_IPv4
default NETUTILS_DNSCLIENT_IPv6 if NET_IPv6 && !NET_IPv4
config NETUTILS_DNSCLIENT_IPv4
bool "IPv4"
depends on NET_IPv4
config NETUTILS_DNSCLIENT_IPv6
bool "IPv6"
depends on NET_IPv6
endchoice # Internet Protocol
config NETUTILS_DNSCLIENT_ENTRIES
int "Number of DNS resolver entries"
default 8

2
netutils/dnsclient/dns_resolver.c
View File

@ -113,7 +113,7 @@ int dns_query(FAR const char *hostname, FAR in_addr_t *ipaddr)
*
****************************************************************************/
#ifdef CONFIG_NET_IPv6
#ifdef CONFIG_NETUTILS_DNSCLIENT_IPv6
int dns_whois(FAR const char *name, FAR struct sockaddr_in6 *addr)
#else
int dns_whois(FAR const char *name, FAR struct sockaddr_in *addr)

25
netutils/dnsclient/dns_socket.c
View File

@ -101,7 +101,7 @@
# define RECV_BUFFER_SIZE 96
#endif
#ifdef CONFIG_NET_IPv6
#ifdef CONFIG_NETUTILS_DNSCLIENT_IPv6
# define ADDRLEN sizeof(struct sockaddr_in6)
#else
# define ADDRLEN sizeof(struct sockaddr_in)
@ -136,7 +136,7 @@ struct dns_answer
uint16_t class;
uint16_t ttl[2];
uint16_t len;
#ifdef CONFIG_NET_IPv6
#ifdef CONFIG_NETUTILS_DNSCLIENT_IPv6
struct in6_addr ipaddr;
#else
struct in_addr ipaddr;
@ -151,7 +151,7 @@ struct namemap
uint8_t seqno;
uint8_t err;
char name[32];
#ifdef CONFIG_NET_IPv6
#ifdef CONFIG_NETUTILS_DNSCLIENT_IPv6
struct in6_addr ipaddr;
#else
struct in_addr ipaddr;
@ -163,7 +163,7 @@ struct namemap
****************************************************************************/
static uint8_t g_seqno;
#ifdef CONFIG_NET_IPv6
#ifdef CONFIG_NETUTILS_DNSCLIENT_IPv6
static struct sockaddr_in6 g_dnsserver;
#else
static struct sockaddr_in g_dnsserver;
@ -209,7 +209,7 @@ static FAR unsigned char *dns_parse_name(FAR unsigned char *query)
*
****************************************************************************/
#ifdef CONFIG_NET_IPv6
#ifdef CONFIG_NETUTILS_DNSCLIENT_IPv6
static int dns_send_query(int sockfd, FAR const char *name,
FAR struct sockaddr_in6 *addr)
#else
@ -264,7 +264,7 @@ static int dns_send_query(int sockfd, FAR const char *name,
*
****************************************************************************/
#ifdef CONFIG_NET_IPv6
#ifdef CONFIG_NETUTILS_DNSCLIENT_IPv6
# error "Not implemented"
#else
static int dns_recv_response(int sockfd, FAR struct sockaddr_in *addr)
@ -502,7 +502,7 @@ int dns_query_sock(int sockfd, FAR const char *hostname, FAR in_addr_t *ipaddr)
#else
# ifdef CONFIG_NET_IPv6
# ifdef CONFIG_NETUTILS_DNSCLIENT_IPv6
struct sockaddr_in6 addr;
# else
struct sockaddr_in addr;
@ -540,7 +540,7 @@ int dns_query_sock(int sockfd, FAR const char *hostname, FAR in_addr_t *ipaddr)
*
****************************************************************************/
#ifdef CONFIG_NET_IPv6
#ifdef CONFIG_NETUTILS_DNSCLIENT_IPv6
void dns_setserver(FAR const struct in6_addr *dnsserver)
#else
void dns_setserver(FAR const struct in_addr *dnsserver)
@ -548,7 +548,8 @@ void dns_setserver(FAR const struct in_addr *dnsserver)
{
g_dnsserver.sin_family = AF_INET;
g_dnsserver.sin_port = HTONS(53);
#ifdef CONFIG_NET_IPv6
#ifdef CONFIG_NETUTILS_DNSCLIENT_IPv6
memcpy(&g_dnsserver.sin6_addr, dnsserver, ADDRLEN);
#else
g_dnsserver.sin_addr.s_addr = dnsserver->s_addr;
@ -563,13 +564,13 @@ void dns_setserver(FAR const struct in_addr *dnsserver)
*
****************************************************************************/
#ifdef CONFIG_NET_IPv6
#ifdef CONFIG_NETUTILS_DNSCLIENT_IPv6
void dns_getserver(FAR struct in6_addr *dnsserver)
#else
void dns_getserver(FAR struct in_addr *dnsserver)
#endif
{
#ifdef CONFIG_NET_IPv6
#ifdef CONFIG_NETUTILS_DNSCLIENT_IPv6
memcpy(dnsserver, &g_dnsserver.sin6_addr, ADDRLEN);
#else
dnsserver->s_addr = g_dnsserver.sin_addr.s_addr;
@ -584,7 +585,7 @@ void dns_getserver(FAR struct in_addr *dnsserver)
*
****************************************************************************/
#ifdef CONFIG_NET_IPv6
#ifdef CONFIG_NETUTILS_DNSCLIENT_IPv6
int dns_whois_socket(int sockfd, FAR const char *name,
FAR struct sockaddr_in6 *addr)
#else