summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/ChangeLog.txt2
-rw-r--r--apps/examples/README.txt6
-rw-r--r--apps/examples/discover/Kconfig2
-rw-r--r--apps/examples/discover/discover_main.c4
-rw-r--r--apps/examples/tcpecho/Kconfig2
-rw-r--r--apps/examples/tcpecho/tcpecho_main.c4
-rw-r--r--apps/examples/uip/uip_main.c4
-rw-r--r--apps/examples/xmlrpc/Kconfig2
-rw-r--r--apps/examples/xmlrpc/xmlrpc_main.c4
-rw-r--r--apps/include/netutils/resolv.h153
-rw-r--r--apps/netutils/Make.defs2
-rw-r--r--apps/netutils/resolv/Kconfig22
-rw-r--r--apps/netutils/resolv/resolv.c401
-rw-r--r--apps/nshlib/Kconfig2
-rw-r--r--apps/nshlib/nsh_netcmds.c6
-rw-r--r--apps/nshlib/nsh_netinit.c6
-rw-r--r--nuttx/configs/arduino-due/nsh/defconfig2
-rw-r--r--nuttx/configs/c5471evm/nsh/defconfig6
-rw-r--r--nuttx/configs/cloudctrl/nsh/defconfig6
-rw-r--r--nuttx/configs/compal_e86/nsh_highram/defconfig2
-rw-r--r--nuttx/configs/ea3131/nsh/defconfig2
-rw-r--r--nuttx/configs/eagle100/nsh/defconfig6
-rw-r--r--nuttx/configs/ez80f910200kitg/ostest/defconfig2
-rw-r--r--nuttx/configs/ez80f910200zco/dhcpd/defconfig2
-rw-r--r--nuttx/configs/ez80f910200zco/nsh/defconfig6
-rw-r--r--nuttx/configs/fire-stm32v2/nsh/defconfig4
-rw-r--r--nuttx/configs/freedom-kl25z/minnsh/defconfig2
-rw-r--r--nuttx/configs/freedom-kl25z/nsh/defconfig2
-rw-r--r--nuttx/configs/hymini-stm32v/buttons/defconfig2
-rw-r--r--nuttx/configs/hymini-stm32v/nsh/defconfig2
-rw-r--r--nuttx/configs/hymini-stm32v/nsh2/defconfig2
-rw-r--r--nuttx/configs/hymini-stm32v/usbnsh/defconfig2
-rw-r--r--nuttx/configs/kwikstik-k40/ostest/defconfig2
-rw-r--r--nuttx/configs/lm3s6432-s2e/nsh/defconfig6
-rw-r--r--nuttx/configs/lm3s6965-ek/discover/defconfig6
-rw-r--r--nuttx/configs/lm3s6965-ek/nsh/defconfig6
-rw-r--r--nuttx/configs/lm3s6965-ek/tcpecho/defconfig6
-rw-r--r--nuttx/configs/lm3s8962-ek/nsh/defconfig6
-rw-r--r--nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig2
-rw-r--r--nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig6
-rw-r--r--nuttx/configs/maple/nsh/defconfig2
-rw-r--r--nuttx/configs/maple/nx/defconfig2
-rw-r--r--nuttx/configs/maple/usbnsh/defconfig2
-rw-r--r--nuttx/configs/mcu123-lpc214x/nsh/defconfig2
-rw-r--r--nuttx/configs/ntosd-dm320/nsh/defconfig6
-rw-r--r--nuttx/configs/ntosd-dm320/udp/defconfig2
-rw-r--r--nuttx/configs/nucleus2g/usbserial/defconfig2
-rw-r--r--nuttx/configs/nutiny-nuc120/nsh/defconfig2
-rw-r--r--nuttx/configs/olimex-lpc-h3131/nsh/defconfig2
-rw-r--r--nuttx/configs/olimex-lpc1766stk/ftpc/defconfig6
-rw-r--r--nuttx/configs/olimex-lpc1766stk/hidmouse/defconfig6
-rw-r--r--nuttx/configs/olimex-lpc1766stk/nsh/defconfig6
-rw-r--r--nuttx/configs/olimex-stm32-p107/nsh/defconfig6
-rw-r--r--nuttx/configs/olimex-stm32-p207/nsh/defconfig6
-rw-r--r--nuttx/configs/open1788/knsh/defconfig2
-rw-r--r--nuttx/configs/open1788/nsh/defconfig2
-rw-r--r--nuttx/configs/open1788/nxlines/defconfig2
-rw-r--r--nuttx/configs/p112/ostest/defconfig2
-rw-r--r--nuttx/configs/pcblogic-pic32mx/nsh/defconfig2
-rw-r--r--nuttx/configs/pcduino-a10/nsh/defconfig2
-rw-r--r--nuttx/configs/pic32-starterkit/nsh2/defconfig6
-rw-r--r--nuttx/configs/pic32mx7mmb/nsh/defconfig6
-rw-r--r--nuttx/configs/pirelli_dpl10/nsh_highram/defconfig2
-rw-r--r--nuttx/configs/rgmp/arm/nsh/defconfig6
-rw-r--r--nuttx/configs/rgmp/x86/nsh/defconfig6
-rw-r--r--nuttx/configs/sam4e-ek/README.txt2
-rw-r--r--nuttx/configs/sam4e-ek/nsh/defconfig6
-rw-r--r--nuttx/configs/sam4e-ek/usbnsh/defconfig6
-rw-r--r--nuttx/configs/sama5d3-xplained/README.txt2
-rw-r--r--nuttx/configs/sama5d3x-ek/README.txt2
-rw-r--r--nuttx/configs/shenzhou/nsh/defconfig6
-rw-r--r--nuttx/configs/shenzhou/nxwm/defconfig6
-rw-r--r--nuttx/configs/shenzhou/thttpd/defconfig4
-rw-r--r--nuttx/configs/stm3220g-eval/dhcpd/defconfig2
-rw-r--r--nuttx/configs/stm3220g-eval/nsh/defconfig6
-rw-r--r--nuttx/configs/stm3220g-eval/nsh2/defconfig6
-rw-r--r--nuttx/configs/stm3240g-eval/dhcpd/defconfig2
-rw-r--r--nuttx/configs/stm3240g-eval/discover/defconfig6
-rw-r--r--nuttx/configs/stm3240g-eval/nsh/defconfig6
-rw-r--r--nuttx/configs/stm3240g-eval/nsh2/defconfig6
-rw-r--r--nuttx/configs/stm3240g-eval/nxconsole/defconfig6
-rw-r--r--nuttx/configs/stm3240g-eval/xmlrpc/defconfig6
-rw-r--r--nuttx/configs/stm32_tiny/nsh/defconfig2
-rw-r--r--nuttx/configs/stm32_tiny/usbnsh/defconfig2
-rw-r--r--nuttx/configs/stm32f100rc_generic/nsh/defconfig2
-rw-r--r--nuttx/configs/stm32f3discovery/nsh/defconfig2
-rw-r--r--nuttx/configs/stm32f3discovery/usbnsh/defconfig2
-rw-r--r--nuttx/configs/stm32f4discovery/winbuild/defconfig2
-rw-r--r--nuttx/configs/stm32ldiscovery/nsh/defconfig2
-rw-r--r--nuttx/configs/stm32vldiscovery/nsh/defconfig2
-rw-r--r--nuttx/configs/sure-pic32mx/nsh/defconfig2
-rw-r--r--nuttx/configs/sure-pic32mx/usbnsh/defconfig2
-rw-r--r--nuttx/configs/twr-k60n512/nsh/defconfig2
-rw-r--r--nuttx/configs/viewtool-stm32f107/netnsh/defconfig6
-rw-r--r--nuttx/configs/xtrs/nsh/defconfig2
-rw-r--r--nuttx/configs/xtrs/ostest/defconfig2
-rw-r--r--nuttx/configs/xtrs/pashello/defconfig2
-rw-r--r--nuttx/configs/z16f2800100zcog/nsh/defconfig2
-rw-r--r--nuttx/configs/z16f2800100zcog/ostest/defconfig2
-rw-r--r--nuttx/configs/z16f2800100zcog/pashello/defconfig2
-rw-r--r--nuttx/configs/z80sim/nsh/defconfig2
-rw-r--r--nuttx/configs/z80sim/ostest/defconfig2
-rw-r--r--nuttx/configs/z80sim/pashello/defconfig2
-rw-r--r--nuttx/configs/z8encore000zco/ostest/defconfig2
-rw-r--r--nuttx/configs/z8f64200100kit/ostest/defconfig2
-rw-r--r--nuttx/configs/zkit-arm-1769/hello/defconfig2
-rw-r--r--nuttx/configs/zkit-arm-1769/nsh/defconfig6
-rw-r--r--nuttx/configs/zkit-arm-1769/nxhello/defconfig6
-rw-r--r--nuttx/configs/zkit-arm-1769/thttpd/defconfig2
-rw-r--r--nuttx/configs/zp214xpa/nsh/defconfig2
-rw-r--r--nuttx/configs/zp214xpa/nxlines/defconfig2
111 files changed, 584 insertions, 368 deletions
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt
index 27b1ce47b..b952ebe74 100644
--- a/apps/ChangeLog.txt
+++ b/apps/ChangeLog.txt
@@ -876,3 +876,5 @@
* apps/netutils/ntpclient/ and apps/include/netufils/ntpclient.h: Add
a very primitive NTP client. The initial check-in is untested and
probably incomplete (2014-4-10).
+ * apps/netutils/resolv: Long needed major clean up for coding style
+ and unification of naming conventions (resolv vs dns) (2014-4-11).
diff --git a/apps/examples/README.txt b/apps/examples/README.txt
index 42ba317bd..23e83f48f 100644
--- a/apps/examples/README.txt
+++ b/apps/examples/README.txt
@@ -703,7 +703,7 @@ examples/nsh
CONFIG_NETUTILS_UIPLIB=y
CONFIG_NETUTILS_DHCPC=y
- CONFIG_NETUTILS_RESOLV=y
+ CONFIG_NETUTILS_DNSCLIENT=y
CONFIG_NETUTILS_TFTPC=y
CONFIG_NETUTILS_WEBCLIENT=y
@@ -1683,7 +1683,7 @@ examples/uip
CONFIG_NETUTILS_UIPLIB=y
CONFIG_NETUTILS_DHCPC=y
- CONFIG_NETUTILS_RESOLV=y
+ CONFIG_NETUTILS_DNSCLIENT=y
CONFIG_NETUTILS_WEBSERVER=y
NOTE: This example does depend on the perl script at
@@ -1905,7 +1905,7 @@ examples/wget
libraries in the defconfig file:
CONFIG_NETUTILS_UIPLIB=y
- CONFIG_NETUTILS_RESOLV=y
+ CONFIG_NETUTILS_DNSCLIENT=y
CONFIG_NETUTILS_WEBCLIENT=y
examples/wget
diff --git a/apps/examples/discover/Kconfig b/apps/examples/discover/Kconfig
index 1cbb7f120..9b137b60f 100644
--- a/apps/examples/discover/Kconfig
+++ b/apps/examples/discover/Kconfig
@@ -22,7 +22,7 @@ config EXAMPLES_DISCOVER_DHCPC
default n
depends on EXAMPLES_DISCOVER && !NSH_BUILTIN_APPS
select NETUTILS_DHCPC
- select NETUTILS_RESOLV
+ select NETUTILS_DNSCLIENT
config EXAMPLES_DISCOVER_NOMAC
bool "Use Canned MAC Address"
diff --git a/apps/examples/discover/discover_main.c b/apps/examples/discover/discover_main.c
index 9c8f5f512..d8b32d315 100644
--- a/apps/examples/discover/discover_main.c
+++ b/apps/examples/discover/discover_main.c
@@ -134,7 +134,7 @@ int discover_main(int argc, char *argv[])
#ifdef CONFIG_EXAMPLES_DISCOVER_DHCPC
/* Set up the resolver */
- resolv_init();
+ dns_bind();
/* Get the MAC address of the NIC */
@@ -167,7 +167,7 @@ int discover_main(int argc, char *argv[])
if (ds.dnsaddr.s_addr != 0)
{
- resolv_conf(&ds.dnsaddr);
+ dns_setserver(&ds.dnsaddr);
}
dhcpc_close(handle);
diff --git a/apps/examples/tcpecho/Kconfig b/apps/examples/tcpecho/Kconfig
index cc063e0a5..ffa6397df 100644
--- a/apps/examples/tcpecho/Kconfig
+++ b/apps/examples/tcpecho/Kconfig
@@ -31,7 +31,7 @@ config EXAMPLES_TCPECHO_DHCPC
default n
depends on EXAMPLES_TCPECHO && !NSH_BUILTIN_APPS
select NETUTILS_DHCPC
- select NETUTILS_RESOLV
+ select NETUTILS_DNSCLIENT
config EXAMPLES_TCPECHO_NOMAC
bool "Use Canned MAC Address"
diff --git a/apps/examples/tcpecho/tcpecho_main.c b/apps/examples/tcpecho/tcpecho_main.c
index e70028fce..fbc6e2ddd 100644
--- a/apps/examples/tcpecho/tcpecho_main.c
+++ b/apps/examples/tcpecho/tcpecho_main.c
@@ -146,7 +146,7 @@ static int tcpecho_netsetup()
#ifdef CONFIG_EXAMPLES_TCPECHO_DHCPC
/* Set up the resolver */
- resolv_init();
+ dns_bind();
/* Get the MAC address of the NIC */
@@ -184,7 +184,7 @@ static int tcpecho_netsetup()
if (ds.dnsaddr.s_addr != 0)
{
- resolv_conf(&ds.dnsaddr);
+ dns_setserver(&ds.dnsaddr);
}
dhcpc_close(handle);
diff --git a/apps/examples/uip/uip_main.c b/apps/examples/uip/uip_main.c
index 8e485441c..35454a0dd 100644
--- a/apps/examples/uip/uip_main.c
+++ b/apps/examples/uip/uip_main.c
@@ -154,7 +154,7 @@ int uip_main(int argc, char *argv[])
#ifdef CONFIG_EXAMPLES_UIP_DHCPC
/* Set up the resolver */
- resolv_init();
+ dns_bind();
/* Get the MAC address of the NIC */
@@ -184,7 +184,7 @@ int uip_main(int argc, char *argv[])
}
if (ds.dnsaddr.s_addr != 0)
{
- resolv_conf(&ds.dnsaddr);
+ dns_setserver(&ds.dnsaddr);
}
dhcpc_close(handle);
printf("IP: %s\n", inet_ntoa(ds.ipaddr));
diff --git a/apps/examples/xmlrpc/Kconfig b/apps/examples/xmlrpc/Kconfig
index 80ee5a225..aa47e4672 100644
--- a/apps/examples/xmlrpc/Kconfig
+++ b/apps/examples/xmlrpc/Kconfig
@@ -23,7 +23,7 @@ config EXAMPLES_XMLRPC_DHCPC
default n
depends on EXAMPLES_XMLRPC && !NSH_BUILTIN_APPS
select NETUTILS_DHCPC
- select NETUTILS_RESOLV
+ select NETUTILS_DNSCLIENT
config EXAMPLES_XMLRPC_NOMAC
bool "Use Canned MAC Address"
diff --git a/apps/examples/xmlrpc/xmlrpc_main.c b/apps/examples/xmlrpc/xmlrpc_main.c
index 5f5ce5f06..3a743bb82 100644
--- a/apps/examples/xmlrpc/xmlrpc_main.c
+++ b/apps/examples/xmlrpc/xmlrpc_main.c
@@ -311,7 +311,7 @@ static int xmlrpc_netinit(void)
#ifdef CONFIG_EXAMPLES_XMLRPC_DHCPC
/* Set up the resolver */
- resolv_init();
+ dns_bind();
/* Get the MAC address of the NIC */
@@ -345,7 +345,7 @@ static int xmlrpc_netinit(void)
if (ds.dnsaddr.s_addr != 0)
{
- resolv_conf(&ds.dnsaddr);
+ dns_setserver(&ds.dnsaddr);
}
dhcpc_close(handle);
diff --git a/apps/include/netutils/resolv.h b/apps/include/netutils/resolv.h
index 8d2142732..9447432a1 100644
--- a/apps/include/netutils/resolv.h
+++ b/apps/include/netutils/resolv.h
@@ -3,7 +3,7 @@
* DNS resolver code header file.
* Author Adam Dunkels <adam@dunkels.com>
*
- * Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2007-2009, 2011-2012, 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Inspired by/based on uIP logic by Adam Dunkels:
@@ -37,8 +37,8 @@
*
****************************************************************************/
-#ifndef __APPS_INCLUDE_NETUTILS_RESOLVE_H
-#define __APPS_INCLUDE_NETUTILS_RESOLVE_H
+#ifndef __APPS_INCLUDE_NETUTILS_DNSCLIENT_H
+#define __APPS_INCLUDE_NETUTILS_DNSCLIENT_H
/****************************************************************************
* Included Files
@@ -55,45 +55,144 @@
#undef EXTERN
#if defined(__cplusplus)
#define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
#else
#define EXTERN extern
#endif
-/* Functions. */
+/****************************************************************************
+ * Name: dns_bind_sock
+ *
+ * Description:
+ * Initialize the DNS resolver using the caller provided socket.
+ *
+ ****************************************************************************/
+
+int dns_bind_sock(FAR int *sockfd);
-EXTERN int resolv_init(void);
-EXTERN int resolv_create(int *sockfd);
-EXTERN int resolv_release(int *sockfd);
-EXTERN int resolv_gethostip_socket(int sockfd, const char *hostname, in_addr_t *ipaddr);
-EXTERN int resolv_gethostip(const char *hostname, in_addr_t *ipaddr);
+/****************************************************************************
+ * Name: dns_bind
+ *
+ * Description:
+ * Initialize the DNS resolver using an internal, share-able socket.
+ *
+ ****************************************************************************/
+
+int dns_bind(void);
+
+/****************************************************************************
+ * Name: dns_free_sock
+ *
+ * Description:
+ * Release the DNS resolver by closing the socket.
+ *
+ ****************************************************************************/
+
+int dns_free_sock(FAR int *sockfd);
+
+/****************************************************************************
+ * Name: dns_query_sock
+ *
+ * Description:
+ * Using the DNS resolver socket (sockfd), look up the the 'hostname', and
+ * return its IP address in 'ipaddr'
+ *
+ * Returned Value:
+ * Returns zero (OK) if the query was successful.
+ *
+ ****************************************************************************/
+
+int dns_query_sock(int sockfd, FAR const char *hostname, FAR in_addr_t *ipaddr);
+
+/****************************************************************************
+ * Name: dns_query
+ *
+ * Description:
+ * Using the internal DNS resolver socket, look up the the 'hostname', and
+ * return its IP address in 'ipaddr'
+ *
+ * Returned Value:
+ * Returns zero (OK) if the query was successful.
+ *
+ ****************************************************************************/
+
+int dns_query(FAR const char *hostname, FAR in_addr_t *ipaddr);
+
+/****************************************************************************
+ * Name: dns_setserver
+ *
+ * Description:
+ * Configure which DNS server to use for queries
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_NET_IPv6
+void dns_setserver(FAR const struct in6_addr *dnsserver);
+#else
+void dns_setserver(FAR const struct in_addr *dnsserver);
+#endif
+
+/****************************************************************************
+ * Name: dns_getserver
+ *
+ * Description:
+ * Obtain the currently configured DNS server.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_NET_IPv6
+void dns_getserver(FAR const struct in_addr *dnsserver);
+#else
+void dns_getserver(FAR struct in_addr *dnsserver);
+#endif
+
+/****************************************************************************
+ * Name: dns_whois_socket
+ *
+ * Description:
+ * Get the binding for 'name' using the DNS server accessed via 'sockfd'
+ *
+ ****************************************************************************/
#ifdef CONFIG_NET_IPv6
-EXTERN void resolv_conf(FAR const struct in6_addr *dnsserver);
-EXTERN void resolv_getserver(FAR const struct in_addr *dnsserver);
-EXTERN int resolv_query(FAR const char *name, FAR struct sockaddr_in6 *addr);
-EXTERN int resolv_query_socket(int sockfd, FAR const char *name, FAR struct sockaddr_in6 *addr);
+int dns_whois_socket(int sockfd, FAR const char *name,
+ FAR struct sockaddr_in6 *addr);
#else
-EXTERN void resolv_conf(FAR const struct in_addr *dnsserver);
-EXTERN void resolv_getserver(FAR struct in_addr *dnsserver);
-EXTERN int resolv_query(FAR const char *name, FAR struct sockaddr_in *addr);
-EXTERN int resolv_query_socket(int sockfd, FAR const char *name, FAR struct sockaddr_in *addr);
+int dns_whois_socket(int sockfd, FAR const char *name,
+ FAR struct sockaddr_in *addr);
#endif
-EXTERN int dns_gethostip(const char *hostname, in_addr_t *ipaddr);
+/****************************************************************************
+ * Name: dns_whois
+ *
+ * Description:
+ * Get the binding for 'name' using the DNS server accessed via the DNS
+ * resolvers internal socket.
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_NET_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);
+#endif
-#define dns_init resolv_init
-#define dns_bind resolv_create
-#define dns_query resolv_gethostip_socket
-#define dns_free resolv_release
+/****************************************************************************
+ * Name: dns_gethostip
+ *
+ * Descriptions:
+ * Combines the operations of dns_bind_sock(), dns_query_sock(), and
+ * dns_free_sock() to obtain the the IP address ('ipaddr') associated with
+ * the 'hostname' in one operation.
+ *
+ ****************************************************************************/
-#define dns_setserver resolv_conf
-#define dns_getserver resolv_getserver
-#define dns_whois resolv_query
+int dns_gethostip(FAR const char *hostname, FAR in_addr_t *ipaddr);
#undef EXTERN
#if defined(__cplusplus)
}
#endif
-#endif /* __APPS_INCLUDE_NETUTILS_RESOLVE_H */
+#endif /* __APPS_INCLUDE_NETUTILS_DNSCLIENT_H */
diff --git a/apps/netutils/Make.defs b/apps/netutils/Make.defs
index 7e1d5eb1c..f883304ec 100644
--- a/apps/netutils/Make.defs
+++ b/apps/netutils/Make.defs
@@ -62,7 +62,7 @@ ifeq ($(CONFIG_NETUTILS_NTPCLIENT),y)
CONFIGURED_APPS += netutils/ntpclient
endif
-ifeq ($(CONFIG_NETUTILS_RESOLV),y)
+ifeq ($(CONFIG_NETUTILS_DNSCLIENT),y)
CONFIGURED_APPS += netutils/resolv
endif
diff --git a/apps/netutils/resolv/Kconfig b/apps/netutils/resolv/Kconfig
index 82fe3a81d..91f41ab98 100644
--- a/apps/netutils/resolv/Kconfig
+++ b/apps/netutils/resolv/Kconfig
@@ -3,25 +3,27 @@
# see misc/tools/kconfig-language.txt.
#
-config NETUTILS_RESOLV
- bool "Name resolution"
+config NETUTILS_DNSCLIENT
+ bool "DNS Name resolution"
default n
depends on NET && NET_UDP && NET_BROADCAST
---help---
Enable support for the name resolution.
-config NET_RESOLV_ENTRIES
- int "Number of resolver entries"
+if NETUTILS_DNSCLIENT
+
+config NETUTILS_DNSCLIENT_ENTRIES
+ int "Number of DNS resolver entries"
default 8
- depends on NETUTILS_RESOLV
---help---
Number of resolver entries. Default: 8
-config NET_RESOLV_MAXRESPONSE
+config NETUTILS_DNSCLIENT_MAXRESPONSE
int "Max response size"
default 96
- depends on NETUTILS_RESOLV
---help---
- This setting determines the maximum size of response message that can be
- received by the DNS resolver. The default is 96 but may need to be larger on
- enterprise networks (perhaps 176).
+ This setting determines the maximum size of response message that
+ can be received by the DNS resolver. The default is 96 but may
+ need to be larger on enterprise networks (perhaps 176).
+
+endif # NETUTILS_DNSCLIENT
diff --git a/apps/netutils/resolv/resolv.c b/apps/netutils/resolv/resolv.c
index 5d447ee49..32bbda511 100644
--- a/apps/netutils/resolv/resolv.c
+++ b/apps/netutils/resolv/resolv.c
@@ -4,15 +4,10 @@
*
* The uIP DNS resolver functions are used to lookup a hostname and
* map it to a numerical IP address. It maintains a list of resolved
- * hostnames that can be queried with the resolv_lookup()
- * function. New hostnames can be resolved using the resolv_query()
- * function.
+ * hostnames that can be queried. New hostnames can be resolved using the
+ * dns_whois() function.
*
- * When a hostname has been resolved (or found to be non-existant),
- * the resolver code calls a callback function called resolv_found()
- * that must be implemented by the module that uses the resolver.
- *
- * Copyright (C) 2007, 2009, 2012 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2007, 2009, 2012, 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Based heavily on portions of uIP:
@@ -68,17 +63,17 @@
#include <apps/netutils/uiplib.h>
/****************************************************************************
- * Definitions
+ * Pre-processor Definitions
****************************************************************************/
-#ifndef CONFIG_NET_RESOLV_ENTRIES
-#define RESOLV_ENTRIES 4
-#else /* CONFIG_NET_RESOLV_ENTRIES */
-#define RESOLV_ENTRIES CONFIG_NET_RESOLV_ENTRIES
-#endif /* CONFIG_NET_RESOLV_ENTRIES */
+#ifndef CONFIG_NETUTILS_DNSCLIENT_ENTRIES
+# define RESOLV_ENTRIES 4
+#else /* CONFIG_NETUTILS_DNSCLIENT_ENTRIES */
+# define RESOLV_ENTRIES CONFIG_NETUTILS_DNSCLIENT_ENTRIES
+#endif /* CONFIG_NETUTILS_DNSCLIENT_ENTRIES */
#ifndef NULL
-#define NULL (void *)0
+# define NULL (void *)0
#endif /* NULL */
/* The maximum number of retries when asking for a name */
@@ -99,16 +94,16 @@
#define SEND_BUFFER_SIZE 64
-#ifdef CONFIG_NET_RESOLV_MAXRESPONSE
-# define RECV_BUFFER_SIZE CONFIG_NET_RESOLV_MAXRESPONSE
+#ifdef CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE
+# define RECV_BUFFER_SIZE CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE
#else
# define RECV_BUFFER_SIZE 96
#endif
#ifdef CONFIG_NET_IPv6
-#define ADDRLEN sizeof(struct sockaddr_in6)
+# define ADDRLEN sizeof(struct sockaddr_in6)
#else
-#define ADDRLEN sizeof(struct sockaddr_in)
+# define ADDRLEN sizeof(struct sockaddr_in)
#endif
/****************************************************************************
@@ -120,7 +115,8 @@
struct dns_hdr
{
uint16_t id;
- uint8_t flags1, flags2;
+ uint8_t flags1;
+ uint8_t flags2;
uint16_t numquestions;
uint16_t numanswers;
uint16_t numauthrr;
@@ -177,9 +173,15 @@ static struct sockaddr_in g_dnsserver;
* Private Functions
****************************************************************************/
-/* Walk through a compact encoded DNS name and return the end of it. */
+/****************************************************************************
+ * Name: parse_name
+ *
+ * Description:
+ * Walk through a compact encoded DNS name and return the end of it.
+ *
+ ****************************************************************************/
-static unsigned char *parse_name(unsigned char *query)
+static FAR unsigned char *parse_name(FAR unsigned char *query)
{
unsigned char n;
@@ -194,29 +196,37 @@ static unsigned char *parse_name(unsigned char *query)
}
}
while(*query != 0);
+
return query + 1;
}
-/* Runs through the list of names to see if there are any that have
- * not yet been queried and, if so, sends out a query.
- */
+/****************************************************************************
+ * Name: send_query_socket
+ *
+ * Description:
+ * Runs through the list of names to see if there are any that have
+ * not yet been queried and, if so, sends out a query.
+ *
+ ****************************************************************************/
#ifdef CONFIG_NET_IPv6
-static int send_query_socket(int sockfd, const char *name, struct sockaddr_in6 *addr)
+static int send_query_socket(int sockfd, FAR const char *name,
+ FAR struct sockaddr_in6 *addr)
#else
-static int send_query_socket(int sockfd, const char *name, struct sockaddr_in *addr)
+static int send_query_socket(int sockfd, FAR const char *name,
+ FAR struct sockaddr_in *addr)
#endif
{
- register struct dns_hdr *hdr;
- char *query;
- char *nptr;
- const char *nameptr;
+ register FAR struct dns_hdr *hdr;
+ FAR char *query;
+ FAR char *nptr;
+ FAR const char *nameptr;
uint8_t seqno = g_seqno++;
static unsigned char endquery[] = {0, 0, 1, 0, 1};
char buffer[SEND_BUFFER_SIZE];
int n;
- hdr = (struct dns_hdr*)buffer;
+ hdr = (FAR struct dns_hdr*)buffer;
memset(hdr, 0, sizeof(struct dns_hdr));
hdr->id = htons(seqno);
hdr->flags1 = DNS_FLAG1_RD;
@@ -235,6 +245,7 @@ static int send_query_socket(int sockfd, const char *name, struct sockaddr_in *a
*query++ = *nameptr;
n++;
}
+
*nptr = n;
}
while(*nameptr != 0);
@@ -247,32 +258,43 @@ static int send_query_socket(int sockfd, const char *name, struct sockaddr_in *a
DEBUGASSERT(((struct sockaddr *)addr)->sa_family == AF_INET);
#endif
- return sendto(sockfd, buffer, query + 5 - buffer, 0, (struct sockaddr*)addr, ADDRLEN);
+ return sendto(sockfd, buffer, query + 5 - buffer,
+ 0, (struct sockaddr*)addr, ADDRLEN);
}
+/****************************************************************************
+ * Name: send_query
+ ****************************************************************************/
+
#if 0 /* Not used */
#ifdef CONFIG_NET_IPv6
-static int send_query(const char *name, struct sockaddr_in6 *addr)
+static int send_query(FAR const char *name, FAR struct sockaddr_in6 *addr)
#else
-static int send_query(const char *name, struct sockaddr_in *addr)
+static int send_query(FAR const char *name, FAR struct sockaddr_in *addr)
#endif
{
return send_query_socket(g_sockfd, name, addr);
}
#endif
-/* Called when new UDP data arrives */
+/****************************************************************************
+ * Name: recv_response_socket
+ *
+ * Description:
+ * Called when new UDP data arrives
+ *
+ ****************************************************************************/
#ifdef CONFIG_NET_IPv6
-#error "Not implemented"
+# error "Not implemented"
#else
-int recv_response_socket(int sockfd, struct sockaddr_in *addr)
+int recv_response_socket(int sockfd, FAR struct sockaddr_in *addr)
#endif
{
- unsigned char *nameptr;
+ FAR unsigned char *nameptr;
char buffer[RECV_BUFFER_SIZE];
- struct dns_answer *ans;
- struct dns_hdr *hdr;
+ FAR struct dns_answer *ans;
+ FAR struct dns_hdr *hdr;
#if 0 /* Not used */
uint8_t nquestions;
#endif
@@ -287,7 +309,7 @@ int recv_response_socket(int sockfd, struct sockaddr_in *addr)
return ret;
}
- hdr = (struct dns_hdr *)buffer;
+ hdr = (FAR struct dns_hdr *)buffer;
ndbg("ID %d\n", htons(hdr->id));
ndbg("Query %d\n", hdr->flags1 & DNS_FLAG1_RESPONSE);
@@ -312,8 +334,8 @@ int recv_response_socket(int sockfd, struct sockaddr_in *addr)
#endif
nanswers = htons(hdr->numanswers);
- /* Skip the name in the question. XXX: This should really be
- * checked agains the name in the question, to be sure that they
+ /* Skip the name in the question. TODO: This should really be
+ * checked against the name in the question, to be sure that they
* match.
*/
@@ -350,12 +372,13 @@ int recv_response_socket(int sockfd, struct sockaddr_in *addr)
{
/* Compressed name. */
- nameptr +=2;
- ndbg("Compressed anwser\n");
+ nameptr += 2;
+ ndbg("Compressed answer\n");
}
else
{
/* Not compressed name. */
+
nameptr = parse_name(nameptr);
}
@@ -367,16 +390,19 @@ int recv_response_socket(int sockfd, struct sockaddr_in *addr)
/* Check for IP address type and Internet class. Others are discarded. */
- if (ans->type == HTONS(1) && ans->class == HTONS(1) && ans->len == HTONS(4))
+ if (ans->type == HTONS(1) &&
+ ans->class == HTONS(1) &&
+ ans->len == HTONS(4))
{
- ans->ipaddr.s_addr = *(uint32_t*)(nameptr+10);
+ ans->ipaddr.s_addr = *(FAR uint32_t *)(nameptr + 10);
+
ndbg("IP address %d.%d.%d.%d\n",
(ans->ipaddr.s_addr ) & 0xff,
(ans->ipaddr.s_addr >> 8 ) & 0xff,
(ans->ipaddr.s_addr >> 16 ) & 0xff,
(ans->ipaddr.s_addr >> 24 ) & 0xff);
- /* XXX: we should really check that this IP address is the one
+ /* TODO: we should really check that this IP address is the one
* we want.
*/
@@ -392,10 +418,14 @@ int recv_response_socket(int sockfd, struct sockaddr_in *addr)
return ERROR;
}
+/****************************************************************************
+ * Name: recv_response
+ ****************************************************************************/
+
#ifdef CONFIG_NET_IPv6
-#error "Not implemented"
+# error "Not implemented"
#else
-int recv_response(struct sockaddr_in *addr)
+int recv_response(FAR struct sockaddr_in *addr)
#endif
{
return recv_response_socket(g_sockfd, addr);
@@ -406,14 +436,93 @@ int recv_response(struct sockaddr_in *addr)
****************************************************************************/
/****************************************************************************
- * Name: resolv_gethostip
+ * Name: dns_bind_sock
+ *
+ * Description:
+ * Initialize the DNS resolver using the caller provided socket.
+ *
+ ****************************************************************************/
+
+int dns_bind_sock(FAR int *sockfd)
+{
+ struct timeval tv;
+ int ret;
+
+ if (*sockfd >= 0) dns_free_sock(sockfd);
+
+ *sockfd = socket(PF_INET, SOCK_DGRAM, 0);
+ if (*sockfd < 0)
+ {
+ return ERROR;
+ }
+
+ /* Set up a receive timeout */
+
+ tv.tv_sec = 30;
+ tv.tv_usec = 0;
+
+ ret = setsockopt(*sockfd, SOL_SOCKET, SO_RCVTIMEO, &tv,
+ sizeof(struct timeval));
+
+ if (ret < 0)
+ {
+ close(*sockfd);
+ *sockfd = -1;
+ return ERROR;
+ }
+
+ return OK;
+}
+
+/****************************************************************************
+ * Name: dns_bind
+ *
+ * Description:
+ * Initialize the DNS resolver using an internal, share-able socket.
+ *
+ ****************************************************************************/
+
+int dns_bind(void)
+{
+ return dns_bind_sock(&g_sockfd);
+}
+
+/****************************************************************************
+ * Name: dns_free_sock
+ *
+ * Description:
+ * Release the DNS resolver by closing the socket.
+ *
****************************************************************************/
-int resolv_gethostip_socket(int sockfd, const char *hostname, in_addr_t *ipaddr)
+int dns_free_sock(FAR int *sockfd)
+{
+ if (*sockfd >= 0)
+ {
+ close(*sockfd);
+ *sockfd = -1;
+ }
+
+ return OK;
+}
+
+/****************************************************************************
+ * Name: dns_query_sock
+ *
+ * Description:
+ * Using the DNS resolver socket (sockfd), look up the the 'hostname', and
+ * return its IP address in 'ipaddr'
+ *
+ * Returned Value:
+ * Returns zero (OK) if the query was successful.
+ *
+ ****************************************************************************/
+
+int dns_query_sock(int sockfd, FAR const char *hostname, FAR in_addr_t *ipaddr)
{
#ifdef CONFIG_HAVE_GETHOSTBYNAME
- struct hostent *he;
+ FAR struct hostent *he;
nvdbg("Getting address of %s\n", hostname);
he = gethostbyname(hostname);
@@ -445,7 +554,7 @@ int resolv_gethostip_socket(int sockfd, const char *hostname, in_addr_t *ipaddr)
* the host name to an IP address.
*/
- if (resolv_query_socket(sockfd, hostname, &addr) < 0)
+ if (dns_whois_socket(sockfd, hostname, &addr) < 0)
{
/* Needs to set the errno here */
@@ -456,37 +565,86 @@ int resolv_gethostip_socket(int sockfd, const char *hostname, in_addr_t *ipaddr)
*ipaddr = addr.sin_addr.s_addr;
}
- return OK;
+ return OK;
#endif
}
-int resolv_gethostip(const char *hostname, in_addr_t *ipaddr)
+/****************************************************************************
+ * Name: dns_query
+ *
+ * Description:
+ * Using the internal DNS resolver socket, look up the the 'hostname', and
+ * return its IP address in 'ipaddr'
+ *
+ * Returned Value:
+ * Returns zero (OK) if the query was successful.
+ *
+ ****************************************************************************/
+
+int dns_query(FAR const char *hostname, FAR in_addr_t *ipaddr)
{
- return resolv_gethostip_socket(g_sockfd, hostname, ipaddr);
+ return dns_query_sock(g_sockfd, hostname, ipaddr);
}
-int dns_gethostip(const char *hostname, in_addr_t *ipaddr)
+/****************************************************************************
+ * Name: dns_setserver
+ *
+ * Description:
+ * Configure which DNS server to use for queries
+ *
+ ****************************************************************************/
+
+#ifdef CONFIG_NET_IPv6
+void dns_setserver(FAR const struct in6_addr *dnsserver)
+#else
+void dns_setserver(FAR const struct in_addr *dnsserver)
+#endif
{
- int sockfd = -1;
- int ret=ERROR;
+ g_dnsserver.sin_family = AF_INET;
+ g_dnsserver.sin_port = HTONS(53);
+#ifdef CONFIG_NET_IPv6
+ memcpy(&g_dnsserver.sin6_addr, dnsserver, ADDRLEN);
+#else
+ g_dnsserver.sin_addr.s_addr = dnsserver->s_addr;
+#endif
+}
- resolv_create(&sockfd);
- if (sockfd >= 0)
- {
- ret = resolv_gethostip_socket(sockfd, hostname, ipaddr);
- resolv_release(&sockfd);
- }
+/****************************************************************************
+ * Name: dns_getserver
+ *
+ * Description:
+ * Obtain the currently configured DNS server.
+ *
+ ****************************************************************************/
- return ret;
+#ifdef CONFIG_NET_IPv6
+void dns_getserver(FAR struct in6_addr *dnsserver)
+#else
+void dns_getserver(FAR struct in_addr *dnsserver)
+#endif
+{
+#ifdef CONFIG_NET_IPv6
+ memcpy(dnsserver, &g_dnsserver.sin6_addr, ADDRLEN);
+#else
+ dnsserver->s_addr = g_dnsserver.sin_addr.s_addr;
+#endif
}
-/* Get the binding for name. */
+/****************************************************************************
+ * Name: dns_whois_socket
+ *
+ * Description:
+ * Get the binding for 'name' using the DNS server accessed via 'sockfd'
+ *
+ ****************************************************************************/
#ifdef CONFIG_NET_IPv6
-int resolv_query_socket(int sockfd, FAR const char *name, FAR struct sockaddr_in6 *addr)
+int dns_whois_socket(int sockfd, FAR const char *name,
+ FAR struct sockaddr_in6 *addr)
#else
-int resolv_query_socket(int sockfd, FAR const char *name, FAR struct sockaddr_in *addr)
+int dns_whois_socket(int sockfd, FAR const char *name,
+ FAR struct sockaddr_in *addr)
#endif
{
int retries;
@@ -520,91 +678,46 @@ int resolv_query_socket(int sockfd, FAR const char *name, FAR struct sockaddr_in
return ERROR;
}
-#ifdef CONFIG_NET_IPv6
-int resolv_query(FAR const char *name, FAR struct sockaddr_in6 *addr)
-#else
-int resolv_query(FAR const char *name, FAR struct sockaddr_in *addr)
-#endif
-{
- return resolv_query_socket(g_sockfd, name, addr);
-}
-
-/* Obtain the currently configured DNS server. */
-
-#ifdef CONFIG_NET_IPv6
-void resolv_getserver(struct in6_addr *dnsserver)
-#else
-void resolv_getserver(struct in_addr *dnsserver)
-#endif
-{
-#ifdef CONFIG_NET_IPv6
- memcpy(dnsserver, &g_dnsserver.sin6_addr, ADDRLEN);
-#else
- dnsserver->s_addr = g_dnsserver.sin_addr.s_addr;
-#endif
-}
-
-/* Configure which DNS server to use for queries */
+/****************************************************************************
+ * Name: dns_whois
+ *
+ * Description:
+ * Get the binding for 'name' using the DNS server accessed via the DNS
+ * resolvers internal socket.
+ *
+ ****************************************************************************/
#ifdef CONFIG_NET_IPv6
-void resolv_conf(const struct in6_addr *dnsserver)
-#else
-void resolv_conf(const struct in_addr *dnsserver)
-#endif
-{
- g_dnsserver.sin_family = AF_INET;
- g_dnsserver.sin_port = HTONS(53);
-#ifdef CONFIG_NET_IPv6
- memcpy(&g_dnsserver.sin6_addr, dnsserver, ADDRLEN);
+int dns_whois(FAR const char *name, FAR struct sockaddr_in6 *addr)
#else
- g_dnsserver.sin_addr.s_addr = dnsserver->s_addr;
+int dns_whois(FAR const char *name, FAR struct sockaddr_in *addr)
#endif
-}
-
-/* Release the resolver. */
-
-int resolv_release(int *sockfd)
{
- if (*sockfd >= 0)
- {
- close(*sockfd);
- *sockfd = -1;
- }
-
- return OK;
+ return dns_whois_socket(g_sockfd, name, addr);
}
-/* Create the resolver. */
+/****************************************************************************
+ * Name: dns_gethostip
+ *
+ * Descriptions:
+ * Combines the operations of dns_bind_sock(), dns_query_sock(), and
+ * dns_free_sock() to obtain the the IP address ('ipaddr') associated with
+ * the 'hostname' in one operation.
+ *
+ ****************************************************************************/
-int resolv_create(int *sockfd)
+int dns_gethostip(FAR const char *hostname, FAR in_addr_t *ipaddr)
{
- struct timeval tv;
-
- if (*sockfd >= 0) resolv_release(sockfd);
-
- *sockfd = socket(PF_INET, SOCK_DGRAM, 0);
- if (*sockfd < 0)
- {
- return ERROR;
- }
-
- /* Set up a receive timeout */
+ int sockfd = -1;
+ int ret=ERROR;
- tv.tv_sec = 30;
- tv.tv_usec = 0;
- if (setsockopt(*sockfd, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(struct timeval)) < 0)
+ dns_bind_sock(&sockfd);
+ if (sockfd >= 0)
{
- close(*sockfd);
- *sockfd = -1;
- return ERROR;
+ ret = dns_query_sock(sockfd, hostname, ipaddr);
+ dns_free_sock(&sockfd);
}
- return OK;
+ return ret;
}
-/* Initalize the resolver. */
-
-int resolv_init(void)
-{
- return resolv_create(&g_sockfd);
-}
diff --git a/apps/nshlib/Kconfig b/apps/nshlib/Kconfig
index 1de11376a..1dec22740 100644
--- a/apps/nshlib/Kconfig
+++ b/apps/nshlib/Kconfig
@@ -825,7 +825,7 @@ config NSH_NETMASK
config NSH_DNS
bool "Use DNS"
default n
- depends on NSH_LIBRARY && NETUTILS_RESOLV
+ depends on NSH_LIBRARY && NETUTILS_DNSCLIENT
---help---
Configure to use a DNS.
diff --git a/apps/nshlib/nsh_netcmds.c b/apps/nshlib/nsh_netcmds.c
index 024fb248e..b1789d123 100644
--- a/apps/nshlib/nsh_netcmds.c
+++ b/apps/nshlib/nsh_netcmds.c
@@ -320,7 +320,7 @@ int ifconfig_callback(FAR struct uip_driver_s *dev, void *arg)
nsh_output(vtbl, "Mask:%s\n", inet_ntoa(addr));
#if defined(CONFIG_NSH_DHCPC) || defined(CONFIG_NSH_DNS)
- resolv_getserver(&addr);
+ dns_getserver(&addr);
nsh_output(vtbl, "\tDNSaddr:%s\n", inet_ntoa(addr));
#endif
@@ -770,7 +770,7 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
addr.s_addr = gip;
}
- resolv_conf(&addr);
+ dns_setserver(&addr);
#endif
#if defined(CONFIG_NSH_DHCPC)
@@ -807,7 +807,7 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
if (ds.dnsaddr.s_addr != 0)
{
- resolv_conf(&ds.dnsaddr);
+ dns_setserver(&ds.dnsaddr);
}
dhcpc_close(handle);
diff --git a/apps/nshlib/nsh_netinit.c b/apps/nshlib/nsh_netinit.c
index 58d238312..9a44f4905 100644
--- a/apps/nshlib/nsh_netinit.c
+++ b/apps/nshlib/nsh_netinit.c
@@ -132,10 +132,10 @@ int nsh_netinit(void)
#if defined(CONFIG_NSH_DHCPC) || defined(CONFIG_NSH_DNS)
/* Set up the resolver */
- resolv_init();
+ dns_bind();
#if defined(CONFIG_NSH_DNS)
addr.s_addr = HTONL(CONFIG_NSH_DNSIPADDR);
- resolv_conf(&addr);
+ dns_setserver(&addr);
#endif
#endif
@@ -167,7 +167,7 @@ int nsh_netinit(void)
}
if (ds.dnsaddr.s_addr != 0)
{
- resolv_conf(&ds.dnsaddr);
+ dns_setserver(&ds.dnsaddr);
}
dhcpc_close(handle);
}
diff --git a/nuttx/configs/arduino-due/nsh/defconfig b/nuttx/configs/arduino-due/nsh/defconfig
index 0efcb5353..69ff07c45 100644
--- a/nuttx/configs/arduino-due/nsh/defconfig
+++ b/nuttx/configs/arduino-due/nsh/defconfig
@@ -557,7 +557,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/c5471evm/nsh/defconfig b/nuttx/configs/c5471evm/nsh/defconfig
index 5842cbc72..b943e5d62 100644
--- a/nuttx/configs/c5471evm/nsh/defconfig
+++ b/nuttx/configs/c5471evm/nsh/defconfig
@@ -553,9 +553,9 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=4
-CONFIG_NET_RESOLV_MAXRESPONSE=96
+CONFIG_NETUTILS_DNSCLIENT=y
+CONFIG_NETUTILS_DNSCLIENT_ENTRIES=4
+CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
# CONFIG_NETUTILS_SMTP is not set
CONFIG_NETUTILS_TELNETD=y
CONFIG_NETUTILS_TFTPC=y
diff --git a/nuttx/configs/cloudctrl/nsh/defconfig b/nuttx/configs/cloudctrl/nsh/defconfig
index 4ddc1d6fd..8752539a3 100644
--- a/nuttx/configs/cloudctrl/nsh/defconfig
+++ b/nuttx/configs/cloudctrl/nsh/defconfig
@@ -583,9 +583,9 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=8
-CONFIG_NET_RESOLV_MAXRESPONSE=96
+CONFIG_NETUTILS_DNSCLIENT=y
+CONFIG_NETUTILS_DNSCLIENT_ENTRIES=8
+CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
# CONFIG_NETUTILS_SMTP is not set
CONFIG_NETUTILS_TELNETD=y
CONFIG_NETUTILS_TFTPC=y
diff --git a/nuttx/configs/compal_e86/nsh_highram/defconfig b/nuttx/configs/compal_e86/nsh_highram/defconfig
index 2124bf4bc..dcd1c5242 100644
--- a/nuttx/configs/compal_e86/nsh_highram/defconfig
+++ b/nuttx/configs/compal_e86/nsh_highram/defconfig
@@ -488,7 +488,7 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/ea3131/nsh/defconfig b/nuttx/configs/ea3131/nsh/defconfig
index da5572cc4..fc578b51a 100644
--- a/nuttx/configs/ea3131/nsh/defconfig
+++ b/nuttx/configs/ea3131/nsh/defconfig
@@ -523,7 +523,7 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/eagle100/nsh/defconfig b/nuttx/configs/eagle100/nsh/defconfig
index e4dc8b20b..4b0ac768b 100644
--- a/nuttx/configs/eagle100/nsh/defconfig
+++ b/nuttx/configs/eagle100/nsh/defconfig
@@ -670,9 +670,9 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=4
-CONFIG_NET_RESOLV_MAXRESPONSE=96
+CONFIG_NETUTILS_DNSCLIENT=y
+CONFIG_NETUTILS_DNSCLIENT_ENTRIES=4
+CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
# CONFIG_NETUTILS_SMTP is not set
CONFIG_NETUTILS_TELNETD=y
CONFIG_NETUTILS_TFTPC=y
diff --git a/nuttx/configs/ez80f910200kitg/ostest/defconfig b/nuttx/configs/ez80f910200kitg/ostest/defconfig
index 242cbe029..a51cccc59 100644
--- a/nuttx/configs/ez80f910200kitg/ostest/defconfig
+++ b/nuttx/configs/ez80f910200kitg/ostest/defconfig
@@ -526,7 +526,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/ez80f910200zco/dhcpd/defconfig b/nuttx/configs/ez80f910200zco/dhcpd/defconfig
index 5b22c258e..8495caf7f 100644
--- a/nuttx/configs/ez80f910200zco/dhcpd/defconfig
+++ b/nuttx/configs/ez80f910200zco/dhcpd/defconfig
@@ -622,7 +622,7 @@ CONFIG_NETUTILS_DHCPD_DECLINETIME=3600
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TFTPC is not set
# CONFIG_NETUTILS_THTTPD is not set
diff --git a/nuttx/configs/ez80f910200zco/nsh/defconfig b/nuttx/configs/ez80f910200zco/nsh/defconfig
index b87baf221..10942baf8 100644
--- a/nuttx/configs/ez80f910200zco/nsh/defconfig
+++ b/nuttx/configs/ez80f910200zco/nsh/defconfig
@@ -632,9 +632,9 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=4
-CONFIG_NET_RESOLV_MAXRESPONSE=96
+CONFIG_NETUTILS_DNSCLIENT=y
+CONFIG_NETUTILS_DNSCLIENT_ENTRIES=4
+CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
# CONFIG_NETUTILS_SMTP is not set
CONFIG_NETUTILS_TELNETD=y
CONFIG_NETUTILS_TFTPC=y
diff --git a/nuttx/configs/fire-stm32v2/nsh/defconfig b/nuttx/configs/fire-stm32v2/nsh/defconfig
index 19153f96a..5ed2dfbb9 100644
--- a/nuttx/configs/fire-stm32v2/nsh/defconfig
+++ b/nuttx/configs/fire-stm32v2/nsh/defconfig
@@ -852,8 +852,8 @@ CONFIG_SYSTEM_USBMSC_DEVPATH3="/dev/mmcsd2"
#
# Name resolution
#
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=8
+CONFIG_NETUTILS_DNSCLIENT=y
+CONFIG_NETUTILS_DNSCLIENT_ENTRIES=8
#
# SMTP
diff --git a/nuttx/configs/freedom-kl25z/minnsh/defconfig b/nuttx/configs/freedom-kl25z/minnsh/defconfig
index 4bab7502e..9c3eda216 100644
--- a/nuttx/configs/freedom-kl25z/minnsh/defconfig
+++ b/nuttx/configs/freedom-kl25z/minnsh/defconfig
@@ -533,7 +533,7 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/freedom-kl25z/nsh/defconfig b/nuttx/configs/freedom-kl25z/nsh/defconfig
index 8298184b0..33323233f 100644
--- a/nuttx/configs/freedom-kl25z/nsh/defconfig
+++ b/nuttx/configs/freedom-kl25z/nsh/defconfig
@@ -521,7 +521,7 @@ CONFIG_EXAMPLES_PWM_DURATION=5
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/hymini-stm32v/buttons/defconfig b/nuttx/configs/hymini-stm32v/buttons/defconfig
index f46f8daa1..8bddd0eea 100644
--- a/nuttx/configs/hymini-stm32v/buttons/defconfig
+++ b/nuttx/configs/hymini-stm32v/buttons/defconfig
@@ -570,7 +570,7 @@ CONFIG_EXAMPLES_BUTTONS_NAME7="Button 7"
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/hymini-stm32v/nsh/defconfig b/nuttx/configs/hymini-stm32v/nsh/defconfig
index 8a5156eca..f7d69792b 100644
--- a/nuttx/configs/hymini-stm32v/nsh/defconfig
+++ b/nuttx/configs/hymini-stm32v/nsh/defconfig
@@ -581,7 +581,7 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/hymini-stm32v/nsh2/defconfig b/nuttx/configs/hymini-stm32v/nsh2/defconfig
index c3e20b245..c95f1618c 100644
--- a/nuttx/configs/hymini-stm32v/nsh2/defconfig
+++ b/nuttx/configs/hymini-stm32v/nsh2/defconfig
@@ -764,7 +764,7 @@ CONFIG_SYSTEM_USBMSC_DEVPATH3="/dev/mmcsd2"
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/hymini-stm32v/usbnsh/defconfig b/nuttx/configs/hymini-stm32v/usbnsh/defconfig
index 5e2432457..c437e3307 100644
--- a/nuttx/configs/hymini-stm32v/usbnsh/defconfig
+++ b/nuttx/configs/hymini-stm32v/usbnsh/defconfig
@@ -613,7 +613,7 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/kwikstik-k40/ostest/defconfig b/nuttx/configs/kwikstik-k40/ostest/defconfig
index 9ecbc8303..245aa3cbf 100644
--- a/nuttx/configs/kwikstik-k40/ostest/defconfig
+++ b/nuttx/configs/kwikstik-k40/ostest/defconfig
@@ -511,7 +511,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/lm3s6432-s2e/nsh/defconfig b/nuttx/configs/lm3s6432-s2e/nsh/defconfig
index 7b1829523..7f4499d56 100644
--- a/nuttx/configs/lm3s6432-s2e/nsh/defconfig
+++ b/nuttx/configs/lm3s6432-s2e/nsh/defconfig
@@ -649,9 +649,9 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=4
-CONFIG_NET_RESOLV_MAXRESPONSE=96
+CONFIG_NETUTILS_DNSCLIENT=y
+CONFIG_NETUTILS_DNSCLIENT_ENTRIES=4
+CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
# CONFIG_NETUTILS_SMTP is not set
CONFIG_NETUTILS_TELNETD=y
CONFIG_NETUTILS_TFTPC=y
diff --git a/nuttx/configs/lm3s6965-ek/discover/defconfig b/nuttx/configs/lm3s6965-ek/discover/defconfig
index 44feb4b80..97bbdcda3 100644
--- a/nuttx/configs/lm3s6965-ek/discover/defconfig
+++ b/nuttx/configs/lm3s6965-ek/discover/defconfig
@@ -662,9 +662,9 @@ CONFIG_NETUTILS_DHCPC=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=4
-CONFIG_NET_RESOLV_MAXRESPONSE=96
+CONFIG_NETUTILS_DNSCLIENT=y
+CONFIG_NETUTILS_DNSCLIENT_ENTRIES=4
+CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
# CONFIG_NETUTILS_SMTP is not set
CONFIG_NETUTILS_TELNETD=y
CONFIG_NETUTILS_TFTPC=y
diff --git a/nuttx/configs/lm3s6965-ek/nsh/defconfig b/nuttx/configs/lm3s6965-ek/nsh/defconfig
index 44feb4b80..97bbdcda3 100644
--- a/nuttx/configs/lm3s6965-ek/nsh/defconfig
+++ b/nuttx/configs/lm3s6965-ek/nsh/defconfig
@@ -662,9 +662,9 @@ CONFIG_NETUTILS_DHCPC=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=4
-CONFIG_NET_RESOLV_MAXRESPONSE=96
+CONFIG_NETUTILS_DNSCLIENT=y
+CONFIG_NETUTILS_DNSCLIENT_ENTRIES=4
+CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
# CONFIG_NETUTILS_SMTP is not set
CONFIG_NETUTILS_TELNETD=y
CONFIG_NETUTILS_TFTPC=y
diff --git a/nuttx/configs/lm3s6965-ek/tcpecho/defconfig b/nuttx/configs/lm3s6965-ek/tcpecho/defconfig
index 5b623bb37..93267b749 100644
--- a/nuttx/configs/lm3s6965-ek/tcpecho/defconfig
+++ b/nuttx/configs/lm3s6965-ek/tcpecho/defconfig
@@ -674,9 +674,9 @@ CONFIG_NETUTILS_DHCPC=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=4
-CONFIG_NET_RESOLV_MAXRESPONSE=96
+CONFIG_NETUTILS_DNSCLIENT=y
+CONFIG_NETUTILS_DNSCLIENT_ENTRIES=4
+CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
# CONFIG_NETUTILS_SMTP is not set
CONFIG_NETUTILS_TELNETD=y
CONFIG_NETUTILS_TFTPC=y
diff --git a/nuttx/configs/lm3s8962-ek/nsh/defconfig b/nuttx/configs/lm3s8962-ek/nsh/defconfig
index 6f7e24147..f105c5ece 100644
--- a/nuttx/configs/lm3s8962-ek/nsh/defconfig
+++ b/nuttx/configs/lm3s8962-ek/nsh/defconfig
@@ -670,9 +670,9 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=4
-CONFIG_NET_RESOLV_MAXRESPONSE=96
+CONFIG_NETUTILS_DNSCLIENT=y
+CONFIG_NETUTILS_DNSCLIENT_ENTRIES=4
+CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
# CONFIG_NETUTILS_SMTP is not set
CONFIG_NETUTILS_TELNETD=y
CONFIG_NETUTILS_TFTPC=y
diff --git a/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig b/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig
index 3ea132c17..174e2fcda 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig
+++ b/nuttx/configs/lpcxpresso-lpc1768/dhcpd/defconfig
@@ -655,7 +655,7 @@ CONFIG_NETUTILS_DHCPD_DECLINETIME=3600
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TFTPC is not set
# CONFIG_NETUTILS_THTTPD is not set
diff --git a/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig b/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig
index 47e5fc77c..cc9cee413 100644
--- a/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig
+++ b/nuttx/configs/lpcxpresso-lpc1768/nsh/defconfig
@@ -697,9 +697,9 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=4
-CONFIG_NET_RESOLV_MAXRESPONSE=96
+CONFIG_NETUTILS_DNSCLIENT=y
+CONFIG_NETUTILS_DNSCLIENT_ENTRIES=4
+CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
# CONFIG_NETUTILS_SMTP is not set
CONFIG_NETUTILS_TELNETD=y
CONFIG_NETUTILS_TFTPC=y
diff --git a/nuttx/configs/maple/nsh/defconfig b/nuttx/configs/maple/nsh/defconfig
index 0ea9841ef..502e332b8 100644
--- a/nuttx/configs/maple/nsh/defconfig
+++ b/nuttx/configs/maple/nsh/defconfig
@@ -671,7 +671,7 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/maple/nx/defconfig b/nuttx/configs/maple/nx/defconfig
index 22508d4bf..53b7545e6 100644
--- a/nuttx/configs/maple/nx/defconfig
+++ b/nuttx/configs/maple/nx/defconfig
@@ -838,7 +838,7 @@ CONFIG_EXAMPLES_NXHELLO_DEFAULT_FONT=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/maple/usbnsh/defconfig b/nuttx/configs/maple/usbnsh/defconfig
index 62c6aaceb..3c094f367 100644
--- a/nuttx/configs/maple/usbnsh/defconfig
+++ b/nuttx/configs/maple/usbnsh/defconfig
@@ -697,7 +697,7 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/mcu123-lpc214x/nsh/defconfig b/nuttx/configs/mcu123-lpc214x/nsh/defconfig
index 96b7d7344..0face2bce 100644
--- a/nuttx/configs/mcu123-lpc214x/nsh/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/nsh/defconfig
@@ -475,7 +475,7 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/ntosd-dm320/nsh/defconfig b/nuttx/configs/ntosd-dm320/nsh/defconfig
index 23c2018e6..a1f7a3c9f 100644
--- a/nuttx/configs/ntosd-dm320/nsh/defconfig
+++ b/nuttx/configs/ntosd-dm320/nsh/defconfig
@@ -613,9 +613,9 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=4
-CONFIG_NET_RESOLV_MAXRESPONSE=96
+CONFIG_NETUTILS_DNSCLIENT=y
+CONFIG_NETUTILS_DNSCLIENT_ENTRIES=4
+CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
# CONFIG_NETUTILS_SMTP is not set
CONFIG_NETUTILS_TELNETD=y
CONFIG_NETUTILS_TFTPC=y
diff --git a/nuttx/configs/ntosd-dm320/udp/defconfig b/nuttx/configs/ntosd-dm320/udp/defconfig
index 78bdb780a..d40b1151a 100644
--- a/nuttx/configs/ntosd-dm320/udp/defconfig
+++ b/nuttx/configs/ntosd-dm320/udp/defconfig
@@ -586,7 +586,7 @@ CONFIG_EXAMPLES_UDP_SERVERIP=0x0a000001
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TFTPC is not set
# CONFIG_NETUTILS_THTTPD is not set
diff --git a/nuttx/configs/nucleus2g/usbserial/defconfig b/nuttx/configs/nucleus2g/usbserial/defconfig
index 7a528aec6..7e7137041 100644
--- a/nuttx/configs/nucleus2g/usbserial/defconfig
+++ b/nuttx/configs/nucleus2g/usbserial/defconfig
@@ -554,7 +554,7 @@ CONFIG_EXAMPLES_USBSERIAL=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/nutiny-nuc120/nsh/defconfig b/nuttx/configs/nutiny-nuc120/nsh/defconfig
index cd3e96833..8f79e197a 100644
--- a/nuttx/configs/nutiny-nuc120/nsh/defconfig
+++ b/nuttx/configs/nutiny-nuc120/nsh/defconfig
@@ -502,7 +502,7 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/olimex-lpc-h3131/nsh/defconfig b/nuttx/configs/olimex-lpc-h3131/nsh/defconfig
index 2bd4ac9d5..708f00ac7 100644
--- a/nuttx/configs/olimex-lpc-h3131/nsh/defconfig
+++ b/nuttx/configs/olimex-lpc-h3131/nsh/defconfig
@@ -525,7 +525,7 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig b/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig
index 2587384c1..4d5afcc63 100644
--- a/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/ftpc/defconfig
@@ -708,9 +708,9 @@ CONFIG_EXAMPLES_NSH=y
CONFIG_NETUTILS_FTPC=y
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=4
-CONFIG_NET_RESOLV_MAXRESPONSE=96
+CONFIG_NETUTILS_DNSCLIENT=y
+CONFIG_NETUTILS_DNSCLIENT_ENTRIES=4
+CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/olimex-lpc1766stk/hidmouse/defconfig b/nuttx/configs/olimex-lpc1766stk/hidmouse/defconfig
index 70d57d4b7..c1c437825 100644
--- a/nuttx/configs/olimex-lpc1766stk/hidmouse/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/hidmouse/defconfig
@@ -706,9 +706,9 @@ CONFIG_NETUTILS_DHCPC=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=8
-CONFIG_NET_RESOLV_MAXRESPONSE=96
+CONFIG_NETUTILS_DNSCLIENT=y
+CONFIG_NETUTILS_DNSCLIENT_ENTRIES=8
+CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
# CONFIG_NETUTILS_SMTP is not set
CONFIG_NETUTILS_TELNETD=y
CONFIG_NETUTILS_TFTPC=y
diff --git a/nuttx/configs/olimex-lpc1766stk/nsh/defconfig b/nuttx/configs/olimex-lpc1766stk/nsh/defconfig
index 51e649a9b..8abd331d7 100644
--- a/nuttx/configs/olimex-lpc1766stk/nsh/defconfig
+++ b/nuttx/configs/olimex-lpc1766stk/nsh/defconfig
@@ -708,9 +708,9 @@ CONFIG_NETUTILS_DHCPC=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=8
-CONFIG_NET_RESOLV_MAXRESPONSE=96
+CONFIG_NETUTILS_DNSCLIENT=y
+CONFIG_NETUTILS_DNSCLIENT_ENTRIES=8
+CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
# CONFIG_NETUTILS_SMTP is not set
CONFIG_NETUTILS_TELNETD=y
CONFIG_NETUTILS_TFTPC=y
diff --git a/nuttx/configs/olimex-stm32-p107/nsh/defconfig b/nuttx/configs/olimex-stm32-p107/nsh/defconfig
index 04029186d..af4e469ba 100644
--- a/nuttx/configs/olimex-stm32-p107/nsh/defconfig
+++ b/nuttx/configs/olimex-stm32-p107/nsh/defconfig
@@ -724,9 +724,9 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=8
-CONFIG_NET_RESOLV_MAXRESPONSE=96
+CONFIG_NETUTILS_DNSCLIENT=y
+CONFIG_NETUTILS_DNSCLIENT_ENTRIES=8
+CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
CONFIG_NETUTILS_TFTPC=y
diff --git a/nuttx/configs/olimex-stm32-p207/nsh/defconfig b/nuttx/configs/olimex-stm32-p207/nsh/defconfig
index 38bbe4b20..8e3d7d344 100644
--- a/nuttx/configs/olimex-stm32-p207/nsh/defconfig
+++ b/nuttx/configs/olimex-stm32-p207/nsh/defconfig
@@ -786,9 +786,9 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=8
-CONFIG_NET_RESOLV_MAXRESPONSE=96
+CONFIG_NETUTILS_DNSCLIENT=y
+CONFIG_NETUTILS_DNSCLIENT_ENTRIES=8
+CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/open1788/knsh/defconfig b/nuttx/configs/open1788/knsh/defconfig
index a21b7a687..89a3385c4 100644
--- a/nuttx/configs/open1788/knsh/defconfig
+++ b/nuttx/configs/open1788/knsh/defconfig
@@ -593,7 +593,7 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/open1788/nsh/defconfig b/nuttx/configs/open1788/nsh/defconfig
index 7da139bc0..b5c025e31 100644
--- a/nuttx/configs/open1788/nsh/defconfig
+++ b/nuttx/configs/open1788/nsh/defconfig
@@ -548,7 +548,7 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/open1788/nxlines/defconfig b/nuttx/configs/open1788/nxlines/defconfig
index ab793d22b..7e3f44694 100644
--- a/nuttx/configs/open1788/nxlines/defconfig
+++ b/nuttx/configs/open1788/nxlines/defconfig
@@ -650,7 +650,7 @@ CONFIG_EXAMPLES_NXLINES_BPP=32
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/p112/ostest/defconfig b/nuttx/configs/p112/ostest/defconfig
index 581b7315b..d70e21100 100644
--- a/nuttx/configs/p112/ostest/defconfig
+++ b/nuttx/configs/p112/ostest/defconfig
@@ -453,7 +453,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/pcblogic-pic32mx/nsh/defconfig b/nuttx/configs/pcblogic-pic32mx/nsh/defconfig
index f8c4282a4..aed06926d 100644
--- a/nuttx/configs/pcblogic-pic32mx/nsh/defconfig
+++ b/nuttx/configs/pcblogic-pic32mx/nsh/defconfig
@@ -593,7 +593,7 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/pcduino-a10/nsh/defconfig b/nuttx/configs/pcduino-a10/nsh/defconfig
index 3d09cb803..7e7824965 100644
--- a/nuttx/configs/pcduino-a10/nsh/defconfig
+++ b/nuttx/configs/pcduino-a10/nsh/defconfig
@@ -592,7 +592,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/pic32-starterkit/nsh2/defconfig b/nuttx/configs/pic32-starterkit/nsh2/defconfig
index 53ba4398e..0e40da1d2 100644
--- a/nuttx/configs/pic32-starterkit/nsh2/defconfig
+++ b/nuttx/configs/pic32-starterkit/nsh2/defconfig
@@ -774,9 +774,9 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=4
-CONFIG_NET_RESOLV_MAXRESPONSE=96
+CONFIG_NETUTILS_DNSCLIENT=y
+CONFIG_NETUTILS_DNSCLIENT_ENTRIES=4
+CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
# CONFIG_NETUTILS_SMTP is not set
CONFIG_NETUTILS_TELNETD=y
CONFIG_NETUTILS_TFTPC=y
diff --git a/nuttx/configs/pic32mx7mmb/nsh/defconfig b/nuttx/configs/pic32mx7mmb/nsh/defconfig
index 4ccd190d5..dcab47a79 100644
--- a/nuttx/configs/pic32mx7mmb/nsh/defconfig
+++ b/nuttx/configs/pic32mx7mmb/nsh/defconfig
@@ -824,9 +824,9 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=4
-CONFIG_NET_RESOLV_MAXRESPONSE=96
+CONFIG_NETUTILS_DNSCLIENT=y
+CONFIG_NETUTILS_DNSCLIENT_ENTRIES=4
+CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
# CONFIG_NETUTILS_SMTP is not set
CONFIG_NETUTILS_TELNETD=y
CONFIG_NETUTILS_TFTPC=y
diff --git a/nuttx/configs/pirelli_dpl10/nsh_highram/defconfig b/nuttx/configs/pirelli_dpl10/nsh_highram/defconfig
index 8d498625b..1f6ba9260 100644
--- a/nuttx/configs/pirelli_dpl10/nsh_highram/defconfig
+++ b/nuttx/configs/pirelli_dpl10/nsh_highram/defconfig
@@ -462,7 +462,7 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/rgmp/arm/nsh/defconfig b/nuttx/configs/rgmp/arm/nsh/defconfig
index 3fd33751e..cf15550e4 100644
--- a/nuttx/configs/rgmp/arm/nsh/defconfig
+++ b/nuttx/configs/rgmp/arm/nsh/defconfig
@@ -556,9 +556,9 @@ CONFIG_NETUTILS_DHCPC=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=4
-CONFIG_NET_RESOLV_MAXRESPONSE=96
+CONFIG_NETUTILS_DNSCLIENT=y
+CONFIG_NETUTILS_DNSCLIENT_ENTRIES=4
+CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
CONFIG_NETUTILS_TFTPC=y
diff --git a/nuttx/configs/rgmp/x86/nsh/defconfig b/nuttx/configs/rgmp/x86/nsh/defconfig
index 689711287..0f12b836f 100644
--- a/nuttx/configs/rgmp/x86/nsh/defconfig
+++ b/nuttx/configs/rgmp/x86/nsh/defconfig
@@ -569,9 +569,9 @@ CONFIG_NETUTILS_DHCPC=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=4
-CONFIG_NET_RESOLV_MAXRESPONSE=96
+CONFIG_NETUTILS_DNSCLIENT=y
+CONFIG_NETUTILS_DNSCLIENT_ENTRIES=4
+CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
CONFIG_NETUTILS_TFTPC=y
diff --git a/nuttx/configs/sam4e-ek/README.txt b/nuttx/configs/sam4e-ek/README.txt
index 1e8a78875..b8a379a8f 100644
--- a/nuttx/configs/sam4e-ek/README.txt
+++ b/nuttx/configs/sam4e-ek/README.txt
@@ -395,7 +395,7 @@ Networking Support
CONFIG_ETH0_PHY_KSZ8051=y : Select the KSZ8051 PHY (for EMAC)
Application Configuration -> Network Utilities
- CONFIG_NETUTILS_RESOLV=y : Enable host address resolution
+ CONFIG_NETUTILS_DNSCLIENT=y : Enable host address resolution
CONFIG_NETUTILS_TELNETD=y : Enable the Telnet daemon
CONFIG_NETUTILS_TFTPC=y : Enable TFTP data file transfers for get and put commands
CONFIG_NETUTILS_UIPLIB=y : Network library support is needed
diff --git a/nuttx/configs/sam4e-ek/nsh/defconfig b/nuttx/configs/sam4e-ek/nsh/defconfig
index 1d4aa3cee..3353d0f53 100644
--- a/nuttx/configs/sam4e-ek/nsh/defconfig
+++ b/nuttx/configs/sam4e-ek/nsh/defconfig
@@ -802,9 +802,9 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=8
-CONFIG_NET_RESOLV_MAXRESPONSE=96
+CONFIG_NETUTILS_DNSCLIENT=y
+CONFIG_NETUTILS_DNSCLIENT_ENTRIES=8
+CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
# CONFIG_NETUTILS_SMTP is not set
CONFIG_NETUTILS_TELNETD=y
CONFIG_NETUTILS_TFTPC=y
diff --git a/nuttx/configs/sam4e-ek/usbnsh/defconfig b/nuttx/configs/sam4e-ek/usbnsh/defconfig
index 92e94d490..e4b84eb94 100644
--- a/nuttx/configs/sam4e-ek/usbnsh/defconfig
+++ b/nuttx/configs/sam4e-ek/usbnsh/defconfig
@@ -850,9 +850,9 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=8
-CONFIG_NET_RESOLV_MAXRESPONSE=96
+CONFIG_NETUTILS_DNSCLIENT=y
+CONFIG_NETUTILS_DNSCLIENT_ENTRIES=8
+CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
# CONFIG_NETUTILS_SMTP is not set
CONFIG_NETUTILS_TELNETD=y
CONFIG_NETUTILS_TFTPC=y
diff --git a/nuttx/configs/sama5d3-xplained/README.txt b/nuttx/configs/sama5d3-xplained/README.txt
index eea1ae338..5deb0c4ac 100644
--- a/nuttx/configs/sama5d3-xplained/README.txt
+++ b/nuttx/configs/sama5d3-xplained/README.txt
@@ -804,7 +804,7 @@ Networking
CONFIG_ETH0_PHY_KSZ90x1=y : Select the KSZ9031 PHY (for GMAC)
Application Configuration -> Network Utilities
- CONFIG_NETUTILS_RESOLV=y : Enable host address resolution
+ CONFIG_NETUTILS_DNSCLIENT=y : Enable host address resolution
CONFIG_NETUTILS_TELNETD=y : Enable the Telnet daemon
CONFIG_NETUTILS_TFTPC=y : Enable TFTP data file transfers for get and put commands
CONFIG_NETUTILS_UIPLIB=y : Network library support is needed
diff --git a/nuttx/configs/sama5d3x-ek/README.txt b/nuttx/configs/sama5d3x-ek/README.txt
index bd8a12f75..78c3fa893 100644
--- a/nuttx/configs/sama5d3x-ek/README.txt
+++ b/nuttx/configs/sama5d3x-ek/README.txt
@@ -937,7 +937,7 @@ Networking
CONFIG_ETH0_PHY_KSZ90x1=y : Select the KSZ9021/31 PHY (for GMAC)
Application Configuration -> Network Utilities
- CONFIG_NETUTILS_RESOLV=y : Enable host address resolution
+ CONFIG_NETUTILS_DNSCLIENT=y : Enable host address resolution
CONFIG_NETUTILS_TELNETD=y : Enable the Telnet daemon
CONFIG_NETUTILS_TFTPC=y : Enable TFTP data file transfers for get and put commands
CONFIG_NETUTILS_UIPLIB=y : Network library support is needed
diff --git a/nuttx/configs/shenzhou/nsh/defconfig b/nuttx/configs/shenzhou/nsh/defconfig
index ca5a4f5f0..ed27fc54f 100644
--- a/nuttx/configs/shenzhou/nsh/defconfig
+++ b/nuttx/configs/shenzhou/nsh/defconfig
@@ -583,9 +583,9 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=8
-CONFIG_NET_RESOLV_MAXRESPONSE=96
+CONFIG_NETUTILS_DNSCLIENT=y
+CONFIG_NETUTILS_DNSCLIENT_ENTRIES=8
+CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
# CONFIG_NETUTILS_SMTP is not set
CONFIG_NETUTILS_TELNETD=y
CONFIG_NETUTILS_TFTPC=y
diff --git a/nuttx/configs/shenzhou/nxwm/defconfig b/nuttx/configs/shenzhou/nxwm/defconfig
index 99016afc6..bf04824d7 100644
--- a/nuttx/configs/shenzhou/nxwm/defconfig
+++ b/nuttx/configs/shenzhou/nxwm/defconfig
@@ -926,9 +926,9 @@ CONFIG_HAVE_CXXINITIALIZE=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=4
-CONFIG_NET_RESOLV_MAXRESPONSE=96
+CONFIG_NETUTILS_DNSCLIENT=y
+CONFIG_NETUTILS_DNSCLIENT_ENTRIES=4
+CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
# CONFIG_NETUTILS_SMTP is not set
CONFIG_NETUTILS_TELNETD=y
CONFIG_NETUTILS_TFTPC=y
diff --git a/nuttx/configs/shenzhou/thttpd/defconfig b/nuttx/configs/shenzhou/thttpd/defconfig
index b75f07c86..0b311d599 100644
--- a/nuttx/configs/shenzhou/thttpd/defconfig
+++ b/nuttx/configs/shenzhou/thttpd/defconfig
@@ -772,8 +772,8 @@ CONFIG_EXAMPLES_NSH=y
#
# Name resolution
#
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=8
+CONFIG_NETUTILS_DNSCLIENT=y
+CONFIG_NETUTILS_DNSCLIENT_ENTRIES=8
#
# SMTP
diff --git a/nuttx/configs/stm3220g-eval/dhcpd/defconfig b/nuttx/configs/stm3220g-eval/dhcpd/defconfig
index b4d346e1f..da5e729d3 100644
--- a/nuttx/configs/stm3220g-eval/dhcpd/defconfig
+++ b/nuttx/configs/stm3220g-eval/dhcpd/defconfig
@@ -806,7 +806,7 @@ CONFIG_NETUTILS_DHCPD_DECLINETIME=3600
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TFTPC is not set
# CONFIG_NETUTILS_THTTPD is not set
diff --git a/nuttx/configs/stm3220g-eval/nsh/defconfig b/nuttx/configs/stm3220g-eval/nsh/defconfig
index 735e19b40..d3b869ff0 100644
--- a/nuttx/configs/stm3220g-eval/nsh/defconfig
+++ b/nuttx/configs/stm3220g-eval/nsh/defconfig
@@ -862,9 +862,9 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=8
-CONFIG_NET_RESOLV_MAXRESPONSE=96
+CONFIG_NETUTILS_DNSCLIENT=y
+CONFIG_NETUTILS_DNSCLIENT_ENTRIES=8
+CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
CONFIG_NETUTILS_TFTPC=y
diff --git a/nuttx/configs/stm3220g-eval/nsh2/defconfig b/nuttx/configs/stm3220g-eval/nsh2/defconfig
index f3ed2b19f..f2db4e619 100644
--- a/nuttx/configs/stm3220g-eval/nsh2/defconfig
+++ b/nuttx/configs/stm3220g-eval/nsh2/defconfig
@@ -873,9 +873,9 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=4
-CONFIG_NET_RESOLV_MAXRESPONSE=96
+CONFIG_NETUTILS_DNSCLIENT=y
+CONFIG_NETUTILS_DNSCLIENT_ENTRIES=4
+CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
# CONFIG_NETUTILS_SMTP is not set
CONFIG_NETUTILS_TELNETD=y
CONFIG_NETUTILS_TFTPC=y
diff --git a/nuttx/configs/stm3240g-eval/dhcpd/defconfig b/nuttx/configs/stm3240g-eval/dhcpd/defconfig
index 2f414acc1..51a79028e 100644
--- a/nuttx/configs/stm3240g-eval/dhcpd/defconfig
+++ b/nuttx/configs/stm3240g-eval/dhcpd/defconfig
@@ -808,7 +808,7 @@ CONFIG_NETUTILS_DHCPD_DECLINETIME=3600
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TFTPC is not set
# CONFIG_NETUTILS_THTTPD is not set
diff --git a/nuttx/configs/stm3240g-eval/discover/defconfig b/nuttx/configs/stm3240g-eval/discover/defconfig
index 11030441f..59b69231f 100644
--- a/nuttx/configs/stm3240g-eval/discover/defconfig
+++ b/nuttx/configs/stm3240g-eval/discover/defconfig
@@ -860,9 +860,9 @@ CONFIG_NETUTILS_DHCPC=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=4
-CONFIG_NET_RESOLV_MAXRESPONSE=96
+CONFIG_NETUTILS_DNSCLIENT=y
+CONFIG_NETUTILS_DNSCLIENT_ENTRIES=4
+CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/stm3240g-eval/nsh/defconfig b/nuttx/configs/stm3240g-eval/nsh/defconfig
index b2f760112..a4b3fff62 100644
--- a/nuttx/configs/stm3240g-eval/nsh/defconfig
+++ b/nuttx/configs/stm3240g-eval/nsh/defconfig
@@ -844,9 +844,9 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=4
-CONFIG_NET_RESOLV_MAXRESPONSE=96
+CONFIG_NETUTILS_DNSCLIENT=y
+CONFIG_NETUTILS_DNSCLIENT_ENTRIES=4
+CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
# CONFIG_NETUTILS_SMTP is not set
CONFIG_NETUTILS_TELNETD=y
CONFIG_NETUTILS_TFTPC=y
diff --git a/nuttx/configs/stm3240g-eval/nsh2/defconfig b/nuttx/configs/stm3240g-eval/nsh2/defconfig
index 44598d464..4ca6af497 100644
--- a/nuttx/configs/stm3240g-eval/nsh2/defconfig
+++ b/nuttx/configs/stm3240g-eval/nsh2/defconfig
@@ -875,9 +875,9 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=4
-CONFIG_NET_RESOLV_MAXRESPONSE=96
+CONFIG_NETUTILS_DNSCLIENT=y
+CONFIG_NETUTILS_DNSCLIENT_ENTRIES=4
+CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
# CONFIG_NETUTILS_SMTP is not set
CONFIG_NETUTILS_TELNETD=y
CONFIG_NETUTILS_TFTPC=y
diff --git a/nuttx/configs/stm3240g-eval/nxconsole/defconfig b/nuttx/configs/stm3240g-eval/nxconsole/defconfig
index f93c34eca..7df485e0a 100644
--- a/nuttx/configs/stm3240g-eval/nxconsole/defconfig
+++ b/nuttx/configs/stm3240g-eval/nxconsole/defconfig
@@ -951,9 +951,9 @@ CONFIG_EXAMPLES_NXCONSOLE=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=4
-CONFIG_NET_RESOLV_MAXRESPONSE=96
+CONFIG_NETUTILS_DNSCLIENT=y
+CONFIG_NETUTILS_DNSCLIENT_ENTRIES=4
+CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
# CONFIG_NETUTILS_SMTP is not set
CONFIG_NETUTILS_TELNETD=y
CONFIG_NETUTILS_TFTPC=y
diff --git a/nuttx/configs/stm3240g-eval/xmlrpc/defconfig b/nuttx/configs/stm3240g-eval/xmlrpc/defconfig
index 2f5c17d08..ba095eb20 100644
--- a/nuttx/configs/stm3240g-eval/xmlrpc/defconfig
+++ b/nuttx/configs/stm3240g-eval/xmlrpc/defconfig
@@ -857,9 +857,9 @@ CONFIG_NETUTILS_DHCPC=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=4
-CONFIG_NET_RESOLV_MAXRESPONSE=96
+CONFIG_NETUTILS_DNSCLIENT=y
+CONFIG_NETUTILS_DNSCLIENT_ENTRIES=4
+CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/stm32_tiny/nsh/defconfig b/nuttx/configs/stm32_tiny/nsh/defconfig
index 4ef1c3ded..f619b235f 100644
--- a/nuttx/configs/stm32_tiny/nsh/defconfig
+++ b/nuttx/configs/stm32_tiny/nsh/defconfig
@@ -617,7 +617,7 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/stm32_tiny/usbnsh/defconfig b/nuttx/configs/stm32_tiny/usbnsh/defconfig
index 1351cca37..acf7046dd 100644
--- a/nuttx/configs/stm32_tiny/usbnsh/defconfig
+++ b/nuttx/configs/stm32_tiny/usbnsh/defconfig
@@ -594,7 +594,7 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/stm32f100rc_generic/nsh/defconfig b/nuttx/configs/stm32f100rc_generic/nsh/defconfig
index 4657076ca..b19c8fa6a 100644
--- a/nuttx/configs/stm32f100rc_generic/nsh/defconfig
+++ b/nuttx/configs/stm32f100rc_generic/nsh/defconfig
@@ -504,7 +504,7 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/stm32f3discovery/nsh/defconfig b/nuttx/configs/stm32f3discovery/nsh/defconfig
index c7a467e80..eb9de0ef8 100644
--- a/nuttx/configs/stm32f3discovery/nsh/defconfig
+++ b/nuttx/configs/stm32f3discovery/nsh/defconfig
@@ -682,7 +682,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/stm32f3discovery/usbnsh/defconfig b/nuttx/configs/stm32f3discovery/usbnsh/defconfig
index 60529aeba..6f27339c9 100644
--- a/nuttx/configs/stm32f3discovery/usbnsh/defconfig
+++ b/nuttx/configs/stm32f3discovery/usbnsh/defconfig
@@ -670,7 +670,7 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/stm32f4discovery/winbuild/defconfig b/nuttx/configs/stm32f4discovery/winbuild/defconfig
index 6a37dcb3a..2e39e1bfd 100644
--- a/nuttx/configs/stm32f4discovery/winbuild/defconfig
+++ b/nuttx/configs/stm32f4discovery/winbuild/defconfig
@@ -510,7 +510,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/stm32ldiscovery/nsh/defconfig b/nuttx/configs/stm32ldiscovery/nsh/defconfig
index 51a83ad0f..061c00a5d 100644
--- a/nuttx/configs/stm32ldiscovery/nsh/defconfig
+++ b/nuttx/configs/stm32ldiscovery/nsh/defconfig
@@ -587,7 +587,7 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/stm32vldiscovery/nsh/defconfig b/nuttx/configs/stm32vldiscovery/nsh/defconfig
index 367a210ea..f81fbb568 100644
--- a/nuttx/configs/stm32vldiscovery/nsh/defconfig
+++ b/nuttx/configs/stm32vldiscovery/nsh/defconfig
@@ -506,7 +506,7 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/sure-pic32mx/nsh/defconfig b/nuttx/configs/sure-pic32mx/nsh/defconfig
index c7effd4f5..87bc8618d 100644
--- a/nuttx/configs/sure-pic32mx/nsh/defconfig
+++ b/nuttx/configs/sure-pic32mx/nsh/defconfig
@@ -595,7 +595,7 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/sure-pic32mx/usbnsh/defconfig b/nuttx/configs/sure-pic32mx/usbnsh/defconfig
index cb6dd7238..9de067263 100644
--- a/nuttx/configs/sure-pic32mx/usbnsh/defconfig
+++ b/nuttx/configs/sure-pic32mx/usbnsh/defconfig
@@ -644,7 +644,7 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/twr-k60n512/nsh/defconfig b/nuttx/configs/twr-k60n512/nsh/defconfig
index 7ded3bd09..98292d591 100644
--- a/nuttx/configs/twr-k60n512/nsh/defconfig
+++ b/nuttx/configs/twr-k60n512/nsh/defconfig
@@ -518,7 +518,7 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/viewtool-stm32f107/netnsh/defconfig b/nuttx/configs/viewtool-stm32f107/netnsh/defconfig
index e3aeb9f6e..b4fce3334 100644
--- a/nuttx/configs/viewtool-stm32f107/netnsh/defconfig
+++ b/nuttx/configs/viewtool-stm32f107/netnsh/defconfig
@@ -800,9 +800,9 @@ CONFIG_NETUTILS_DHCPC=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=8
-CONFIG_NET_RESOLV_MAXRESPONSE=96
+CONFIG_NETUTILS_DNSCLIENT=y
+CONFIG_NETUTILS_DNSCLIENT_ENTRIES=8
+CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
# CONFIG_NETUTILS_SMTP is not set
CONFIG_NETUTILS_TELNETD=y
CONFIG_NETUTILS_TFTPC=y
diff --git a/nuttx/configs/xtrs/nsh/defconfig b/nuttx/configs/xtrs/nsh/defconfig
index 75a251b49..ea7baf601 100644
--- a/nuttx/configs/xtrs/nsh/defconfig
+++ b/nuttx/configs/xtrs/nsh/defconfig
@@ -381,7 +381,7 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/xtrs/ostest/defconfig b/nuttx/configs/xtrs/ostest/defconfig
index b35ec4e1c..458d1af40 100644
--- a/nuttx/configs/xtrs/ostest/defconfig
+++ b/nuttx/configs/xtrs/ostest/defconfig
@@ -385,7 +385,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/xtrs/pashello/defconfig b/nuttx/configs/xtrs/pashello/defconfig
index a142e83b0..06c63a3ea 100644
--- a/nuttx/configs/xtrs/pashello/defconfig
+++ b/nuttx/configs/xtrs/pashello/defconfig
@@ -381,7 +381,7 @@ CONFIG_INTERPRETERS_PCODE=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/z16f2800100zcog/nsh/defconfig b/nuttx/configs/z16f2800100zcog/nsh/defconfig
index 29739dcfe..0266d49b3 100644
--- a/nuttx/configs/z16f2800100zcog/nsh/defconfig
+++ b/nuttx/configs/z16f2800100zcog/nsh/defconfig
@@ -504,7 +504,7 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/z16f2800100zcog/ostest/defconfig b/nuttx/configs/z16f2800100zcog/ostest/defconfig
index 8661e692b..4d893a340 100644
--- a/nuttx/configs/z16f2800100zcog/ostest/defconfig
+++ b/nuttx/configs/z16f2800100zcog/ostest/defconfig
@@ -505,7 +505,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/z16f2800100zcog/pashello/defconfig b/nuttx/configs/z16f2800100zcog/pashello/defconfig
index 08e332a7c..d72e797b2 100644
--- a/nuttx/configs/z16f2800100zcog/pashello/defconfig
+++ b/nuttx/configs/z16f2800100zcog/pashello/defconfig
@@ -418,7 +418,7 @@ CONFIG_INTERPRETERS_PCODE=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/z80sim/nsh/defconfig b/nuttx/configs/z80sim/nsh/defconfig
index 5b46a076f..d4ccc1d46 100644
--- a/nuttx/configs/z80sim/nsh/defconfig
+++ b/nuttx/configs/z80sim/nsh/defconfig
@@ -381,7 +381,7 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/z80sim/ostest/defconfig b/nuttx/configs/z80sim/ostest/defconfig
index 83c0ba403..2d993c005 100644
--- a/nuttx/configs/z80sim/ostest/defconfig
+++ b/nuttx/configs/z80sim/ostest/defconfig
@@ -385,7 +385,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/z80sim/pashello/defconfig b/nuttx/configs/z80sim/pashello/defconfig
index 5f8337cc5..7952e0f6f 100644
--- a/nuttx/configs/z80sim/pashello/defconfig
+++ b/nuttx/configs/z80sim/pashello/defconfig
@@ -380,7 +380,7 @@ CONFIG_INTERPRETERS_PCODE=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/z8encore000zco/ostest/defconfig b/nuttx/configs/z8encore000zco/ostest/defconfig
index 91ac55a6c..e9062a596 100644
--- a/nuttx/configs/z8encore000zco/ostest/defconfig
+++ b/nuttx/configs/z8encore000zco/ostest/defconfig
@@ -411,7 +411,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/z8f64200100kit/ostest/defconfig b/nuttx/configs/z8f64200100kit/ostest/defconfig
index a674123db..c08e9c620 100644
--- a/nuttx/configs/z8f64200100kit/ostest/defconfig
+++ b/nuttx/configs/z8f64200100kit/ostest/defconfig
@@ -411,7 +411,7 @@ CONFIG_EXAMPLES_OSTEST_RR_RUNS=10
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/zkit-arm-1769/hello/defconfig b/nuttx/configs/zkit-arm-1769/hello/defconfig
index 1de94e911..9c4a2c3ee 100644
--- a/nuttx/configs/zkit-arm-1769/hello/defconfig
+++ b/nuttx/configs/zkit-arm-1769/hello/defconfig
@@ -577,7 +577,7 @@ CONFIG_EXAMPLES_HELLO=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/zkit-arm-1769/nsh/defconfig b/nuttx/configs/zkit-arm-1769/nsh/defconfig
index 8943ad13b..469efd6ba 100644
--- a/nuttx/configs/zkit-arm-1769/nsh/defconfig
+++ b/nuttx/configs/zkit-arm-1769/nsh/defconfig
@@ -646,9 +646,9 @@ CONFIG_NETUTILS_DHCPC=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=8
-CONFIG_NET_RESOLV_MAXRESPONSE=96
+CONFIG_NETUTILS_DNSCLIENT=y
+CONFIG_NETUTILS_DNSCLIENT_ENTRIES=8
+CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
# CONFIG_NETUTILS_SMTP is not set
CONFIG_NETUTILS_TELNETD=y
CONFIG_NETUTILS_TFTPC=y
diff --git a/nuttx/configs/zkit-arm-1769/nxhello/defconfig b/nuttx/configs/zkit-arm-1769/nxhello/defconfig
index 3b98b84de..3cd8dba35 100644
--- a/nuttx/configs/zkit-arm-1769/nxhello/defconfig
+++ b/nuttx/configs/zkit-arm-1769/nxhello/defconfig
@@ -688,9 +688,9 @@ CONFIG_NETUTILS_DHCPC=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-CONFIG_NETUTILS_RESOLV=y
-CONFIG_NET_RESOLV_ENTRIES=8
-CONFIG_NET_RESOLV_MAXRESPONSE=96
+CONFIG_NETUTILS_DNSCLIENT=y
+CONFIG_NETUTILS_DNSCLIENT_ENTRIES=8
+CONFIG_NETUTILS_DNSCLIENT_MAXRESPONSE=96
# CONFIG_NETUTILS_SMTP is not set
CONFIG_NETUTILS_TELNETD=y
CONFIG_NETUTILS_TFTPC=y
diff --git a/nuttx/configs/zkit-arm-1769/thttpd/defconfig b/nuttx/configs/zkit-arm-1769/thttpd/defconfig
index 52552db3a..7d041dbfc 100644
--- a/nuttx/configs/zkit-arm-1769/thttpd/defconfig
+++ b/nuttx/configs/zkit-arm-1769/thttpd/defconfig
@@ -580,7 +580,7 @@ CONFIG_EXAMPLES_THTTPD_NETMASK=0xffffff00
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/zp214xpa/nsh/defconfig b/nuttx/configs/zp214xpa/nsh/defconfig
index a40dbc73b..f4bfe05c5 100644
--- a/nuttx/configs/zp214xpa/nsh/defconfig
+++ b/nuttx/configs/zp214xpa/nsh/defconfig
@@ -450,7 +450,7 @@ CONFIG_EXAMPLES_NSH=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set
diff --git a/nuttx/configs/zp214xpa/nxlines/defconfig b/nuttx/configs/zp214xpa/nxlines/defconfig
index 191da5f4d..f0b6b23a8 100644
--- a/nuttx/configs/zp214xpa/nxlines/defconfig
+++ b/nuttx/configs/zp214xpa/nxlines/defconfig
@@ -535,7 +535,7 @@ CONFIG_EXAMPLES_NXLINES_EXTERNINIT=y
# CONFIG_NETUTILS_FTPC is not set
# CONFIG_NETUTILS_FTPD is not set
# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_RESOLV is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
# CONFIG_NETUTILS_SMTP is not set
# CONFIG_NETUTILS_TELNETD is not set
# CONFIG_NETUTILS_TFTPC is not set