Add beginning of IGMP test

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

7 files changed, 289 insertions, 3 deletions

diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index f028a7425..e617abe04 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -1173,4 +1173,6 @@
 	  by application software.
 	* include/net/uip/igmp.h and uip-igmp.h - Add header files ini
 	  preparation for NuttX IGMP support
-	* net/uip/uip_igmpinit.c, uip_igmpgroup.c - Add IGMP logic.
+	* net/uip/uip_igmp*.c - Add IGMP support (untested on initial
+	  checkin).
+	* examples/igmp - Add a trivial test for IGMP (much more is needed)
diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html
index 6ca1dbb54..700137d1b 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: July 7, 2010</p>
+      <p>Last Updated: July 11, 2010</p>
     </td>
   </tr>
 </table>
@@ -1848,7 +1848,9 @@ nuttx-5.8 2010-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
 	  by application software.
 	* include/net/uip/igmp.h and uip-igmp.h - Add header files ini
 	  preparation for NuttX IGMP support
-	* net/uip/uip_igmpinit.c, uip_igmpgroup.c - Add IGMP logic.
+	* net/uip/uip_igmp*.c - Add IGMP support (untested on initial
+	  checkin).
+	* examples/igmp - Add a trivial test for IGMP (much more is needed)
 
 pascal-2.1 2010-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
 
