From 57d2acba435f67d561b63e6635330f182edc5047 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Fri, 11 Apr 2014 12:25:32 -0600
Subject: Long needed clean up of DNS resolver for coding style and naming
 conventions

---
 apps/examples/README.txt               | 6 +++---
 apps/examples/discover/Kconfig         | 2 +-
 apps/examples/discover/discover_main.c | 4 ++--
 apps/examples/tcpecho/Kconfig          | 2 +-
 apps/examples/tcpecho/tcpecho_main.c   | 4 ++--
 apps/examples/uip/uip_main.c           | 4 ++--
 apps/examples/xmlrpc/Kconfig           | 2 +-
 apps/examples/xmlrpc/xmlrpc_main.c     | 4 ++--
 8 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'apps/examples')

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);
-- 
cgit v1.2.3