diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-04-11 12:25:32 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-04-11 12:25:32 -0600 |
| commit | 57d2acba435f67d561b63e6635330f182edc5047 (patch) | |
| tree | 75ae50c7989a55783fcac71695fc4296ef1257a4 /apps/nshlib | |
| parent | fb9444d0919f03b59d58f726f05993968ecdfdd7 (diff) | |
| download | nuttx-57d2acba435f67d561b63e6635330f182edc5047.tar.gz nuttx-57d2acba435f67d561b63e6635330f182edc5047.tar.bz2 nuttx-57d2acba435f67d561b63e6635330f182edc5047.zip | |
Long needed clean up of DNS resolver for coding style and naming conventions
Diffstat (limited to 'apps/nshlib')
| -rw-r--r-- | apps/nshlib/Kconfig | 2 | ||||
| -rw-r--r-- | apps/nshlib/nsh_netcmds.c | 6 | ||||
| -rw-r--r-- | apps/nshlib/nsh_netinit.c | 6 |
3 files changed, 7 insertions, 7 deletions
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); } |