diff --git a/ChangeLog b/ChangeLog
index 2245ad3a082..18ea1f3bba7 100644
--- a/ChangeLog
+++ b/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/Documentation/NuttX.html b/Documentation/NuttX.html
index ff04cad7f7a..f5ef8fd232c 100644
--- a/Documentation/NuttX.html
+++ b/Documentation/NuttX.html
@@ -8,7 +8,7 @@
NuttX RTOS
-
Last Updated: March 14, 2009
+
Last Updated: March 17, 2009
@@ -1349,6 +1349,7 @@ nuttx-0.4.4 2009-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr>
* 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 <spudmonkey@racsa.co.cr>
diff --git a/examples/README.txt b/examples/README.txt
index 5aef5abf128..3c4258f1c5b 100644
--- a/examples/README.txt
+++ b/examples/README.txt
@@ -10,6 +10,17 @@ examples
Selects the examples/ostest example.
+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
^^^^^^^^^^^^^^
diff --git a/netutils/Makefile b/netutils/Makefile
index 97cff97fe9c..15344a454b2 100644
--- a/netutils/Makefile
+++ b/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
#
# 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/netutils/README b/netutils/README
index 720aabff783..6a7de07752d 100644
--- a/netutils/README
+++ b/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/netutils/dhcpd/Makefile.host b/netutils/dhcpd/Makefile.host
deleted file mode 100644
index fa643397908..00000000000
--- a/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
-#
-# 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/netutils/dhcpd/host.c b/netutils/dhcpd/host.c
deleted file mode 100644
index d20ad1c5f87..00000000000
--- a/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
- *
- * 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;
-}