diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | include/sys/socket.h | 7 | ||||
| -rw-r--r-- | inet/netinet/in.h | 45 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/getipv4sourcefilter.c | 71 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/getsourcefilter.c | 72 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/setipv4sourcefilter.c | 64 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/setsourcefilter.c | 65 |
7 files changed, 332 insertions, 0 deletions
@@ -1,5 +1,13 @@ 2004-08-05 Ulrich Drepper <drepper@redhat.com> + * inet/netinet/in.h: Define struct ip_msfilter, IP_MSFILTER_SIZE, + struct group_filter, and GROUP_FILTER_SIZE. + * include/sys/socket.h: Declare __getsockopt. + * sysdeps/unix/sysv/linux/setipv4sourcefilter.c: New file. + * sysdeps/unix/sysv/linux/getipv4sourcefilter.c: New file. + * sysdeps/unix/sysv/linux/setsourcefilter.c: New file. + * sysdeps/unix/sysv/linux/getsourcefilter.c: New file. + * po/ko.po: Update from translation team. 2004-08-04 Jakub Jelinek <jakub@redhat.com> diff --git a/include/sys/socket.h b/include/sys/socket.h index 05798095f8..937909a125 100644 --- a/include/sys/socket.h +++ b/include/sys/socket.h @@ -97,6 +97,13 @@ extern int __setsockopt (int __fd, int __level, int __optname, __const void *__optval, socklen_t __optlen) attribute_hidden; +/* Put the current value for socket FD's option OPTNAME at protocol level LEVEL + into OPTVAL (which is *OPTLEN bytes long), and set *OPTLEN to the value's + actual length. Returns 0 on success, -1 for errors. */ +extern int __getsockopt (int __fd, int __level, int __optname, + void *__restrict __optval, + socklen_t *__restrict __optlen) attribute_hidden; + /* Put the local address of FD into *ADDR and its length in *LEN. */ extern int __getsockname (int __fd, __SOCKADDR_ARG __addr, socklen_t *__restrict __len) attribute_hidden; diff --git a/inet/netinet/in.h b/inet/netinet/in.h index bdf4e5dc2c..0922dc789b 100644 --- a/inet/netinet/in.h +++ b/inet/netinet/in.h @@ -296,6 +296,51 @@ struct group_source_req }; +/* Full-state filter operations. */ +struct ip_msfilter + { + /* IP multicast address of group. */ + struct in_addr imsf_multiaddr; + + /* Local IP address of interface. */ + struct in_addr imsf_interface; + + /* Filter mode. */ + uint32_t imsf_fmode; + + /* Number of source addresses. */ + uint32_t imsf_numsrc; + /* Source addresses. */ + struct in_addr imsf_slist[1]; + }; + +#define IP_MSFILTER_SIZE(numsrc) (sizeof (struct ip_msfilter) \ + - sizeof (struct in_addr) \ + + (numsrc) * sizeof (struct in_addr)) + +struct group_filter + { + /* Interface index. */ + uint32_t gf_interface; + + /* Group address. */ + struct sockaddr_storage gf_group; + + /* Filter mode. */ + uint32_t gf_fmode; + + /* Number of source addresses. */ + uint32_t gf_numsrc; + /* Source addresses. */ + struct sockaddr_storage gf_slist[1]; +}; + +#define GROUP_FILTER_SIZE(numsrc) (sizeof (struct group_filter) \ + - sizeof (struct sockaddr_storage) \ + + ((numsrc) \ + * sizeof (struct sockaddr_storage))) + + /* Get system-specific definitions. */ #include <bits/in.h> diff --git a/sysdeps/unix/sysv/linux/getipv4sourcefilter.c b/sysdeps/unix/sysv/linux/getipv4sourcefilter.c new file mode 100644 index 0000000000..7fad6a7c82 --- /dev/null +++ b/sysdeps/unix/sysv/linux/getipv4sourcefilter.c @@ -0,0 +1,71 @@ +/* Get IPv4 source filter. Linux version. + Copyright (C) 2004 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@redhat.com>, 2004. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include <alloca.h> +#include <errno.h> +#include <stdlib.h> +#include <string.h> +#include <netinet/in.h> +#include <sys/socket.h> + + +int +getipv4sourcefilter (int s, struct in_addr interface, struct in_addr group, + uint32_t *fmode, uint32_t *numsrc, struct in_addr *slist) +{ + /* We have to create an struct ip_msfilter object which we can pass + to the kernel. */ + socklen_t needed = IP_MSFILTER_SIZE (*numsrc); + int use_malloc = __libc_use_alloca (needed); + + struct ip_msfilter *imsf; + if (use_malloc) + { + imsf = (struct ip_msfilter *) malloc (needed); + if (imsf == NULL) + return -1; + } + else + imsf = (struct ip_msfilter *) alloca (needed); + + imsf->imsf_multiaddr = group; + imsf->imsf_interface = interface; + + int result = __getsockopt (s, SOL_IP, IP_MSFILTER, imsf, &needed); + + /* If successful, copy the results to the places the caller wants + them in. */ + if (result == 0) + { + *fmode = imsf->imsf_fmode; + *numsrc = imsf->imsf_numsrc; + memcpy (slist, imsf->imsf_slist, + imsf->imsf_numsrc * sizeof (struct in_addr)); + } + + if (use_malloc) + { + int save_errno = errno; + free (imsf); + __set_errno (save_errno); + } + + return result; +} diff --git a/sysdeps/unix/sysv/linux/getsourcefilter.c b/sysdeps/unix/sysv/linux/getsourcefilter.c new file mode 100644 index 0000000000..43936c896b --- /dev/null +++ b/sysdeps/unix/sysv/linux/getsourcefilter.c @@ -0,0 +1,72 @@ +/* Get source filter. Linux version. + Copyright (C) 2004 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@redhat.com>, 2004. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include <alloca.h> +#include <errno.h> +#include <stdlib.h> +#include <string.h> +#include <netinet/in.h> +#include <sys/socket.h> + + +int +getsourcefilter (int s, uint32_t interface, struct sockaddr *group, + socklen_t grouplen, uint32_t *fmode, uint32_t *numsrc, + struct sockaddr_storage *slist) +{ + /* We have to create an struct ip_msfilter object which we can pass + to the kernel. */ + socklen_t needed = GROUP_FILTER_SIZE (*numsrc); + int use_malloc = __libc_use_alloca (needed); + + struct group_filter *gf; + if (use_malloc) + { + gf = (struct group_filter *) malloc (needed); + if (gf == NULL) + return -1; + } + else + gf = (struct group_filter *) alloca (needed); + + gf->gf_interface = interface; + memcpy (&gf->gf_group, group, grouplen); + + int result = __getsockopt (s, SOL_IP, MCAST_MSFILTER, gf, &needed); + + /* If successful, copy the results to the places the caller wants + them in. */ + if (result == 0) + { + *fmode = gf->gf_fmode; + *numsrc = gf->gf_numsrc; + memcpy (slist, gf->gf_slist, + gf->gf_numsrc * sizeof (struct sockaddr_storage)); + } + + if (use_malloc) + { + int save_errno = errno; + free (gf); + __set_errno (save_errno); + } + + return result; +} diff --git a/sysdeps/unix/sysv/linux/setipv4sourcefilter.c b/sysdeps/unix/sysv/linux/setipv4sourcefilter.c new file mode 100644 index 0000000000..aef7f8b205 --- /dev/null +++ b/sysdeps/unix/sysv/linux/setipv4sourcefilter.c @@ -0,0 +1,64 @@ +/* Set IPv4 source filter. Linux version. + Copyright (C) 2004 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@redhat.com>, 2004. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include <alloca.h> +#include <errno.h> +#include <stdlib.h> +#include <string.h> +#include <netinet/in.h> +#include <sys/socket.h> + + +int +setipv4sourcefilter (int s, struct in_addr interface, struct in_addr group, + uint32_t fmode, uint32_t numsrc, struct in_addr *slist) +{ + /* We have to create an struct ip_msfilter object which we can pass + to the kernel. */ + size_t needed = IP_MSFILTER_SIZE (numsrc); + int use_malloc = __libc_use_alloca (needed); + + struct ip_msfilter *imsf; + if (use_malloc) + { + imsf = (struct ip_msfilter *) malloc (needed); + if (imsf == NULL) + return -1; + } + else + imsf = (struct ip_msfilter *) alloca (needed); + + imsf->imsf_multiaddr = group; + imsf->imsf_interface = interface; + imsf->imsf_fmode = fmode; + imsf->imsf_numsrc = numsrc; + memcpy (imsf->imsf_slist, slist, numsrc * sizeof (struct in_addr)); + + int result = __setsockopt (s, SOL_IP, IP_MSFILTER, imsf, needed); + + if (use_malloc) + { + int save_errno = errno; + free (imsf); + __set_errno (save_errno); + } + + return result; +} diff --git a/sysdeps/unix/sysv/linux/setsourcefilter.c b/sysdeps/unix/sysv/linux/setsourcefilter.c new file mode 100644 index 0000000000..f9f75c43cd --- /dev/null +++ b/sysdeps/unix/sysv/linux/setsourcefilter.c @@ -0,0 +1,65 @@ +/* Set source filter. Linux version. + Copyright (C) 2004 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@redhat.com>, 2004. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include <alloca.h> +#include <errno.h> +#include <stdlib.h> +#include <string.h> +#include <netinet/in.h> +#include <sys/socket.h> + + +int +setsourcefilter (int s, uint32_t interface, struct sockaddr *group, + socklen_t grouplen, uint32_t fmode, uint32_t numsrc, + struct sockaddr_storage *slist) +{ + /* We have to create an struct ip_msfilter object which we can pass + to the kernel. */ + size_t needed = GROUP_FILTER_SIZE (numsrc); + int use_malloc = __libc_use_alloca (needed); + + struct group_filter *gf; + if (use_malloc) + { + gf = (struct group_filter *) malloc (needed); + if (gf == NULL) + return -1; + } + else + gf = (struct group_filter *) alloca (needed); + + gf->gf_interface = interface; + memcpy (&gf->gf_group, group, grouplen); + gf->gf_fmode = fmode; + gf->gf_numsrc = numsrc; + memcpy (gf->gf_slist, slist, numsrc * sizeof (struct sockaddr_storage)); + + int result = __setsockopt (s, SOL_IP, MCAST_MSFILTER, gf, needed); + + if (use_malloc) + { + int save_errno = errno; + free (gf); + __set_errno (save_errno); + } + + return result; +} |