diff --git a/apps/examples/Makefile b/apps/examples/Makefile index 3847c2b12..eea75083c 100644 --- a/apps/examples/Makefile +++ b/apps/examples/Makefile @@ -37,8 +37,8 @@ # Sub-directories -SUBDIRS = adc buttons can composite dhcpd ftpc hello helloxx hidkbd igmp \ - lcdrw mm mount nettest nsh null nx nxffs nxflat nxhello nximage \ +SUBDIRS = adc buttons can composite dhcpd ftpc ftpd hello helloxx hidkbd \ + igmp lcdrw mm mount nettest nsh null nx nxffs nxflat nxhello nximage \ nxlines nxtext ostest pashello pipe poll pwm rgmp romfs sendmail \ serloop telnetd thttpd tiff touchscreen udp uip usbserial \ usbstorage usbterm wget wlan @@ -56,44 +56,45 @@ SUBDIRS = adc buttons can composite dhcpd ftpc hello helloxx hidkbd igmp \ CNTXTDIRS = pwm ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) -CNTXTDIRS += adc can composite dhcpd nettest telnetd +CNTXTDIRS += adc can composite ftpd dhcpd nettest telnetd endif ifeq ($(CONFIG_EXAMPLES_HELLOXX_BUILTIN),y) -CNTXTDIRS += helloxx +CNTXTDIRS += helloxx endif ifeq ($(CONFIG_EXAMPLES_LCDRW_BUILTIN),y) -CNTXTDIRS += lcdrw +CNTXTDIRS += lcdrw endif ifeq ($(CONFIG_EXAMPLES_NX_BUILTIN),y) -CNTXTDIRS += nx +CNTXTDIRS += nx endif ifeq ($(CONFIG_EXAMPLES_NXHELLO_BUILTIN),y) -CNTXTDIRS += nxhello +CNTXTDIRS += nxhello endif ifeq ($(CONFIG_EXAMPLES_NXIMAGE_BUILTIN),y) -CNTXTDIRS += nximage +CNTXTDIRS += nximage endif ifeq ($(CONFIG_EXAMPLES_LINES_BUILTIN),y) -CNTXTDIRS += nxlines +CNTXTDIRS += nxlines endif ifeq ($(CONFIG_EXAMPLES_NXTEXT_BUILTIN),y) -CNTXTDIRS += nxtext +CNTXTDIRS += nxtext endif ifeq ($(CONFIG_EXAMPLES_TIFF_BUILTIN),y) -CNTXTDIRS += tiff +CNTXTDIRS += tiff endif ifeq ($(CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN),y) -CNTXTDIRS += touchscreen +CNTXTDIRS += touchscreen endif ifeq ($(CONFIG_EXAMPLES_USBMSC_BUILTIN),y) -CNTXTDIRS += usbstorage +CNTXTDIRS += usbstorage endif ifeq ($(CONFIG_EXAMPLES_USBTERM_BUILTIN),y) -CNTXTDIRS += usbterm +CNTXTDIRS += usbterm endif all: nothing + .PHONY: nothing context depend clean distclean nothing: diff --git a/apps/examples/README.txt b/apps/examples/README.txt index b35232039..bb401c99a 100644 --- a/apps/examples/README.txt +++ b/apps/examples/README.txt @@ -266,6 +266,38 @@ examples/ftpc CONFIG_DEBUG_VERBOSE=y CONFIG_DEBUG_FTPC=y +examples/ftpd +^^^^^^^^^^^^^^ + + This example exercises the FTPD daemon at apps/netuils/ftpd. Below are + configurations specific to the FTPD example (the FTPD daemon itself may + require other configuration options as well). + + CONFIG_EXAMPLES_FTPD_PRIO - Priority of the FTP daemon. + Default: SCHED_PRIORITY_DEFAULT + CONFIG_EXAMPLES_FTPD_STACKSIZE - Stack size allocated for the + FTP daemon. Default: 2048 + CONFIG_EXAMPLES_FTPD_NONETINIT - Define to suppress configuration of the + network by apps/examples/ftpd. You would need to suppress network + configuration if the network is configuration prior to running the + example. + + If CONFIG_EXAMPELS_FTPD_NONETINIT is not defined, then the following may + be specified to customized the network configuration: + + CONFIG_EXAMPLE_FTPD_NOMAC - If the hardware has no MAC address of its + own, define this =y to provide a bogus address for testing. + CONFIG_EXAMPLE_FTPD_IPADDR - The target IP address. Default 10.0.0.2 + CONFIG_EXAMPLE_FTPD_DRIPADDR - The default router address. Default + 10.0.0.1 + CONFIG_EXAMPLE_FTPD_NETMASK - The network mask. Default: 255.255.255.0 + + The appconfig file (apps/.config) should include: + + CONFIGURED_APPS += examples/ftpd + CONFIGURED_APPS += netutils/uiplib + CONFIGURED_APPS += netutils/ftpd + examples/hello ^^^^^^^^^^^^^^ diff --git a/apps/examples/ftpd/Makefile b/apps/examples/ftpd/Makefile new file mode 100644 index 000000000..d3ccda7cc --- /dev/null +++ b/apps/examples/ftpd/Makefile @@ -0,0 +1,106 @@ +############################################################################ +# apps/examples/ftpd/Makefile +# +# Copyright (C) 2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +-include $(TOPDIR)/.config +-include $(TOPDIR)/Make.defs +include $(APPDIR)/Make.defs + +# Hello, World! Example + +ASRCS = +CSRCS = ftpd_main.c + +AOBJS = $(ASRCS:.S=$(OBJEXT)) +COBJS = $(CSRCS:.c=$(OBJEXT)) + +SRCS = $(ASRCS) $(CSRCS) +OBJS = $(AOBJS) $(COBJS) + +ifeq ($(WINTOOL),y) + BIN = "${shell cygpath -w $(APPDIR)/libapps$(LIBEXT)}" +else + BIN = "$(APPDIR)/libapps$(LIBEXT)" +endif + +ROOTDEPPATH = --dep-path . + +# Buttons built-in application info + +APPNAME = ftpd +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 2048 + +# Common build + +VPATH = + +all: .built + +.PHONY: context clean depend distclean + +$(AOBJS): %$(OBJEXT): %.S + $(call ASSEMBLE, $<, $@) + +$(COBJS): %$(OBJEXT): %.c + $(call COMPILE, $<, $@) + +.built: $(OBJS) + @( for obj in $(OBJS) ; do \ + $(call ARCHIVE, $(BIN), $${obj}); \ + done ; ) + @touch .built + +.context: +ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) + @touch $@ +endif + +context: .context + +.depend: Makefile $(SRCS) + @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @touch $@ + +depend: .depend + +clean: + @rm -f *.o *~ .*.swp .built + $(call CLEAN) + +distclean: clean + @rm -f Make.dep .depend + +-include Make.dep diff --git a/apps/examples/ftpd/ftpd.h b/apps/examples/ftpd/ftpd.h new file mode 100644 index 000000000..619a9fa51 --- /dev/null +++ b/apps/examples/ftpd/ftpd.h @@ -0,0 +1,126 @@ +/**************************************************************************** + * apps/examples/ftpd/ftpd.h + * Interface for the Contiki ftpd. + * + * Copyright (C) 2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote + * products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS + * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE + * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +#ifndef __APPS_EXAMPLES_FTPD_FTPD_H +#define __APPS_EXAMPLES_FTPD_FTPD_H + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ +/* Configuration ************************************************************/ +/* CONFIG_EXAMPLES_FTPD_PRIO - Priority of the FTP daemon. + * Default: SCHED_PRIORITY_DEFAULT + * CONFIG_EXAMPLES_FTPD_STACKSIZE - Stack size allocated for the + * FTP daemon. Default: 2048 + * CONFIG_EXAMPLES_FTPD_NONETINIT - Define to suppress configuration of the + * network by apps/examples/ftpd. You would need to suppress network + * configuration if the network is configuration prior to running the + * example. + * + * If CONFIG_EXAMPELS_FTPD_NONETINIT is not defined, then the following may + * be specified to customized the network configuration: + * + * CONFIG_EXAMPLE_FTPD_NOMAC - If the hardware has no MAC address of its + * own, define this =y to provide a bogus address for testing. + * CONFIG_EXAMPLE_FTPD_IPADDR - The target IP address. Default 10.0.0.2 + * CONFIG_EXAMPLE_FTPD_DRIPADDR - The default router address. Default + * 10.0.0.1 + * CONFIG_EXAMPLE_FTPD_NETMASK - The network mask. Default: 255.255.255.0 + */ + +#ifndef CONFIG_EXAMPLES_FTPD_PRIO +# define CONFIG_EXAMPLES_FTPD_PRIO SCHED_PRIORITY_DEFAULT +#endif + +#ifndef CONFIG_EXAMPLES_FTPD_STACKSIZE +# define CONFIG_EXAMPLES_FTPD_STACKSIZE 2048 +#endif + +#ifndef CONFIG_EXAMPLES_FTPD_CLIENTPRIO +# define CONFIG_EXAMPLES_FTPD_CLIENTPRIO SCHED_PRIORITY_DEFAULT +#endif + +#ifndef CONFIG_EXAMPLES_FTPD_CLIENTSTACKSIZE +# define CONFIG_EXAMPLES_FTPD_CLIENTSTACKSIZE 2048 +#endif + +#ifndef CONFIG_EXAMPLE_FTPD_IPADDR +# define CONFIG_EXAMPLE_FTPD_IPADDR 0x0a000002 +#endif +#ifndef CONFIG_EXAMPLE_FTPD_DRIPADDR +# define CONFIG_EXAMPLE_FTPD_DRIPADDR 0x0a000002 +#endif +#ifndef CONFIG_EXAMPLE_FTPD_NETMASK +# define CONFIG_EXAMPLE_FTPD_NETMASK 0xffffff00 +#endif + +/* Is this being built as an NSH built-in application? */ + +#ifdef CONFIG_NSH_BUILTIN_APPS +# define MAIN_NAME ftpd_main +# define MAIN_STRING "ftpd_main: " +#else +# define MAIN_NAME user_start +# define MAIN_STRING "user_start: " +#endif + +/**************************************************************************** + * Public Types + ****************************************************************************/ + +struct fptd_account_s +{ + uint8_t flags; + FAR const char *user; + FAR const char *password; + FAR const char *home; +}; + +struct ftpd_globals_s +{ + bool initialized; + volatile bool stop; +}; + +/**************************************************************************** + * Public Function Prototypes + ****************************************************************************/ + +extern struct ftpd_globls_s g_ftpdglobls; + +/**************************************************************************** + * Public Function Prototypes + ****************************************************************************/ + +#endif /* __APPS_EXAMPLES_FTPD_FTPD_H */ diff --git a/apps/examples/ftpd/ftpd_main.c b/apps/examples/ftpd/ftpd_main.c index b5f81f975..ee3481d80 100755 --- a/apps/examples/ftpd/ftpd_main.c +++ b/apps/examples/ftpd/ftpd_main.c @@ -1,21 +1,101 @@ +/**************************************************************************** + * examples/telnetd/shell.c + * + * Copyright (C) 2012 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + #include "ftpd.h" -struct fptd_account_s -{ - uint8_t flags; - FAR const char *user; - FAR const char *password; - FAR const char *home; -} +/**************************************************************************** + * Private Data + ****************************************************************************/ static const struct fptd_account_s g_ftpdaccounts[] = { - { FTPD_ACCOUNTFLAG_SYSTEM, "root", "abc123", NULL) }, + { FTPD_ACCOUNTFLAG_SYSTEM, "root", "abc123", NULL }, { FTPD_ACCOUNTFLAG_GUEST, "ftp", NULL, NULL }, { FTPD_ACCOUNTFLAG_GUEST, "anonymous", NULL, NULL }, }; #define NACCOUNTS (sizeof(g_ftpdaccounts) / sizeof(struct fptd_account_s)) +/**************************************************************************** + * Private Functions + ****************************************************************************/ +/**************************************************************************** + * Name: shell_netinit + ****************************************************************************/ + +static void shell_netinit(void) +{ +#ifndef CONFIG_EXAMPLES_FTPD_NONETINIT + struct in_addr addr; +#ifdef CONFIG_EXAMPLE_FTPD_NOMAC + uint8_t mac[IFHWADDRLEN]; +#endif + +/* Many embedded network interfaces must have a software assigned MAC */ + +#ifdef CONFIG_EXAMPLE_FTPD_NOMAC + mac[0] = 0x00; + mac[1] = 0xe0; + mac[2] = 0xb0; + mac[3] = 0x0b; + mac[4] = 0xba; + mac[5] = 0xbe; + uip_setmacaddr("eth0", mac); +#endif + + /* Set up our host address */ + + addr.s_addr = HTONL(CONFIG_EXAMPLE_FTPD_IPADDR); + uip_sethostaddr("eth0", &addr); + + /* Set up the default router address */ + + addr.s_addr = HTONL(CONFIG_EXAMPLE_FTPD_DRIPADDR); + uip_setdraddr("eth0", &addr); + + /* Setup the subnet mask */ + + addr.s_addr = HTONL(CONFIG_EXAMPLE_FTPD_NETMASK); + uip_setnetmask("eth0", &addr); +#endif /* CONFIG_EXAMPLES_FTPD_NONETINIT */ +} + +/**************************************************************************** + * Name: ftpd_accounts + ****************************************************************************/ + static void ftpd_accounts(FTPD_SESSION handle) { FAR onst struct fptd_account_s *account; @@ -24,24 +104,20 @@ static void ftpd_accounts(FTPD_SESSION handle) for (i = 0; i < NACCOUNTS; i++) { account = &g_ftpdaccounts[i]; - ftpd_add_user(handle, account->flags, account->user, account->password, account->home); + ftpd_add_user(handle, account->flags, account->user, + account->password, account->home); } } -int ftpd_main(int s_argc, char **s_argv) +/**************************************************************************** + * Name: ftpd_daemon + ****************************************************************************/ + +int ftpd_daemon(int s_argc, char **s_argv) { FTPD_SESSION handle; int ret; - /* Bring up the network */ - - ret = ftpd_netinit(); - if (ret < 0) - { - ndbg("Failed to initialize the network\n"); - return EXIT_FAILURE; - } - /* Open FTPD */ handle = ftpd_open(); @@ -57,7 +133,7 @@ int ftpd_main(int s_argc, char **s_argv) /* Then drive the FTPD server */ - while (g_ftpd_break == 0) + while (g_ftpdglobls.stop == 0) { (void)ftpd_run(handle, 1000); } @@ -68,5 +144,48 @@ int ftpd_main(int s_argc, char **s_argv) return EXIT_SUCCESS; } -/* vim: set expandtab: */ -/* End of source */ +/**************************************************************************** + * Public Functions + ****************************************************************************/ +/**************************************************************************** + * Name: user_start/ftpd_main + ****************************************************************************/ + +int MAIN_NAME(int s_argc, char **s_argv) +{ + FTPD_SESSION handle; + pid_t pid; + int ret; + + /* Check if we have already initialized the network */ + + if (!g_ftpdglobls.initialized) + { + + /* Bring up the network */ + + ret = ftpd_netinit(); + if (ret < 0) + { + ndbg("Failed to initialize the network\n"); + return EXIT_FAILURE; + } + + g_ftpdglobls.initialized = true; + g_ftpdglobls.stop = false; + } + + /* Then start the new daemon */ + + g_telnetdcommon.daemon = daemon; + pid = TASK_CREATE("Telnet daemon", CONFIG_EXAMPLES_FTPD_PRIO, + CONFIG_EXAMPLES_FTPD_STACKSIZE, ftpd_daemon, NULL); + if (pid < 0) + { + ndbg("Failed to start the telnet daemon: %d\n", errno); + return EXIT_FAILURE; + } + + printf("The FTP daemon is running, pid=%d\n", pid); + return EXIT_SUCCESS; +} diff --git a/apps/examples/telnetd/Makefile b/apps/examples/telnetd/Makefile index dcb6615cc..b4ed50c33 100644 --- a/apps/examples/telnetd/Makefile +++ b/apps/examples/telnetd/Makefile @@ -58,7 +58,7 @@ ROOTDEPPATH = --dep-path . # Buttons built-in application info -APPNAME = buttons +APPNAME = telnetd PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 diff --git a/apps/netutils/Makefile b/apps/netutils/Makefile index df61f97e8..1313c223d 100644 --- a/apps/netutils/Makefile +++ b/apps/netutils/Makefile @@ -1,8 +1,8 @@ ############################################################################ # apps/netutils/Makefile # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. -# Author: Gregory Nutt +# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -38,10 +38,11 @@ # Sub-directories ifeq ($(CONFIG_NET),y) -SUBDIRS = uiplib dhcpc dhcpd ftpc resolv smtp telnetd webclient webserver tftpc thttpd +SUBDIRS = uiplib dhcpc dhcpd ftpc ftpd resolv smtp telnetd webclient webserver tftpc thttpd endif all: nothing + .PHONY: nothing context depend clean distclean nothing: diff --git a/apps/netutils/README.txt b/apps/netutils/README.txt index b80444925..26f11b7ce 100644 --- a/apps/netutils/README.txt +++ b/apps/netutils/README.txt @@ -49,6 +49,8 @@ highly influenced by uIP) include: inherited by spawned tasks. ftpc - FTP client. See apps/include/ftpc.h for interface information. + ftpd - FTP server. See apps/include/netutils/ftpd.h for interface + information. thttpd - This is a port of Jef Poskanzer's THTTPD HTPPD server. See http://acme.com/software/thttpd/ for general THTTPD information. See apps/include/netutils/thttpd.h diff --git a/apps/netutils/ftpd/Makefile b/apps/netutils/ftpd/Makefile new file mode 100644 index 000000000..84e4f79a7 --- /dev/null +++ b/apps/netutils/ftpd/Makefile @@ -0,0 +1,97 @@ +############################################################################ +# apps/netutils/ftpd/Makefile +# +# Copyright (C) 2012 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ + +-include $(TOPDIR)/.config +-include $(TOPDIR)/Make.defs +include $(APPDIR)/Make.defs + +# Telnet daemon + +ASRCS = +CSRCS = + +ifeq ($(CONFIG_NET_TCP),y) +CSRCS += ftpd.c +endif + +AOBJS = $(ASRCS:.S=$(OBJEXT)) +COBJS = $(CSRCS:.c=$(OBJEXT)) + +SRCS = $(ASRCS) $(CSRCS) +OBJS = $(AOBJS) $(COBJS) + +ifeq ($(WINTOOL),y) + BIN = "${shell cygpath -w $(APPDIR)/libapps$(LIBEXT)}" +else + BIN = "$(APPDIR)/libapps$(LIBEXT)" +endif + +ROOTDEPPATH = --dep-path . + +# Common build + +VPATH = + +all: .built +.PHONY: context depend clean distclean + +$(AOBJS): %$(OBJEXT): %.S + $(call ASSEMBLE, $<, $@) + +$(COBJS): %$(OBJEXT): %.c + $(call COMPILE, $<, $@) + +.built: $(OBJS) + @( for obj in $(OBJS) ; do \ + $(call ARCHIVE, $(BIN), $${obj}); \ + done ; ) + @touch .built + +context: + +.depend: Makefile $(SRCS) + @$(MKDEP) $(ROOTDEPPATH) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @touch $@ + +depend: .depend + +clean: + @rm -f *.o *~ .*.swp .built + $(call CLEAN) + +distclean: clean + @rm -f Make.dep .depend + +-include Make.dep diff --git a/apps/netutils/ftpd/ftpd.h b/apps/netutils/ftpd/ftpd.h index 938ca4b89..0332b0a19 100755 --- a/apps/netutils/ftpd/ftpd.h +++ b/apps/netutils/ftpd/ftpd.h @@ -76,13 +76,13 @@ enum ftpd_sessiontype_e { - FTPD_SESSIONTYPE_NONE = 0 + FTPD_SESSIONTYPE_NONE = 0, FTPD_SESSIONTYPE_A, FTPD_SESSIONTYPE_I, FTPD_SESSIONTYPE_L8 }; -typedef struct ftpd_pathnode_s +struct ftpd_pathnode_s { struct ftpd_pathnode_s *flink; struct ftpd_pathnode_s *blink; diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html index bf0647b25..51ac872aa 100644 --- a/nuttx/Documentation/NuttX.html +++ b/nuttx/Documentation/NuttX.html @@ -8,7 +8,7 @@

