Add netstat CGI example

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

6 files changed, 223 insertions, 11 deletions

diff --git a/nuttx/examples/thttpd/content/Makefile b/nuttx/examples/thttpd/content/Makefile
index 36974ad5a..9ff8d87b5 100644
--- a/nuttx/examples/thttpd/content/Makefile
+++ b/nuttx/examples/thttpd/content/Makefile
@@ -33,7 +33,7 @@
 #
 ############################################################################
 
-SUBDIRS		= hello tasks
+SUBDIRS		= hello tasks netstat
 INSTALL_FILES	= index.html style.css
 
 THTTPD_DIR	= $(TOPDIR)/examples/thttpd
diff --git a/nuttx/examples/thttpd/content/hello/hello.c b/nuttx/examples/thttpd/content/hello/hello.c
index e13817993..66fafc0da 100644
--- a/nuttx/examples/thttpd/content/hello/hello.c
+++ b/nuttx/examples/thttpd/content/hello/hello.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/thttpd/content/hello.c
+ * examples/thttpd/content/hello/hello.c
  * Manatory "Hello, World!" Example
  *
  *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
diff --git a/nuttx/examples/thttpd/content/netstat/Makefile b/nuttx/examples/thttpd/content/netstat/Makefile
new file mode 100644
index 000000000..b12cbabc8
--- /dev/null
+++ b/nuttx/examples/thttpd/content/netstat/Makefile
@@ -0,0 +1,78 @@
+############################################################################
+# examples/thttpd/content/netstat/Makefile
+#
+#   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#
+# 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	# Current configuration
+-include $(TOPDIR)/Make.defs	# Basic make info
+
+BIN			= netstat
+
+R1SRCS			= $(BIN).c
+R1OBJS			= $(R1SRCS:.c=.o)
+
+R2SRC			= $(BIN)-thunk.S
+R2OBJ			= $(R2SRC:.S=.o)
+
+all: $(BIN)
+
+$(R1OBJS): %.o: %.c
+	@echo "CC: $<"
+	@$(CC) -c $(CPICFLAGS) $< -o $@
+
+$(R2OBJ): %.o: %.S
+	@echo "AS: $<"
+	@$(CC) -c $(CPICFLAGS) $< -o $@
+
+$(BIN).r1: $(R1OBJS)
+	@echo "LD: $<"
+	@$(LD) $(NXFLATLDFLAGS1) -o $@ $^
+
+$(R2SRC): $(BIN).r1
+	@echo "MK: $<"
+	@$(MKNXFLAT) -o $@ $^
+
+$(BIN).r2: $(R2OBJ)
+	@echo "LD: $<"
+	@$(LD) $(NXFLATLDFLAGS2) -o $@ $(R1OBJS) $(R2OBJ)
+
+$(BIN): $(BIN).r2
+	@echo "LD: $<"
+	@$(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
+
+clean: 
+	@rm -f $(BIN) $(R2SRC) *.o *.r1 *.r2 *~ .*.swp core
+
+install:
+	@install -m 0755 -D $(BIN) $(CGI_DIR)/$(BIN)
+
diff --git a/nuttx/examples/thttpd/content/netstat/netstat.c b/nuttx/examples/thttpd/content/netstat/netstat.c
new file mode 100755
index 000000000..2446cb06b
--- /dev/null
+++ b/nuttx/examples/thttpd/content/netstat/netstat.c
@@ -0,0 +1,132 @@
+/****************************************************************************
+ * examples/thttpd/netstat/netstat.c
+ *
+ *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <sys/types.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <netinet/ether.h>
+#include <net/uip/uip-arch.h>
+
+/****************************************************************************
+ * Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Types
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Function Prototypes
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Functions
+ ****************************************************************************/
+
+/* NOTEs:
+ *
+ * 1. One limitation in the use of NXFLAT is that functions that are
+ *    referenced as a pointer-to-a-function must have global scope.  Otherwise
+ *    ARM GCC will generate some bad logic.
+ * 2. In general, when called back, there is no guarantee to that PIC registers
+ *    will be valid and, unless you take special precautions, it could be
+ *    dangerous to reference global variables in the callback function.
+ */
+
+/* static */ int netdev_callback(FAR struct uip_driver_s *dev, void *arg)
+{
+  struct in_addr addr;
+
+  printf("  <dt>%s\r\n", dev->d_ifname);
+  printf("    <dd>HWaddr %s<br>\r\n", ether_ntoa(&dev->d_mac));
+  addr.s_addr = dev->d_ipaddr;
+  printf("    IPaddr: %s<br>\r\n", inet_ntoa(addr));
+  addr.s_addr = dev->d_draddr;
+  printf("    DRaddr: %s<br>\r\n", inet_ntoa(addr));
+  addr.s_addr = dev->d_netmask;
+  printf("    Mask: %s\r\n", inet_ntoa(addr));
+  return OK;
+}
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(int argc, char *argv[])
+{
+  puts(
+	"Content-type: text/html\r\n"
+	"Status: 200/html\r\n"
+	"\r\n"
+    "<html>\r\n"
+      "<head>\r\n"
+        "<title>Network Status</title>\r\n"
+        "<link rel=\"stylesheet\" type=\"text/css\" href=\"/style.css\">\r\n"
+      "</head>\r\n"
+      "<body bgcolor=\"#fffeec\" text=\"black\">\r\n"
+        "<div class=\"menu\">\r\n"
+        "<div class=\"menubox\"><a href=\"/index.html\">Front page</a></div>\r\n"
+        "<div class=\"menubox\"><a href=\"hello\">Say Hello</a></div>\r\n"
+        "<div class=\"menubox\"><a href=\"tasks\">Tasks</a></div>\r\n"
+        "<div class=\"menubox\"><a href=\"netstat\">Network status</a></div>\r\n"
+        "<br>\r\n"
+        "</div>\r\n"
+        "<div class=\"contentblock\">\r\n"
+        "<dl>\r\n");
+
+  netdev_foreach(netdev_callback, NULL);
+
+  puts(
+        "</dl>\r\n"
+      "</body>\r\n"
+   "</html>\r\n");
+  return 0;
+}
diff --git a/nuttx/examples/thttpd/content/tasks/tasks.c b/nuttx/examples/thttpd/content/tasks/tasks.c
index 912c8df0a..fdabb9654 100755
--- a/nuttx/examples/thttpd/content/tasks/tasks.c
+++ b/nuttx/examples/thttpd/content/tasks/tasks.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * examples/thttpd/tasks.c
+ * examples/thttpd/tasks/tasks.c
  *
  *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@@ -86,13 +86,14 @@ static const char *g_statenames[] =
  * Private Functions
  ****************************************************************************/
 
-/****************************************************************************
- * Name: show_task
- ****************************************************************************/
-
-/* NOTE:  One limitation in the use of NXFLAT is that functions that are
- * referenced as a pointer-to-a-function must have global scope.  Otherwise
- * ARM GCC will generate some bad logic.
+/* NOTEs:
+ *
+ * 1. One limitation in the use of NXFLAT is that functions that are
+ *    referenced as a pointer-to-a-function must have global scope.  Otherwise
+ *    ARM GCC will generate some bad logic.
+ * 2. In general, when called back, there is no guarantee to that PIC registers
+ *    will be valid and, unless you take special precautions, it could be
+ *    dangerous to reference global variables in the callback function.
  */
 
 /* static */ void show_task(FAR _TCB *tcb, FAR void *arg)
@@ -143,7 +144,7 @@ int main(int argc, char *argv[])
 	"\r\n"
     "<html>\r\n"
       "<head>\r\n"
-        "<title>Hello!</title>\r\n"
+        "<title>NuttX Tasks</title>\r\n"
         "<link rel=\"stylesheet\" type=\"text/css\" href=\"/style.css\">\r\n"
       "</head>\r\n"
       "<body bgcolor=\"#fffeec\" text=\"black\">\r\n"
diff --git a/nuttx/examples/thttpd/main.c b/nuttx/examples/thttpd/main.c
index b0f36b373..22fbe1d50 100644
--- a/nuttx/examples/thttpd/main.c
+++ b/nuttx/examples/thttpd/main.c
@@ -52,6 +52,7 @@
 #include <net/uip/thttpd.h>
 #include <net/uip/uip-arp.h>
 #include <net/uip/uip-lib.h>
+#include <netinet/ether.h>
 
 #include <nuttx/ramdisk.h>
 #include <nuttx/binfmt.h>