Integrated uIP's TELNETD

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@408 42af7a65-404d-4744-a932-0658087f49c3

ChangeLog

@@ -251,3 +251,5 @@
 	* Correct socket close logic -- needs to disconnect TCP socket on close
 	* uIP webserver now seems to be fully functional
 	* fs/ and lib/ subystem debug can not be selectively enabled/disabled
+	* Added vsnprintf
+	* Integrated uIP telnetd

Documentation/NuttX.html

@@ -731,6 +731,8 @@ Other memory:
 	* Correct socket close logic -- needs to disconnect TCP socket on close
 	* uIP webserver now seems to be fully functional
 	* fs/ and lib/ subystem debug can not be selectively enabled/disabled
+	* Added vsnprintf
+	* Integrated uIP telnetd
 </pre></ul>
 
 <table width ="100%">

TODO

@@ -31,8 +31,6 @@ o C++ Support
 o Network
 - Did not implement send() and sendto() timeouts.  Option is setable via setsockopt,
   but is not implemented.
-- uIP's netutils/telnetd (and maybe others) are seriously broken.
-  Need to be re-written to use listen() and accept()
 - uIP's netutils/smtp, dpcpc, resolv, webclient -- untested
 - Should implement SOCK_RAW
 - Performance Improvements (uIP is not very fast):

include/net/uip/telnetd.h