NuttX RTOS

-

Last Updated: January 16, 2012

+

Last Updated: February 4, 2012

@@ -543,7 +543,7 @@

-

  • Networking utilities (DHCP server and client, SMTP client, TELNET client, FTP client, TFTP client, HTTP server and client)
    • +
  • Networking utilities (DHCP server and client, SMTP client, TELNET client, FTP server and client, TFTP client, HTTP server and client)

    • diff --git a/nuttx/configs/stm3240g-eval/nsh/appconfig b/nuttx/configs/stm3240g-eval/nsh/appconfig index 94f0c53f9..9567dd792 100644 --- a/nuttx/configs/stm3240g-eval/nsh/appconfig +++ b/nuttx/configs/stm3240g-eval/nsh/appconfig @@ -42,13 +42,17 @@ CONFIGURED_APPS += examples/nsh CONFIGURED_APPS += system/readline CONFIGURED_APPS += nshlib -# Networking libraries +# Networking libraries. +# Uncomment netutils/ftpc to include an FTP client +# Uncomment netutils/ftpd to include an FTP server ifeq ($(CONFIG_NET),y) CONFIGURED_APPS += netutils/uiplib CONFIGURED_APPS += netutils/resolv CONFIGURED_APPS += netutils/webclient CONFIGURED_APPS += netutils/tftpc +#CONFIGURED_APPS += netutils/ftpc +#CONFIGURED_APPS += netutils/ftpd ifeq ($(CONFIG_NSH_TELNET),y) CONFIGURED_APPS += netutils/telnetd endif @@ -71,3 +75,11 @@ endif ifeq ($(CONFIG_I2C),y) CONFIGURED_APPS += system/i2c endif + +# Uncomment examples/ftpc to include the FTP client example +# Uncomment examples/ftpd to include the FTP daemon example + +ifeq ($(CONFIG_NET),y) +#CONFIGURED_APPS += examples/ftpc +#CONFIGURED_APPS += examples/ftpd +endif