diff options
Diffstat (limited to 'apps')
19 files changed, 29 insertions, 20 deletions
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt index b952ebe74..15fdedf1b 100644 --- a/apps/ChangeLog.txt +++ b/apps/ChangeLog.txt @@ -878,3 +878,6 @@ 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). + * aps/netutils/dnsclient and include/netutils/dnsclient.h: File name + changes that are part of the overal resolv->dns renaming (2014-4-11). + diff --git a/apps/examples/discover/discover_main.c b/apps/examples/discover/discover_main.c index d8b32d315..00c8e7fba 100644 --- a/apps/examples/discover/discover_main.c +++ b/apps/examples/discover/discover_main.c @@ -65,7 +65,7 @@ /* DHCPC may be used in conjunction with any other feature (or not) */ #ifdef CONFIG_EXAMPLES_DISCOVER_DHCPC -# include <apps/netutils/resolv.h> +# include <apps/netutils/dnsclient.h> # include <apps/netutils/dhcpc.h> #endif diff --git a/apps/examples/tcpecho/tcpecho_main.c b/apps/examples/tcpecho/tcpecho_main.c index fbc6e2ddd..a8a86a7b2 100644 --- a/apps/examples/tcpecho/tcpecho_main.c +++ b/apps/examples/tcpecho/tcpecho_main.c @@ -70,7 +70,7 @@ /* DHCPC may be used in conjunction with any other feature (or not) */ #ifdef CONFIG_EXAMPLES_TCPECHO_DHCPC -# include <apps/netutils/resolv.h> +# include <apps/netutils/dnsclient.h> # include <apps/netutils/dhcpc.h> #endif diff --git a/apps/examples/uip/uip_main.c b/apps/examples/uip/uip_main.c index 35454a0dd..9d2fcf9b2 100644 --- a/apps/examples/uip/uip_main.c +++ b/apps/examples/uip/uip_main.c @@ -70,7 +70,7 @@ /* DHCPC may be used in conjunction with any other feature (or not) */ #ifdef CONFIG_EXAMPLES_UIP_DHCPC -# include <apps/netutils/resolv.h> +# include <apps/netutils/dnsclient.h> # include <apps/netutils/dhcpc.h> #endif diff --git a/apps/examples/wget/target.c b/apps/examples/wget/target.c index d205a81ae..9a1de83b3 100644 --- a/apps/examples/wget/target.c +++ b/apps/examples/wget/target.c @@ -49,7 +49,7 @@ #include <nuttx/net/uip/uip.h> #include <apps/netutils/uiplib.h> -#include <apps/netutils/resolv.h> +#include <apps/netutils/dnsclient.h> #include <apps/netutils/webclient.h> /**************************************************************************** diff --git a/apps/examples/xmlrpc/xmlrpc_main.c b/apps/examples/xmlrpc/xmlrpc_main.c index 3a743bb82..6c3ddfc24 100644 --- a/apps/examples/xmlrpc/xmlrpc_main.c +++ b/apps/examples/xmlrpc/xmlrpc_main.c @@ -80,7 +80,7 @@ /* DHCPC may be used in conjunction with any other feature (or not) */ #ifdef CONFIG_EXAMPLES_XMLRPC_DHCPC -# include <apps/netutils/resolv.h> +# include <apps/netutils/dnsclient.h> # include <apps/netutils/dhcpc.h> #endif diff --git a/apps/include/netutils/resolv.h b/apps/include/netutils/dnsclient.h index 9447432a1..6f6cbd035 100644 --- a/apps/include/netutils/resolv.h +++ b/apps/include/netutils/dnsclient.h @@ -1,5 +1,5 @@ /**************************************************************************** - * apps/include/netutils/resolv.h + * apps/include/netutils/dnsclient.h * DNS resolver code header file. * Author Adam Dunkels <adam@dunkels.com> * 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> diff --git a/apps/nshlib/nsh_netcmds.c b/apps/nshlib/nsh_netcmds.c index b1789d123..62c1d012a 100644 --- a/apps/nshlib/nsh_netcmds.c +++ b/apps/nshlib/nsh_netcmds.c @@ -69,7 +69,7 @@ #if defined(CONFIG_NET_ICMP) && defined(CONFIG_NET_ICMP_PING) && \ !defined(CONFIG_DISABLE_CLOCK) && !defined(CONFIG_DISABLE_SIGNALS) # include <apps/netutils/uiplib.h> -# include <apps/netutils/resolv.h> +# include <apps/netutils/dnsclient.h> #endif #if defined(CONFIG_NET_UDP) && CONFIG_NFILE_DESCRIPTORS > 0 @@ -88,7 +88,7 @@ # ifdef CONFIG_HAVE_GETHOSTBYNAME # include <netdb.h> # else -# include <apps/netutils/resolv.h> +# include <apps/netutils/dnsclient.h> # endif # include <apps/netutils/dhcpc.h> #endif diff --git a/apps/nshlib/nsh_netinit.c b/apps/nshlib/nsh_netinit.c index 9a44f4905..5afa4b56c 100644 --- a/apps/nshlib/nsh_netinit.c +++ b/apps/nshlib/nsh_netinit.c @@ -48,7 +48,7 @@ #include <apps/netutils/uiplib.h> #if defined(CONFIG_NSH_DHCPC) || defined(CONFIG_NSH_DNS) -# include <apps/netutils/resolv.h> +# include <apps/netutils/dnsclient.h> # include <apps/netutils/dhcpc.h> #endif |