Add examples/dhcpd

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

7 files changed, 15 insertions, 128 deletions

diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 2245ad3a0..18ea1f3bb 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -658,3 +658,4 @@
 	* examples/nsh:  A debug option was left on that can (and does) cause
 	  infinite loops and stack overflows.
 	* net/uip: Correct calculation of checksum on ICMP ping response.
+	* examples/dchpd: Added a tiny DHCP server example
diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html
index ff04cad7f..f5ef8fd23 100644
--- a/nuttx/Documentation/NuttX.html
+++ b/nuttx/Documentation/NuttX.html
@@ -8,7 +8,7 @@
   <tr align="center" bgcolor="#e4e4e4">
     <td>
       <h1><big><font color="#3c34ec"><i>NuttX RTOS</i></font></big></h1>
-      <p>Last Updated: March 14, 2009</p>
+      <p>Last Updated: March 17, 2009</p>
     </td>
   </tr>
 </table>
@@ -1349,6 +1349,7 @@ nuttx-0.4.4 2009-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
 	* examples/nsh:  A debug option was left on that can (and does) cause
 	  infinite loops and stack overflows.
 	* net/uip: Correct calculation of checksum on ICMP ping response.
+	* examples/dchpd: Added a tiny DHCP server example
 
 pascal-0.1.3 2009-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
 
diff --git a/nuttx/examples/README.txt b/nuttx/examples/README.txt
index 5aef5abf1..3c4258f1c 100644
--- a/nuttx/examples/README.txt
+++ b/nuttx/examples/README.txt
@@ -13,6 +13,17 @@ examples
 examples/hello
 ^^^^^^^^^^^^^^
 
+  This examples builds a tiny DCHP server for the target system.
+  
+  NOTE: For test purposes, this example can be built as a
+  host-based DHCPD server.  This can be built as follows:
+
+    cd examples/dhcpd
+    make -f Makefile.host
+
+examples/hello
+^^^^^^^^^^^^^^
+
   This is the mandatory, "Hello, World!!" example.  It is little more
   than examples/null with a single printf statement.  Again useful only
   for bringing up new NuttX architectures.
diff --git a/nuttx/netutils/Makefile b/nuttx/netutils/Makefile
index 97cff97fe..15344a454 100644
--- a/nuttx/netutils/Makefile
+++ b/nuttx/netutils/Makefile
@@ -1,7 +1,7 @@
 ############################################################################
 # netutils/Makefile
 #
-#   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2007-2009 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -102,7 +102,6 @@ clean:
 	@( for dir in $(SUBDIRS); do \
 		rm -f $${dir}/*~ $${dir}/.*.swp; \
 	done ; )
-	@$(MAKE) -C dhcpd -f Makefile.host clean
 
 distclean: clean
 	@rm -f Make.dep .depend
diff --git a/nuttx/netutils/README b/nuttx/netutils/README
index 720aabff7..6a7de0775 100644
--- a/nuttx/netutils/README
+++ b/nuttx/netutils/README
@@ -18,10 +18,3 @@ highly influenced by uIP) include:
 
   dhcpd - Dynamic Host Configuration Protocol (DHCP) server
 
-NOTE: For test purposes, the dhcpd library can be built as a
-host-based DHCPD server.  This can be built as follows:
-
-  cd netutils/dhcpd
-  make -f Makefile.host
-
-
diff --git a/nuttx/netutils/dhcpd/Makefile.host b/nuttx/netutils/dhcpd/Makefile.host
deleted file mode 100644
index fa6433979..000000000
--- a/nuttx/netutils/dhcpd/Makefile.host
+++ /dev/null
@@ -1,60 +0,0 @@
-############################################################################
-# netutils/dhcpd/Makefile.host
-#
-#   Copyright (C) 2007 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.
-#
-############################################################################
-
-WD		= ${shell pwd}
-TOPDIR		= $(WD)/../..
-include $(TOPDIR)/Make.defs
-
-OBJS		= host.o1 dhcpd.o1
-BIN		= dhcpd
-
-HOSTCFLAGS	+= -DCONFIG_NETUTILS_DHCPD_HOST=1
-HOSTCFLAGS	+= -DCONFIG_NETUTILS_DHCPD_INTERFACE=\"eth1\"
-HOSTCFLAGS	+= -DHAVE_SO_REUSEADDR=1
-HOSTCFLAGS	+= -DHAVE_SO_BROADCAST=1
-
-all: $(BIN)
-.PHONY: clean context clean_context distclean
-
-$(OBJS): %$.o1: %$.c
-	$(HOSTCC) -c $(HOSTCFLAGS) $< -o $@
-
-$(BIN): $(OBJS)
-	$(HOSTCC) $(HOSTLDFLAGS) $^ -o $@
-
-clean:
-	@rm -f $(BIN) *.o1 *~
-
-
diff --git a/nuttx/netutils/dhcpd/host.c b/nuttx/netutils/dhcpd/host.c
deleted file mode 100644
index d20ad1c5f..000000000
--- a/nuttx/netutils/dhcpd/host.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/****************************************************************************
- * netutils/dhcpd/host.c
- *
- *   Copyright (C) 2007 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 Gregory Nutt 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
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-extern int dhcpd_run(void);
-
-/****************************************************************************
- * main
- ****************************************************************************/
-
-int main(int argc, char **argv, char **envp)
-{
-  dhcpd_run();
-  return 0;
-}