summaryrefslogtreecommitdiff
path: root/apps/netutils
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-04-11 12:41:13 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-04-11 12:41:13 -0600
commit7150125fb8f7eba8ec7bf04112a6ca5cd23fc2e0 (patch)
tree9debe9e1dafba8f3c7f81e75c8c0850c9903ce6e /apps/netutils
parent57d2acba435f67d561b63e6635330f182edc5047 (diff)
downloadnuttx-7150125fb8f7eba8ec7bf04112a6ca5cd23fc2e0.tar.gz
nuttx-7150125fb8f7eba8ec7bf04112a6ca5cd23fc2e0.tar.bz2
nuttx-7150125fb8f7eba8ec7bf04112a6ca5cd23fc2e0.zip
The rest of the resolv->DNS client naming change: Renamed directories and header files
Diffstat (limited to 'apps/netutils')
-rw-r--r--apps/netutils/Kconfig2
-rw-r--r--apps/netutils/Make.defs2
-rw-r--r--apps/netutils/Makefile2
-rw-r--r--apps/netutils/README.txt2
-rw-r--r--apps/netutils/dnsclient/.gitignore (renamed from apps/netutils/resolv/.gitignore)0
-rw-r--r--apps/netutils/dnsclient/Kconfig (renamed from apps/netutils/resolv/Kconfig)2
-rw-r--r--apps/netutils/dnsclient/Makefile (renamed from apps/netutils/resolv/Makefile)6
-rw-r--r--apps/netutils/dnsclient/dnsclient.c (renamed from apps/netutils/resolv/resolv.c)4
-rw-r--r--apps/netutils/ntpclient/.gitignore6
-rw-r--r--apps/netutils/webclient/webclient.c2
10 files changed, 17 insertions, 11 deletions
diff --git a/apps/netutils/Kconfig b/apps/netutils/Kconfig
index 24573eef9..01fa40dd7 100644
--- a/apps/netutils/Kconfig
+++ b/apps/netutils/Kconfig
@@ -11,7 +11,7 @@ source "$APPSDIR/netutils/dhcpd/Kconfig"
source "$APPSDIR/netutils/ftpc/Kconfig"
source "$APPSDIR/netutils/ftpd/Kconfig"
source "$APPSDIR/netutils/json/Kconfig"
-source "$APPSDIR/netutils/resolv/Kconfig"
+source "$APPSDIR/netutils/dnsclient/Kconfig"
source "$APPSDIR/netutils/smtp/Kconfig"
source "$APPSDIR/netutils/telnetd/Kconfig"
source "$APPSDIR/netutils/tftpc/Kconfig"
diff --git a/apps/netutils/Make.defs b/apps/netutils/Make.defs
index f883304ec..11f7d261e 100644
--- a/apps/netutils/Make.defs
+++ b/apps/netutils/Make.defs
@@ -63,7 +63,7 @@ CONFIGURED_APPS += netutils/ntpclient
endif
ifeq ($(CONFIG_NETUTILS_DNSCLIENT),y)
-CONFIGURED_APPS += netutils/resolv
+CONFIGURED_APPS += netutils/dnsclient
endif
ifeq ($(CONFIG_NETUTILS_SMTP),y)
diff --git a/apps/netutils/Makefile b/apps/netutils/Makefile
index 781770fc1..8a8a5fdf4 100644
--- a/apps/netutils/Makefile
+++ b/apps/netutils/Makefile
@@ -39,7 +39,7 @@
SUBDIRS = json codecs
ifeq ($(CONFIG_NET),y)
-SUBDIRS += uiplib dhcpc dhcpd discover ftpc ftpd resolv smtp telnetd
+SUBDIRS += uiplib dhcpc dhcpd discover dnsclient ftpc ftpd smtp telnetd
SUBDIRS += webclient webserver tftpc thttpd xmlrpc
endif
diff --git a/apps/netutils/README.txt b/apps/netutils/README.txt
index 5a58a45cf..83e774638 100644
--- a/apps/netutils/README.txt
+++ b/apps/netutils/README.txt
@@ -19,7 +19,7 @@ apps include:
dhcpc - Dynamic Host Configuration Protocol (DHCP) client. See
apps/include/netutils/dhcpc.h for interface information.
- resolv - uIP DNS resolver. See apps/include/netutils/resolv.h
+ dnsclient - uIP DNS resolver. See apps/include/netutils/dnsclient.h
for interface information.
smtp - Simple Mail Transfer Protocol (SMTP) client. See
apps/include/netutils/smtp.h for interface information.
diff --git a/apps/netutils/resolv/.gitignore b/apps/netutils/dnsclient/.gitignore
index f21c854d1..f21c854d1 100644
--- a/apps/netutils/resolv/.gitignore
+++ b/apps/netutils/dnsclient/.gitignore
diff --git a/apps/netutils/resolv/Kconfig b/apps/netutils/dnsclient/Kconfig
index 91f41ab98..77b2bd634 100644
--- a/apps/netutils/resolv/Kconfig
+++ b/apps/netutils/dnsclient/Kconfig
@@ -16,7 +16,7 @@ config NETUTILS_DNSCLIENT_ENTRIES
int "Number of DNS resolver entries"
default 8
---help---
- Number of resolver entries. Default: 8
+ Number of DNS resolver entries. Default: 8
config NETUTILS_DNSCLIENT_MAXRESPONSE
int "Max response size"
diff --git a/apps/netutils/resolv/Makefile b/apps/netutils/dnsclient/Makefile
index ef77eb9f6..076fa5290 100644
--- a/apps/netutils/resolv/Makefile
+++ b/apps/netutils/dnsclient/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# apps/netutils/resolv/Makefile
+# apps/netutils/dnsclient/Makefile
#
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
@@ -37,13 +37,13 @@
-include $(TOPDIR)/Make.defs
include $(APPDIR)/Make.defs
-# Resolver library
+# DNS Resolver library
ASRCS =
CSRCS =
ifeq ($(CONFIG_NET_UDP),y)
-CSRCS = resolv.c
+CSRCS = dnsclient.c
endif
AOBJS = $(ASRCS:.S=$(OBJEXT))
diff --git a/apps/netutils/resolv/resolv.c b/apps/netutils/dnsclient/dnsclient.c
index 32bbda511..b2dbae8c6 100644
--- a/apps/netutils/resolv/resolv.c
+++ b/apps/netutils/dnsclient/dnsclient.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * uip-resolv.c
+ * apps/netutils/dnsclient/dnsclient.c
* DNS host name to IP address resolver.
*
* The uIP DNS resolver functions are used to lookup a hostname and
@@ -59,7 +59,7 @@
#include <sys/socket.h>
#include <arpa/inet.h>
-#include <apps/netutils/resolv.h>
+#include <apps/netutils/dnsclient.h>
#include <apps/netutils/uiplib.h>
/****************************************************************************
diff --git a/apps/netutils/ntpclient/.gitignore b/apps/netutils/ntpclient/.gitignore
new file mode 100644
index 000000000..f21c854d1
--- /dev/null
+++ b/apps/netutils/ntpclient/.gitignore
@@ -0,0 +1,6 @@
+/.built
+/.depend
+/Make.dep
+/*.src
+/*.obj
+/*.lst
diff --git a/apps/netutils/webclient/webclient.c b/apps/netutils/webclient/webclient.c
index d233c3441..741f7a176 100644
--- a/apps/netutils/webclient/webclient.c
+++ b/apps/netutils/webclient/webclient.c
@@ -65,7 +65,7 @@
#ifdef CONFIG_HAVE_GETHOSTBYNAME
# include <netdb.h>
#else
-# include <apps/netutils/resolv.h>
+# include <apps/netutils/dnsclient.h>
#endif
#include <arpa/inet.h>