From fc346719ec1c1ab320bbe986ca24d7ce45d8c93f Mon Sep 17 00:00:00 2001 From: patacongo Date: Sat, 28 Mar 2009 21:28:43 +0000 Subject: [PATCH] Remove all options from examples/uip except for the webserver git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1661 42af7a65-404d-4744-a932-0658087f49c3 --- configs/c5471evm/defconfig | 4 -- configs/c5471evm/dhcpconfig | 4 -- configs/c5471evm/netconfig | 4 -- configs/c5471evm/nshconfig | 4 -- configs/ez80f910200kitg/ostest/defconfig | 4 -- configs/ez80f910200zco/dhcpd/defconfig | 4 -- configs/ez80f910200zco/httpd/defconfig | 4 -- configs/ez80f910200zco/nettest/defconfig | 4 -- configs/ez80f910200zco/nsh/defconfig | 4 -- configs/ez80f910200zco/ostest/defconfig | 4 -- configs/ez80f910200zco/poll/defconfig | 4 -- configs/ntosd-dm320/nettest/defconfig | 4 -- configs/ntosd-dm320/nsh/defconfig | 4 -- configs/ntosd-dm320/ostest/defconfig | 4 -- configs/ntosd-dm320/poll/defconfig | 4 -- configs/ntosd-dm320/udp/defconfig | 4 -- configs/ntosd-dm320/uip/defconfig | 4 -- configs/sim/mount/defconfig | 4 -- configs/sim/nettest/defconfig | 4 -- configs/sim/nsh/defconfig | 4 -- configs/sim/nx/defconfig | 4 -- configs/sim/nx/defconfig-x11 | 4 -- configs/sim/ostest/defconfig | 4 -- configs/sim/pashello/defconfig | 4 -- configs/skp16c26/ostest/defconfig | 4 -- examples/README.txt | 16 +++++--- examples/uip/main.c | 50 ++++-------------------- examples/wget/host.c | 2 +- netutils/telnetd/README.txt | 7 ++++ 29 files changed, 26 insertions(+), 149 deletions(-) create mode 100644 netutils/telnetd/README.txt diff --git a/configs/c5471evm/defconfig b/configs/c5471evm/defconfig index ddeed33c50..e954025ce6 100644 --- a/configs/c5471evm/defconfig +++ b/configs/c5471evm/defconfig @@ -346,11 +346,7 @@ CONFIG_EXAMPLE_UIP_NOMAC=y CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_UIP_SMTP=n -CONFIG_EXAMPLE_UIP_TELNETD=n -CONFIG_EXAMPLE_UIP_WEBSERVER=y CONFIG_EXAMPLE_UIP_DHCPC=n -CONFIG_EXAMPLE_UIP_WEBCLIENT=n # # Settings for examples/nettest diff --git a/configs/c5471evm/dhcpconfig b/configs/c5471evm/dhcpconfig index 79d220f8c9..f07d76589c 100644 --- a/configs/c5471evm/dhcpconfig +++ b/configs/c5471evm/dhcpconfig @@ -346,11 +346,7 @@ CONFIG_EXAMPLE_UIP_NOMAC=y CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_UIP_SMTP=n -CONFIG_EXAMPLE_UIP_TELNETD=n -CONFIG_EXAMPLE_UIP_WEBSERVER=n CONFIG_EXAMPLE_UIP_DHCPC=y -CONFIG_EXAMPLE_UIP_WEBCLIENT=n # # Settings for examples/nettest diff --git a/configs/c5471evm/netconfig b/configs/c5471evm/netconfig index 7d63ed47bb..1847c76d0c 100644 --- a/configs/c5471evm/netconfig +++ b/configs/c5471evm/netconfig @@ -346,11 +346,7 @@ CONFIG_EXAMPLE_UIP_NOMAC=y CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_UIP_SMTP=n -CONFIG_EXAMPLE_UIP_TELNETD=n -CONFIG_EXAMPLE_UIP_WEBSERVER=y CONFIG_EXAMPLE_UIP_DHCPC=n -CONFIG_EXAMPLE_UIP_WEBCLIENT=n # # Settings for examples/nettest diff --git a/configs/c5471evm/nshconfig b/configs/c5471evm/nshconfig index 7ee3d4acc1..95ef789cce 100644 --- a/configs/c5471evm/nshconfig +++ b/configs/c5471evm/nshconfig @@ -346,11 +346,7 @@ CONFIG_EXAMPLE_UIP_NOMAC=y CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_UIP_SMTP=n -CONFIG_EXAMPLE_UIP_TELNETD=n -CONFIG_EXAMPLE_UIP_WEBSERVER=y CONFIG_EXAMPLE_UIP_DHCPC=n -CONFIG_EXAMPLE_UIP_WEBCLIENT=n # # Settings for examples/nettest diff --git a/configs/ez80f910200kitg/ostest/defconfig b/configs/ez80f910200kitg/ostest/defconfig index d4b3f972db..bdf220cd4f 100644 --- a/configs/ez80f910200kitg/ostest/defconfig +++ b/configs/ez80f910200kitg/ostest/defconfig @@ -586,11 +586,7 @@ CONFIG_NX_MXCLIENTMSGS=16 CONFIG_EXAMPLE_UIP_IPADDR=(192L<<24|168L<<16|0L<<8|128L) CONFIG_EXAMPLE_UIP_DRIPADDR=(192L<<24|168L<<16|0L<<8|1L) CONFIG_EXAMPLE_UIP_NETMASK=(255L<<24|255L<<16|255L<<8|0L) -CONFIG_EXAMPLE_UIP_SMTP=n -CONFIG_EXAMPLE_UIP_TELNETD=n -CONFIG_EXAMPLE_UIP_WEBSERVER=y CONFIG_EXAMPLE_UIP_DHCPC=n -CONFIG_EXAMPLE_UIP_WEBCLIENT=n # # Settings for examples/nettest diff --git a/configs/ez80f910200zco/dhcpd/defconfig b/configs/ez80f910200zco/dhcpd/defconfig index 5bfdf9f9f0..eebc3b8919 100644 --- a/configs/ez80f910200zco/dhcpd/defconfig +++ b/configs/ez80f910200zco/dhcpd/defconfig @@ -615,11 +615,7 @@ CONFIG_EXAMPLE_POLL_NETMASK=(255L<<24|255L<<16|255L<<8|0L) CONFIG_EXAMPLE_UIP_IPADDR=(10L<<24|0L<<16|0L<<8|2L) CONFIG_EXAMPLE_UIP_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) CONFIG_EXAMPLE_UIP_NETMASK=(255L<<24|255L<<16|255L<<8|0L) -CONFIG_EXAMPLE_UIP_SMTP=n -CONFIG_EXAMPLE_UIP_TELNETD=n -CONFIG_EXAMPLE_UIP_WEBSERVER=y CONFIG_EXAMPLE_UIP_DHCPC=n -CONFIG_EXAMPLE_UIP_WEBCLIENT=n # # Settings for examples/nettest diff --git a/configs/ez80f910200zco/httpd/defconfig b/configs/ez80f910200zco/httpd/defconfig index eb25f433fc..3f1ab07b0f 100644 --- a/configs/ez80f910200zco/httpd/defconfig +++ b/configs/ez80f910200zco/httpd/defconfig @@ -623,11 +623,7 @@ CONFIG_EXAMPLE_POLL_NETMASK=(255L<<24|255L<<16|255L<<8|0L) CONFIG_EXAMPLE_UIP_IPADDR=(10L<<24|0L<<16|0L<<8|2L) CONFIG_EXAMPLE_UIP_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) CONFIG_EXAMPLE_UIP_NETMASK=(255L<<24|255L<<16|255L<<8|0L) -CONFIG_EXAMPLE_UIP_SMTP=n -CONFIG_EXAMPLE_UIP_TELNETD=n -CONFIG_EXAMPLE_UIP_WEBSERVER=y CONFIG_EXAMPLE_UIP_DHCPC=n -CONFIG_EXAMPLE_UIP_WEBCLIENT=n # # Settings for examples/nettest diff --git a/configs/ez80f910200zco/nettest/defconfig b/configs/ez80f910200zco/nettest/defconfig index 6dab0787f9..aec18796c7 100644 --- a/configs/ez80f910200zco/nettest/defconfig +++ b/configs/ez80f910200zco/nettest/defconfig @@ -615,11 +615,7 @@ CONFIG_EXAMPLE_POLL_NETMASK=(255L<<24|255L<<16|255L<<8|0L) CONFIG_EXAMPLE_UIP_IPADDR=(10L<<24|0L<<16|0L<<8|2L) CONFIG_EXAMPLE_UIP_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) CONFIG_EXAMPLE_UIP_NETMASK=(255L<<24|255L<<16|255L<<8|0L) -CONFIG_EXAMPLE_UIP_SMTP=n -CONFIG_EXAMPLE_UIP_TELNETD=n -CONFIG_EXAMPLE_UIP_WEBSERVER=y CONFIG_EXAMPLE_UIP_DHCPC=n -CONFIG_EXAMPLE_UIP_WEBCLIENT=n # # Settings for examples/nettest diff --git a/configs/ez80f910200zco/nsh/defconfig b/configs/ez80f910200zco/nsh/defconfig index 7a6da036b7..1edcddbb4b 100644 --- a/configs/ez80f910200zco/nsh/defconfig +++ b/configs/ez80f910200zco/nsh/defconfig @@ -615,11 +615,7 @@ CONFIG_EXAMPLE_POLL_NETMASK=(255L<<24|255L<<16|255L<<8|0L) CONFIG_EXAMPLE_UIP_IPADDR=(10L<<24|0L<<16|0L<<8|2L) CONFIG_EXAMPLE_UIP_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) CONFIG_EXAMPLE_UIP_NETMASK=(255L<<24|255L<<16|255L<<8|0L) -CONFIG_EXAMPLE_UIP_SMTP=n -CONFIG_EXAMPLE_UIP_TELNETD=n -CONFIG_EXAMPLE_UIP_WEBSERVER=y CONFIG_EXAMPLE_UIP_DHCPC=n -CONFIG_EXAMPLE_UIP_WEBCLIENT=n # # Settings for examples/nettest diff --git a/configs/ez80f910200zco/ostest/defconfig b/configs/ez80f910200zco/ostest/defconfig index 2264c8a05e..3902fa7957 100644 --- a/configs/ez80f910200zco/ostest/defconfig +++ b/configs/ez80f910200zco/ostest/defconfig @@ -610,11 +610,7 @@ CONFIG_EXAMPLE_POLL_NETMASK=(255L<<24|255L<<16|255L<<8|0L) CONFIG_EXAMPLE_UIP_IPADDR=(192L<<24|168L<<16|0L<<8|128L) CONFIG_EXAMPLE_UIP_DRIPADDR=(192L<<24|168L<<16|0L<<8|1L) CONFIG_EXAMPLE_UIP_NETMASK=(255L<<24|255L<<16|255L<<8|0L) -CONFIG_EXAMPLE_UIP_SMTP=n -CONFIG_EXAMPLE_UIP_TELNETD=n -CONFIG_EXAMPLE_UIP_WEBSERVER=y CONFIG_EXAMPLE_UIP_DHCPC=n -CONFIG_EXAMPLE_UIP_WEBCLIENT=n # # Settings for examples/nettest diff --git a/configs/ez80f910200zco/poll/defconfig b/configs/ez80f910200zco/poll/defconfig index 4ea75dfc19..9c32438734 100644 --- a/configs/ez80f910200zco/poll/defconfig +++ b/configs/ez80f910200zco/poll/defconfig @@ -615,11 +615,7 @@ CONFIG_EXAMPLE_POLL_NETMASK=(255L<<24|255L<<16|255L<<8|0L) CONFIG_EXAMPLE_UIP_IPADDR=(10L<<24|0L<<16|0L<<8|2L) CONFIG_EXAMPLE_UIP_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L) CONFIG_EXAMPLE_UIP_NETMASK=(255L<<24|255L<<16|255L<<8|0L) -CONFIG_EXAMPLE_UIP_SMTP=n -CONFIG_EXAMPLE_UIP_TELNETD=n -CONFIG_EXAMPLE_UIP_WEBSERVER=y CONFIG_EXAMPLE_UIP_DHCPC=n -CONFIG_EXAMPLE_UIP_WEBCLIENT=n # # Settings for examples/nettest diff --git a/configs/ntosd-dm320/nettest/defconfig b/configs/ntosd-dm320/nettest/defconfig index 7605384b0f..080a4f1448 100644 --- a/configs/ntosd-dm320/nettest/defconfig +++ b/configs/ntosd-dm320/nettest/defconfig @@ -446,11 +446,7 @@ CONFIG_USBSTRG_REMOVABLE=y CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_UIP_SMTP=n -CONFIG_EXAMPLE_UIP_TELNETD=n -CONFIG_EXAMPLE_UIP_WEBSERVER=y CONFIG_EXAMPLE_UIP_DHCPC=n -CONFIG_EXAMPLE_UIP_WEBCLIENT=n # # Settings for examples/nettest diff --git a/configs/ntosd-dm320/nsh/defconfig b/configs/ntosd-dm320/nsh/defconfig index 7a961f6042..1bb95f2c6e 100644 --- a/configs/ntosd-dm320/nsh/defconfig +++ b/configs/ntosd-dm320/nsh/defconfig @@ -454,11 +454,7 @@ CONFIG_USBSTRG_REMOVABLE=y CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_UIP_SMTP=n -CONFIG_EXAMPLE_UIP_TELNETD=n -CONFIG_EXAMPLE_UIP_WEBSERVER=y CONFIG_EXAMPLE_UIP_DHCPC=n -CONFIG_EXAMPLE_UIP_WEBCLIENT=n # # Settings for examples/nettest diff --git a/configs/ntosd-dm320/ostest/defconfig b/configs/ntosd-dm320/ostest/defconfig index 36e1d75676..cc064c03fb 100644 --- a/configs/ntosd-dm320/ostest/defconfig +++ b/configs/ntosd-dm320/ostest/defconfig @@ -438,11 +438,7 @@ CONFIG_USBSTRG_REMOVABLE=y CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_UIP_SMTP=n -CONFIG_EXAMPLE_UIP_TELNETD=n -CONFIG_EXAMPLE_UIP_WEBSERVER=y CONFIG_EXAMPLE_UIP_DHCPC=n -CONFIG_EXAMPLE_UIP_WEBCLIENT=n # # Settings for examples/nettest diff --git a/configs/ntosd-dm320/poll/defconfig b/configs/ntosd-dm320/poll/defconfig index e4e0df9006..50ef31ff78 100644 --- a/configs/ntosd-dm320/poll/defconfig +++ b/configs/ntosd-dm320/poll/defconfig @@ -453,11 +453,7 @@ CONFIG_EXAMPLE_POLL_NETMASK=(255<<24|255<<16|255<<8|0) CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_UIP_SMTP=n -CONFIG_EXAMPLE_UIP_TELNETD=n -CONFIG_EXAMPLE_UIP_WEBSERVER=y CONFIG_EXAMPLE_UIP_DHCPC=n -CONFIG_EXAMPLE_UIP_WEBCLIENT=n # # Settings for examples/nettest diff --git a/configs/ntosd-dm320/udp/defconfig b/configs/ntosd-dm320/udp/defconfig index 42b4df2b61..378277f1ad 100644 --- a/configs/ntosd-dm320/udp/defconfig +++ b/configs/ntosd-dm320/udp/defconfig @@ -446,11 +446,7 @@ CONFIG_USBSTRG_REMOVABLE=y CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_UIP_SMTP=n -CONFIG_EXAMPLE_UIP_TELNETD=n -CONFIG_EXAMPLE_UIP_WEBSERVER=y CONFIG_EXAMPLE_UIP_DHCPC=n -CONFIG_EXAMPLE_UIP_WEBCLIENT=n # # Settings for examples/nettest diff --git a/configs/ntosd-dm320/uip/defconfig b/configs/ntosd-dm320/uip/defconfig index c2e11e00c6..3eefc9dbed 100644 --- a/configs/ntosd-dm320/uip/defconfig +++ b/configs/ntosd-dm320/uip/defconfig @@ -454,11 +454,7 @@ CONFIG_NETUTILS_HTTPD_DUMPPSTATE=n CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_UIP_SMTP=n -CONFIG_EXAMPLE_UIP_TELNETD=n -CONFIG_EXAMPLE_UIP_WEBSERVER=y CONFIG_EXAMPLE_UIP_DHCPC=n -CONFIG_EXAMPLE_UIP_WEBCLIENT=n # # Settings for examples/nettest diff --git a/configs/sim/mount/defconfig b/configs/sim/mount/defconfig index 84e8e6d914..78c75b4939 100644 --- a/configs/sim/mount/defconfig +++ b/configs/sim/mount/defconfig @@ -289,11 +289,7 @@ CONFIG_NET_RESOLV_ENTRIES=4 CONFIG_EXAMPLE_UIP_IPADDR=(192<<24|168<<16|0<<8|128) CONFIG_EXAMPLE_UIP_DRIPADDR=(192<<24|168<<16|0<<8|1) CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_UIP_SMTP=n -CONFIG_EXAMPLE_UIP_TELNETD=n -CONFIG_EXAMPLE_UIP_WEBSERVER=y CONFIG_EXAMPLE_UIP_DHCPC=n -CONFIG_EXAMPLE_UIP_WEBCLIENT=n # # Settings for examples/nettest diff --git a/configs/sim/nettest/defconfig b/configs/sim/nettest/defconfig index 64d50d32eb..62e7236e20 100644 --- a/configs/sim/nettest/defconfig +++ b/configs/sim/nettest/defconfig @@ -289,11 +289,7 @@ CONFIG_NET_RESOLV_ENTRIES=4 CONFIG_EXAMPLE_UIP_IPADDR=(192<<24|168<<16|0<<8|128) CONFIG_EXAMPLE_UIP_DRIPADDR=(192<<24|168<<16|0<<8|1) CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_UIP_SMTP=n -CONFIG_EXAMPLE_UIP_TELNETD=n -CONFIG_EXAMPLE_UIP_WEBSERVER=y CONFIG_EXAMPLE_UIP_DHCPC=n -CONFIG_EXAMPLE_UIP_WEBCLIENT=n # # Settings for examples/nettest diff --git a/configs/sim/nsh/defconfig b/configs/sim/nsh/defconfig index 8298ecb405..2bfd27cc2a 100644 --- a/configs/sim/nsh/defconfig +++ b/configs/sim/nsh/defconfig @@ -289,11 +289,7 @@ CONFIG_NET_RESOLV_ENTRIES=4 CONFIG_EXAMPLE_UIP_IPADDR=(192<<24|168<<16|0<<8|128) CONFIG_EXAMPLE_UIP_DRIPADDR=(192<<24|168<<16|0<<8|1) CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_UIP_SMTP=n -CONFIG_EXAMPLE_UIP_TELNETD=n -CONFIG_EXAMPLE_UIP_WEBSERVER=y CONFIG_EXAMPLE_UIP_DHCPC=n -CONFIG_EXAMPLE_UIP_WEBCLIENT=n # # Settings for examples/nettest diff --git a/configs/sim/nx/defconfig b/configs/sim/nx/defconfig index e56d9ad36b..e7beb8144a 100644 --- a/configs/sim/nx/defconfig +++ b/configs/sim/nx/defconfig @@ -383,11 +383,7 @@ CONFIG_NX_MXCLIENTMSGS=16 CONFIG_EXAMPLE_UIP_IPADDR=(192<<24|168<<16|0<<8|128) CONFIG_EXAMPLE_UIP_DRIPADDR=(192<<24|168<<16|0<<8|1) CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_UIP_SMTP=n -CONFIG_EXAMPLE_UIP_TELNETD=n -CONFIG_EXAMPLE_UIP_WEBSERVER=y CONFIG_EXAMPLE_UIP_DHCPC=n -CONFIG_EXAMPLE_UIP_WEBCLIENT=n # # Settings for examples/nettest diff --git a/configs/sim/nx/defconfig-x11 b/configs/sim/nx/defconfig-x11 index e82f32aa9a..e61085c145 100644 --- a/configs/sim/nx/defconfig-x11 +++ b/configs/sim/nx/defconfig-x11 @@ -377,11 +377,7 @@ CONFIG_NX_MXCLIENTMSGS=16 CONFIG_EXAMPLE_UIP_IPADDR=(192<<24|168<<16|0<<8|128) CONFIG_EXAMPLE_UIP_DRIPADDR=(192<<24|168<<16|0<<8|1) CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_UIP_SMTP=n -CONFIG_EXAMPLE_UIP_TELNETD=n -CONFIG_EXAMPLE_UIP_WEBSERVER=y CONFIG_EXAMPLE_UIP_DHCPC=n -CONFIG_EXAMPLE_UIP_WEBCLIENT=n # # Settings for examples/nettest diff --git a/configs/sim/ostest/defconfig b/configs/sim/ostest/defconfig index ed95bb8a38..5ef40cd300 100644 --- a/configs/sim/ostest/defconfig +++ b/configs/sim/ostest/defconfig @@ -303,11 +303,7 @@ CONFIG_NET_RESOLV_ENTRIES=4 CONFIG_EXAMPLE_UIP_IPADDR=(192<<24|168<<16|0<<8|128) CONFIG_EXAMPLE_UIP_DRIPADDR=(192<<24|168<<16|0<<8|1) CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_UIP_SMTP=n -CONFIG_EXAMPLE_UIP_TELNETD=n -CONFIG_EXAMPLE_UIP_WEBSERVER=y CONFIG_EXAMPLE_UIP_DHCPC=n -CONFIG_EXAMPLE_UIP_WEBCLIENT=n # # Settings for examples/nettest diff --git a/configs/sim/pashello/defconfig b/configs/sim/pashello/defconfig index a91a415b06..e1710f00ef 100644 --- a/configs/sim/pashello/defconfig +++ b/configs/sim/pashello/defconfig @@ -289,11 +289,7 @@ CONFIG_NET_RESOLV_ENTRIES=4 CONFIG_EXAMPLE_UIP_IPADDR=(192<<24|168<<16|0<<8|128) CONFIG_EXAMPLE_UIP_DRIPADDR=(192<<24|168<<16|0<<8|1) CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_UIP_SMTP=n -CONFIG_EXAMPLE_UIP_TELNETD=n -CONFIG_EXAMPLE_UIP_WEBSERVER=y CONFIG_EXAMPLE_UIP_DHCPC=n -CONFIG_EXAMPLE_UIP_WEBCLIENT=n # # Settings for examples/nettest diff --git a/configs/skp16c26/ostest/defconfig b/configs/skp16c26/ostest/defconfig index 781532b0d3..40016aeb4f 100644 --- a/configs/skp16c26/ostest/defconfig +++ b/configs/skp16c26/ostest/defconfig @@ -468,11 +468,7 @@ CONFIG_USBSTRG_REMOVABLE=y CONFIG_EXAMPLE_UIP_IPADDR=(10<<24|0<<16|0<<8|2) CONFIG_EXAMPLE_UIP_DRIPADDR=(10<<24|0<<16|0<<8|1) CONFIG_EXAMPLE_UIP_NETMASK=(255<<24|255<<16|255<<8|0) -CONFIG_EXAMPLE_UIP_SMTP=n -CONFIG_EXAMPLE_UIP_TELNETD=n -CONFIG_EXAMPLE_UIP_WEBSERVER=y CONFIG_EXAMPLE_UIP_DHCPC=n -CONFIG_EXAMPLE_UIP_WEBCLIENT=n # # Settings for examples/nettest diff --git a/examples/README.txt b/examples/README.txt index ddf76e35d8..52e0c542b3 100644 --- a/examples/README.txt +++ b/examples/README.txt @@ -249,13 +249,17 @@ examples/udp examples/uip ^^^^^^^^^^^^ - This is a port of uIP example application. It includes conditionally - compiled logic to exercise the uIP webserver, telnet, smtp, dhcpc, - and resolver. + This is a port of uIP tiny webserver example application. Settings + specific to this example include: - Other configuratin items apply also to the selected network utility. - For example, the additional relevant settings for the uIP webserver - are: + CONFIG_EXAMPLE_UIP_NOMAC - (May be defined to use software assigned MAC) + CONFIG_EXAMPLE_UIP_IPADDR - Target IP address + CONFIG_EXAMPLE_UIP_DRIPADDR - Default router IP addess + CONFIG_EXAMPLE_UIP_NETMASK - Network mask + CONFIG_EXAMPLE_UIP_DHCPC - Select to get IP address via DHCP + + Other configuration items apply also to the selected webserver net utility. + Additional relevant settings for the uIP webserver net utility are: CONFIG_NETUTILS_HTTPDSTACKSIZE CONFIG_NETUTILS_HTTPDFILESTATS diff --git a/examples/uip/main.c b/examples/uip/main.c index 2719f5bf73..79b4daa080 100644 --- a/examples/uip/main.c +++ b/examples/uip/main.c @@ -62,22 +62,14 @@ /* DHCPC may be used in conjunction with any other feature (or not) */ -#if defined(CONFIG_EXAMPLE_UIP_DHCPC) +#ifdef CONFIG_EXAMPLE_UIP_DHCPC # include # include #endif -/* Pick the netutils feature under test (which may be DHCPC) */ +/* Include uIP webserver definitions */ -#if defined(CONFIG_EXAMPLE_UIP_SMTP) -# include -#elif defined(CONFIG_EXAMPLE_UIP_TELNETD) -# include -#elif defined(CONFIG_EXAMPLE_UIP_WEBSERVER) -# include -#elif !defined(CONFIG_EXAMPLE_UIP_DHCPC) -# error "No network application specified" -#endif +#include /**************************************************************************** * Definitions @@ -101,14 +93,6 @@ * Private Data ****************************************************************************/ -#if defined(CONFIG_EXAMPLE_UIP_SMTP) -static const char g_host_name[] = "localhost"; -static const char g_recipient[] = "spudmonkey@racsa.co.cr"; -static const char g_sender[] = "nuttx-testing@example.com"; -static const char g_subject[] = "Testing SMTP from NuttX"; -static const char g_msg_body[] = "Test message sent by NuttX\r\n"; -#endif - /**************************************************************************** * Public Functions ****************************************************************************/ @@ -136,7 +120,7 @@ int user_start(int argc, char *argv[]) #if defined(CONFIG_EXAMPLE_UIP_DHCPC) || defined(CONFIG_EXAMPLE_UIP_NOMAC) uint8 mac[IFHWADDRLEN]; #endif -#if defined(CONFIG_EXAMPLE_UIP_DHCPC) || defined(CONFIG_EXAMPLE_UIP_SMTP) +#ifdef CONFIG_EXAMPLE_UIP_DHCPC void *handle; #endif @@ -154,10 +138,10 @@ int user_start(int argc, char *argv[]) /* Set up our host address */ -#if !defined(CONFIG_EXAMPLE_UIP_DHCPC) - addr.s_addr = HTONL(CONFIG_EXAMPLE_UIP_IPADDR); -#else +#ifdef CONFIG_EXAMPLE_UIP_DHCPC addr.s_addr = 0; +#else + addr.s_addr = HTONL(CONFIG_EXAMPLE_UIP_IPADDR); #endif uip_sethostaddr("eth0", &addr); @@ -171,13 +155,11 @@ int user_start(int argc, char *argv[]) addr.s_addr = HTONL(CONFIG_EXAMPLE_UIP_NETMASK); uip_setnetmask("eth0", &addr); -#if defined(CONFIG_EXAMPLE_UIP_DHCPC) +#ifdef CONFIG_EXAMPLE_UIP_DHCPC /* Set up the resolver */ resolv_init(); -#endif -#if defined(CONFIG_EXAMPLE_UIP_DHCPC) /* Get the MAC address of the NIC */ uip_getmacaddr("eth0", mac); @@ -210,25 +192,9 @@ int user_start(int argc, char *argv[]) } #endif -#if defined(CONFIG_EXAMPLE_UIP_WEBSERVER) printf("Starting webserver\n"); httpd_init(); httpd_listen(); -#elif defined(CONFIG_EXAMPLE_UIP_TELNETD) - printf("Starting telnetd\n"); - telnetd_init(); -#elif defined(CONFIG_EXAMPLE_UIP_SMTP) - printf("Sending mail\n"); - uip_ipaddr(addr.s_addr, 127, 0, 0, 1); - handle = smtp_open(); - if (handle) - { - smtp_configure(handle, g_host_name, &addr.s_addr); - smtp_send(handle, g_recipient, NULL, g_sender, g_subject, - g_msg_body, strlen(g_msg_body)); - smtp_close(handle); - } -#endif while(1) { diff --git a/examples/wget/host.c b/examples/wget/host.c index 40fda1af98..fe81090514 100644 --- a/examples/wget/host.c +++ b/examples/wget/host.c @@ -1,7 +1,7 @@ /**************************************************************************** * examples/wget/host.c * - * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without diff --git a/netutils/telnetd/README.txt b/netutils/telnetd/README.txt new file mode 100644 index 0000000000..14b05236c3 --- /dev/null +++ b/netutils/telnetd/README.txt @@ -0,0 +1,7 @@ +This directory is here for historical reasons. Nothing contained in this +directory is currently used by NuttX. This directly contains a functional +port of the tiny uIP shell. In the NuttX environment, the NuttShell (at +/examples/nsh) supercedes this tiny shell and also supports telnetd. + +This example is retained here for reference purposes only. +