diff --git a/nuttx/TODO b/nuttx/TODO
index b329fe153..04d353375 100644
--- a/nuttx/TODO
+++ b/nuttx/TODO
@@ -258,6 +258,9 @@ o Network (net/, drivers/net)
 
   Description: Support for client-side IGMPv2 multicast has been added but not yet
                tested (because I don't have a proper environment for multicast testing).
+               There are most likely errors that need to be fixed at least in the
+               receipt of multicast packets.
+
                In addition, an ethernet driver that needs to work with the IGMP logic
                will have to include additional support for multicast MAC address tables.
   Status:      Open
diff --git a/nuttx/examples/README.txt b/nuttx/examples/README.txt
index d7da69b04..d2a7695dd 100644
--- a/nuttx/examples/README.txt
+++ b/nuttx/examples/README.txt
@@ -54,6 +54,13 @@ examples/helloxx
   library suupport is available, and that class are instantiated
   correctly.
 
+examples/igmp
+^^^^^^^^^^^^^
+
+  This is a trivial test of the NuttX IGMP capability.  It present it
+  does not do much of value -- Much more is needed in order to verify
+  the IGMP features!
+
 examples/mount
 ^^^^^^^^^^^^^^
 
diff --git a/nuttx/examples/igmp/Makefile b/nuttx/examples/igmp/Makefile
new file mode 100755
index 000000000..2f3d93ff4
--- /dev/null
+++ b/nuttx/examples/igmp/Makefile
@@ -0,0 +1,76 @@
+############################################################################
+# examples/igmp/Makefile
+#
+#   Copyright (C) 2010 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
+-include $(TOPDIR)/Make.defs
+
+ASRCS	= 
+AOBJS	= $(ASRCS:.S=$(OBJEXT))
+
+CSRCS	= igmp.c
+COBJS	= $(CSRCS:.c=$(OBJEXT))
+
+SRCS	= $(ASRCS) $(CSRCS)
+OBJS	= $(AOBJS) $(COBJS)
+
+BIN	= lib$(CONFIG_EXAMPLE)$(LIBEXT)
+
+all:	$(BIN)
+
+$(AOBJS): %$(OBJEXT): %.S
+	$(call ASSEMBLE, $<, $@)
+
+$(COBJS): %$(OBJEXT): %.c
+	$(call COMPILE, $<, $@)
+
+$(BIN):	$(OBJS)
+	@( for obj in $(OBJS) ; do \
+		$(call ARCHIVE, $@, $${obj}); \
+	done ; )
+
+.depend: Makefile $(SRCS)
+	@$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
+	@touch $@
+
+depend: .depend
+
+clean:
+	@rm -f $(BIN) $(HOST_BIN) *~ .*.swp
+	$(call CLEAN)
+
+distclean: clean
+	@rm -f Make.dep .depend
+
+-include Make.dep
diff --git a/nuttx/examples/igmp/igmp.c b/nuttx/examples/igmp/igmp.c
new file mode 100755
index 000000000..281073940
--- /dev/null
+++ b/nuttx/examples/igmp/igmp.c
@@ -0,0 +1,135 @@
+/****************************************************************************
+ * examples/igmp/igmp.c
+ *
+ *   Copyright (C) 2010 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 <stdint.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <debug.h>
+
+#include <net/if.h>
+#include <net/uip/uip.h>
+#include <net/uip/uip-lib.h>
+#include <net/uip/ipmsfilter.h>
+
+#include "igmp.h"
+
+/****************************************************************************
+ * Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Private Data
+ ****************************************************************************/
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+/****************************************************************************
+ * user_initialize
+ ****************************************************************************/
+
+#ifndef CONFIG_HAVE_WEAKFUNCTIONS
+void user_initialize(void)
+{
+  /* Stub that must be provided only if the toolchain does
+   * not support weak functions.
+   */
+}
+#endif
+
+/****************************************************************************
+ * user_start
+ ****************************************************************************/
+
+int user_start(int argc, char *argv[])
+{
+  struct in_addr addr;
+#if defined(CONFIG_EXAMPLE_IGMP_NOMAC)
+  uint8_t mac[IFHWADDRLEN];
+#endif
+
+/* Many embedded network interfaces must have a software assigned MAC */
+
+#ifdef CONFIG_EXAMPLE_IGMP_NOMAC
+  mac[0] = 0x00;
+  mac[1] = 0xe0;
+  mac[2] = 0xb0;
+  mac[3] = 0x0b;
+  mac[4] = 0xba;
+  mac[5] = 0xbe;
+  uip_setmacaddr("eth0", mac);
+#endif
+
+  /* Set up our host address */
+
+  addr.s_addr = HTONL(CONFIG_EXAMPLE_IGMP_IPADDR);
+  uip_sethostaddr("eth0", &addr);
+
+  /* Set up the default router address */
+
+  addr.s_addr = HTONL(CONFIG_EXAMPLE_IGMP_DRIPADDR);
+  uip_setdraddr("eth0", &addr);
+
+  /* Setup the subnet mask */
+
+  addr.s_addr = HTONL(CONFIG_EXAMPLE_IGMP_NETMASK);
+  uip_setnetmask("eth0", &addr);
+
+  /* Not much of a test for now */
+  /* Join the group */
+
+  addr.s_addr = HTONL(CONFIG_EXAMPLE_IGMP_GRPADDR);
+  ipmsfilter("eth0", &addr, MCAST_INCLUDE);
+
+  /* Wait a while */
+
+  sleep(5);
+
+  /* Leave the group */
+
+  ipmsfilter("eth0", &addr, MCAST_EXCLUDE);
+
+  /* Wait a while */
+
+  sleep(5);
+  return 0;
+}
diff --git a/nuttx/examples/igmp/igmp.h b/nuttx/examples/igmp/igmp.h
new file mode 100755
index 000000000..e241467c6
--- /dev/null
+++ b/nuttx/examples/igmp/igmp.h
@@ -0,0 +1,61 @@
+/****************************************************************************
+ * examples/igmp/igmp.h
+ *
+ *   Copyright (C) 2010 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.
+ *
+ ****************************************************************************/
+
+#ifndef __EXAMPLES_IGMP_H
+#define __EXAMPLES_IGMP_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <debug.h>
+
+/****************************************************************************
+ * Definitions
+ ****************************************************************************/
+
+/* Used lib_rawprintf() so that there is no confusion from buffered IO */
+
+#ifdef CONFIG_CPP_HAVE_VARARGS
+#  define message(...) lib_rawprintf(__VA_ARGS__)
+#else
+#  define message lib_rawprintf
+#endif
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+#endif /* __EXAMPLES_IGMP_H */