From e58cb9f47ccff39c084944ea3e5c1154325b6ef1 Mon Sep 17 00:00:00 2001 From: patacongo Date: Sun, 11 Jul 2010 18:10:22 +0000 Subject: Add IGMP user interface git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2786 42af7a65-404d-4744-a932-0658087f49c3 --- nuttx/include/net/ioctls.h | 5 +- nuttx/include/net/uip/igmp.h | 86 -------------------------- nuttx/include/net/uip/ipmsfilter.h | 101 +++++++++++++++++++++++++++++++ nuttx/include/net/uip/uip-igmp.h | 6 +- nuttx/include/netinet/in.h | 7 ++- nuttx/include/nuttx/net.h | 5 +- nuttx/include/sys/sockio.h | 120 +++++++++++++++++++++++++++++++++++++ 7 files changed, 237 insertions(+), 93 deletions(-) delete mode 100755 nuttx/include/net/uip/igmp.h create mode 100755 nuttx/include/net/uip/ipmsfilter.h create mode 100755 nuttx/include/sys/sockio.h (limited to 'nuttx/include') diff --git a/nuttx/include/net/ioctls.h b/nuttx/include/net/ioctls.h index 2395c1787..7bb6c18b3 100644 --- a/nuttx/include/net/ioctls.h +++ b/nuttx/include/net/ioctls.h @@ -1,7 +1,7 @@ /**************************************************************************** * include/net/ioctls.h * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2008, 2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -68,6 +68,9 @@ #define SIOCDIFADDR _SIOC(0x000c) /* Delete IP address */ #define SIOCGIFCOUNT _SIOC(0x000d) /* Get number of devices */ +#define SIOCGIPMSFILTER _SIOC(0x000e) /* Retrieve source filter addresses */ +#define SIOCSIPMSFILTER _SIOC(0x000f) /* Set source filter content */ + /**************************************************************************** * Type Definitions ****************************************************************************/ diff --git a/nuttx/include/net/uip/igmp.h b/nuttx/include/net/uip/igmp.h deleted file mode 100755 index 8b28b2fed..000000000 --- a/nuttx/include/net/uip/igmp.h +++ /dev/null @@ -1,86 +0,0 @@ -/**************************************************************************** - * net/uip/igmp.h - * User interface to IGMP - * - * Copyright (C) 2010 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt - * - * The NuttX implementation of IGMP was inspired by the IGMP add-on for the - * lwIP TCP/IP stack by Steve Reynolds: - * - * Copyright (c) 2002 CITEL Technologies Ltd. - * 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 CITEL Technologies Ltd 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 CITEL TECHNOLOGIES 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 CITEL TECHNOLOGIES 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_IGMP_H -#define __NET_UIP_IGMP_H - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include -#include - -#ifdef CONFIG_NET_IGMP - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -#ifdef CONFIG_NET_IPv6 -# error "IGMP for IPv6 not supported" -#endif - -/**************************************************************************** - * Public Data - ****************************************************************************/ - -#undef EXTERN -#if defined(__cplusplus) -#define EXTERN extern "C" -extern "C" { -#else -#define EXTERN extern -#endif - -/**************************************************************************** - * Public Function Prototypes - ****************************************************************************/ - -EXTERN void igmp_joingroup(const FAR struct in_addr *grpaddr); -EXTERN void igmp_leavegroup(const FAR struct in_addr *grpaddr); - -#undef EXTERN -#if defined(__cplusplus) -} -#endif - -#endif /* CONFIG_NET_IGMP */ -#endif /* __NET_UIP_IGMP_H */ diff --git a/nuttx/include/net/uip/ipmsfilter.h b/nuttx/include/net/uip/ipmsfilter.h new file mode 100755 index 000000000..df792d50b --- /dev/null +++ b/nuttx/include/net/uip/ipmsfilter.h @@ -0,0 +1,101 @@ +/**************************************************************************** + * net/uip/ipmsfilter.h + * User interface to add/remove IP multicast address + * + * Copyright (C) 2009 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. + * + ****************************************************************************/ + +#ifndef __NET_UIP_IPMSFILTER_H +#define __NET_UIP_IPMSFILTER_H + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include +#include + +#ifdef CONFIG_NET_IGMP + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +#ifdef CONFIG_NET_IPv6 +# error "IGMP for IPv6 not supported" +#endif + +/**************************************************************************** + * Public Data + ****************************************************************************/ + +#undef EXTERN +#if defined(__cplusplus) +#define EXTERN extern "C" +extern "C" { +#else +#define EXTERN extern +#endif + +/**************************************************************************** + * Public Function Prototypes + ****************************************************************************/ + +/**************************************************************************** + * Name: ipmsfilter + * + * Description: + * Add or remove an IP address from a multicast filter set. + * (See netutils/uiplib/uip_ipmsfilter.c) + * + * Parameters: + * ifname The name of the interface to use, size must less than IMSFNAMSIZ + * multiaddr Multicast group address to add/remove + * fmode MCAST_INCLUDE: Add multicast address + * MCAST_EXCLUDE: Remove multicast address + * + * Return: + * 0 on sucess; Negated errno on failure + * + ****************************************************************************/ + +EXTERN int ipmsfilter(FAR const char *ifname, + FAR const struct in_addr *multiaddr, + uint32_t fmode); + +#undef EXTERN +#if defined(__cplusplus) +} +#endif + +#endif /* CONFIG_NET_IGMP */ +#endif /* __NET_UIP_IPMSFILTER_H */ diff --git a/nuttx/include/net/uip/uip-igmp.h b/nuttx/include/net/uip/uip-igmp.h index 00c017372..e57d8b438 100755 --- a/nuttx/include/net/uip/uip-igmp.h +++ b/nuttx/include/net/uip/uip-igmp.h @@ -225,8 +225,8 @@ extern "C" { #define EXTERN extern #endif -extern uip_ipaddr_t g_allsystems; -extern uip_ipaddr_t g_allrouters; +EXTERN uip_ipaddr_t g_allsystems; +EXTERN uip_ipaddr_t g_allrouters; /**************************************************************************** * Public Function Prototypes @@ -242,6 +242,8 @@ extern uip_ipaddr_t g_allrouters; ****************************************************************************/ EXTERN void uip_igmpdevinit(struct uip_driver_s *dev); +EXTERN int igmp_joingroup(struct uip_driver_s *dev, FAR const struct in_addr *grpaddr); +EXTERN int igmp_leavegroup(struct uip_driver_s *dev, FAR const struct in_addr *grpaddr); #undef EXTERN #if defined(__cplusplus) diff --git a/nuttx/include/netinet/in.h b/nuttx/include/netinet/in.h index 9c38b229b..2b92bba7f 100644 --- a/nuttx/include/netinet/in.h +++ b/nuttx/include/netinet/in.h @@ -1,7 +1,7 @@ /**************************************************************************** * netinet/in.h * - * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2009-2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -54,6 +54,11 @@ #define IPPROTO_TCP 1 #define IPPROTO_UDP 2 +/* Values used with SIOCSIFMCFILTER and SIOCGIFMCFILTER ioctl's */ + +#define MCAST_EXCLUDE 0 +#define MCAST_INCLUDE 1 + /* Special values of in_addr_t */ #define INADDR_ANY ((in_addr_t)0x00000000) /* Address to accept any incoming messages */ diff --git a/nuttx/include/nuttx/net.h b/nuttx/include/nuttx/net.h index 7258b9984..d9b4e42b3 100644 --- a/nuttx/include/nuttx/net.h +++ b/nuttx/include/nuttx/net.h @@ -1,7 +1,7 @@ /**************************************************************************** * nuttx/net.h * - * Copyright (C) 2007, 2009 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2009-2010 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -153,8 +153,7 @@ EXTERN int net_close(int sockfd); * to this function. */ -struct ifreq; /* Forward reference -- see net/ioctls.h */ -EXTERN int netdev_ioctl(int sockfd, int cmd, struct ifreq *req); +EXTERN int netdev_ioctl(int sockfd, int cmd, unsigned long arg); /* net_poll.c ****************************************************************/ /* The standard poll() operation redirects operations on socket descriptors diff --git a/nuttx/include/sys/sockio.h b/nuttx/include/sys/sockio.h new file mode 100755 index 000000000..a63833756 --- /dev/null +++ b/nuttx/include/sys/sockio.h @@ -0,0 +1,120 @@ +/**************************************************************************** + * include/sys/sockio.h + * + * Copyright (C) 2010 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. + * + ****************************************************************************/ + +#ifndef __SYS_SOCKIO_H +#define __SYS_SOCKIO_H + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +/* Get NuttX configuration and NuttX-specific network IOCTL definitions */ + +#include +#include +#include + +/**************************************************************************** + * Pre-Processor Definitions + ****************************************************************************/ + +#define IMSFNAMSIZ 8 + +/**************************************************************************** + * Type Definitions + ****************************************************************************/ + + /* RFC3678: IPv4 Options + * + * o ioctl() SIOCGIPMSFILTER: to retrieve the list of source addresses + * that comprise the source filter along with the current filter mode. + * + * o ioctl() SIOCSIPMSFILTER: to set or modify the source filter content + * (e.g., unicast source address list) or mode (exclude or include). + * + * Ioctl option Argument type + * ----------------------------- ---------------------- + * SIOCGIPMSFILTER struct ip_msfilter + * SIOCSIPMSFILTER struct ip_msfilter + * + * The imsf_fmode mode is a 32-bit integer that identifies the filter + * mode. The value of this field must be either MCAST_INCLUDE or + * MCAST_EXCLUDE, which are likewise defined in . + */ + +#if 0 /* REVISIT: Current NuttX implementation is non-standard. + * Lookup is by device name, not IP address. + */ + +struct ip_msfilter +{ + struct in_addr imsf_multiaddr; /* IP multicast address of group */ + struct in_addr imsf_interface; /* Local IP address of interface */ + uint32_t imsf_fmode; /* Filter mode */ +#ifdef CONFIG_NET_IGMPv3 + uint32_t imsf_numsrc; /* number of sources in src_list */ + struct in_addr imsf_slist[1]; /* start of source list */ +#endif +}; + +#else + +struct ip_msfilter +{ + char imsf_name[IMSFNAMSIZ]; /* Network device name, e.g., "eth0" */ + struct in_addr imsf_multiaddr; /* IP multicast address of group */ + uint32_t imsf_fmode; /* Filter mode */ +}; + +#endif + +/**************************************************************************** + * Public Function Prototypes + ****************************************************************************/ + +#undef EXTERN +#if defined(__cplusplus) +#define EXTERN extern "C" +extern "C" { +#else +#define EXTERN extern +#endif + +#undef EXTERN +#if defined(__cplusplus) +} +#endif + +#endif /* __SYS_SOCKIO_H */ -- cgit v1.2.3