@@ -0,0 +1,70 @@
+/****************************************************************************
+ * include/net/uip/telnetd.h
+ *
+ *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * This is a leverage of similar logic from uIP:
+ *
+ *   Author: Adam Dunkels <adam@sics.se>
+ *   Copyright (c) 2003, Adam Dunkels.
+ *   All rights reserved.
+ *
+ * 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.
+ ****************************************************************************/
+
+#ifndef __NET_UIP_TELNETD_H
+#define __NET_UIP_TELNETD_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+#ifdef __cplusplus
+#define EXTERN extern "C"
+extern "C" {
+#else
+#define EXTERN extern
+#endif
+
+/* Start the telnet server -- does not return unless an error occurs */
+
+EXTERN void telnetd_init(void);
+
+#undef EXTERN
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __NET_UIP_TELNETD_H */

netutils/telnetd/shell.c

@@ -1,94 +1,139 @@
- /*
+/****************************************************************************
- * Copyright (c) 2003, Adam Dunkels.
+ * netutils/telnetd/telnetd.c
- * All rights reserved.
+ *
+ *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * This is a leverage of similar logic from uIP:
+ *
+ *   Author: Adam Dunkels <adam@sics.se>
+ *   Copyright (c) 2003, Adam Dunkels.
+ *   All rights reserved.
  *
  * 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
+ * 3. Neither the name of the Institute nor the names of its contributors
- *    products derived from this software without specific prior
+ *    may be used to endorse or promote products derived from this software
- *    written permission.
+ *    without specific prior written permission.
  *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SUCH DAMAGE.
- */
+ ****************************************************************************/
 
-#include "shell.h"
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
 
 #include <string.h>
+#include "shell.h"
 
-struct ptentry {
+/****************************************************************************
-  char *commandstr;
+ * Definitions
-  void (* pfunc)(char *str);
+ ****************************************************************************/
-};
 
 #define SHELL_PROMPT "uIP 1.0> "
 
-static void parse(register char *str, struct ptentry *t)
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+struct ptentry_s
 {
-  struct ptentry *p;
+  char *commandstr;
-  for(p = t; p->commandstr != NULL; ++p) {
+  void (* pfunc)(void *handle, char *str);
-    if(strncmp(p->commandstr, str, strlen(p->commandstr)) == 0) {
+};
-      break;
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+static void parse(void *handle, register char *str, struct ptentry_s *t);
+static void help(void *handle, char *str);
+static void unknown(void *handle, char *str);
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+static struct ptentry_s g_parsetab[] =
+{
+  {"stats", help},
+  {"conn",  help},
+  {"help",  help},
+  {"exit",  shell_quit},
+  {"?",     help},
+  {NULL,    unknown}
+};
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+static void parse(void *handle, char *str, struct ptentry_s *t)
+{
+  struct ptentry_s *p;
+
+  for (p = t; p->commandstr != NULL; ++p)
+    {
+      if (strncmp(p->commandstr, str, strlen(p->commandstr)) == 0)
+        {
+          break;
+        }
     }
-  }
 
-  p->pfunc(str);
+  p->pfunc(handle, str);
 }
 
-static void help(char *str)
+static void help(void *handle, char *str)
 {
-  shell_output("Available commands:", "");
+  shell_output(handle, "Available commands:");
-  shell_output("stats   - show network statistics", "");
+  shell_output(handle, "stats   - show network statistics");
-  shell_output("conn    - show TCP connections", "");
+  shell_output(handle, "conn    - show TCP connections");
-  shell_output("help, ? - show help", "");
+  shell_output(handle, "help, ? - show help");
-  shell_output("exit    - exit shell", "");
+  shell_output(handle, "exit    - exit shell");
 }
 
-static void unknown(char *str)
+static void unknown(void *handle, char *str)
 {
-  if(strlen(str) > 0) {
+  if (strlen(str) > 0)
-    shell_output("Unknown command: ", str);
+    {
-  }
+      shell_output(handle, "Unknown command: ", str);
+    }
 }
 
-static struct ptentry parsetab[] =
+/****************************************************************************
-  {{"stats", help},
+ * Public Functions
-   {"conn", help},
+ ****************************************************************************/
-   {"help", help},
-   {"exit", shell_quit},
-   {"?", help},
 
-   /* Default action */
+void shell_init(void *handle)
-   {NULL, unknown}};
-
-void shell_init(void)
 {
 }
 
-void shell_start(void)
+void shell_start(void *handle)
 {
-  shell_output("uIP command shell", "");
+  shell_output(handle, "uIP command shell");
-  shell_output("Type '?' and return for help", "");
+  shell_output(handle, "Type '?' and return for help");
-  shell_prompt(SHELL_PROMPT);
+  shell_prompt(handle, SHELL_PROMPT);
 }
 
-void shell_input(char *cmd)
+void shell_input(void *handle, char *cmd)
 {
-  parse(cmd, parsetab);
+  parse(handle, cmd, g_parsetab);
-  shell_prompt(SHELL_PROMPT);
+  shell_prompt(handle, SHELL_PROMPT);
 }

netutils/telnetd/shell.h

@@ -52,14 +52,14 @@
  * be used to start listening for signals.
  */
 
-void shell_init(void);
+void shell_init(void *handle);
 
 /* Start the shell back-end.
  *
  * Called by the front-end when a new shell is started.
  */
 
-void shell_start(void);
+void shell_start(void *handle);
 
 /* Process a shell command.
  *
@@ -70,34 +70,28 @@ void shell_start(void);
  * command The command to be processed.
  */
 
-void shell_input(char *command);
+void shell_input(void *handle, char *command);
 
 /* Quit the shell. */
 
-void shell_quit(char *);
+void shell_quit(void *handle, char *);
-
 
 /* Print a string to the shell window.
  *
  * This function is implemented by the shell GUI / telnet server and
  * can be called by the shell back-end to output a string in the
  * shell window. The string is automatically appended with a linebreak.
- *
- * str1 The first half of the string to be output.
- * str2 The second half of the string to be output.
  */
 
-void shell_output(char *str1, char *str2);
+void shell_output(void *handle, const char *fmt, ...);
 
 /* Print a prompt to the shell window.
  *
  * This function can be used by the shell back-end to print out a
  * prompt to the shell window.
  *
- * prompt The prompt to be printed.
- *
  */
 
-void shell_prompt(char *prompt);
+void shell_prompt(void *handle, char *prompt);
 
 #endif /* __SHELL_H__ */

netutils/telnetd/telnetd.h

@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2003, Adam Dunkels.
- * All rights reserved.
- *
- * 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 __TELNETD_H__
-#define __TELNETD_H__
-
-#include <sys/types.h>
-#include <net/uip/uipopt.h>
-
-#ifndef TELNETD_CONF_LINELEN
-#define TELNETD_CONF_LINELEN 40
-#endif
-#ifndef TELNETD_CONF_NUMLINES
-#define TELNETD_CONF_NUMLINES 16
-#endif
-
-struct telnetd_state
-{
-  char *lines[TELNETD_CONF_NUMLINES];
-  char buf[TELNETD_CONF_LINELEN];
-  char bufptr;
-  uint8 numsent;
-  uint8 state;
-};
-
-#endif /* __TELNETD_H__ */

netutils/webserver/httpd.c

@@ -1,5 +1,5 @@
 /****************************************************************************
- * httpd
+ * netutils/webserver/httpd.c
  * httpd Web server
  *
  *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
@@ -510,7 +510,7 @@ int httpd_listen(void)
 {
   /* Execute httpd_handler on each connection to port 80 */
 
-  uip_server(HTONS(80), httpd_handler, CONFIG_EXAMPLES_UIP_HTTPDSTACKSIZE);
+  uip_server(HTONS(80), httpd_handler, CONFIG_NETUTILS_HTTPDSTACKSIZE);
 
   /* uip_server only returns on errors */
 

netutils/webserver/httpd.h

@@ -70,8 +70,8 @@
  * for the thread.  Use a default if the user provided no stacksize.
  */
 
-#ifndef CONFIG_EXAMPLES_UIP_HTTPDSTACKSIZE
+#ifndef CONFIG_NETUTILS_HTTPDSTACKSIZE
-# define CONFIG_EXAMPLES_UIP_HTTPDSTACKSIZE 4096
+# define CONFIG_NETUTILS_HTTPDSTACKSIZE 4096
 #endif
 
 /****************************************************************************