From c470680e1ba008c05c13231dbbafd69cb9330488 Mon Sep 17 00:00:00 2001 From: Maarten Bosmans Date: Tue, 1 Mar 2011 16:06:19 +0100 Subject: Use pulsecore/arpa-inet.h to make arpa/inet.h functionality available Automatically use replacement function on platforms (win32) where not all arpa/inet.h is available natively. --- configure.ac | 2 +- src/Makefile.am | 3 +- src/modules/module-protocol-stub.c | 4 +- src/modules/raop/raop_client.c | 1 - src/modules/rtp/module-rtp-recv.c | 2 +- src/modules/rtp/module-rtp-send.c | 2 +- src/modules/rtp/rtp.c | 2 +- src/modules/rtp/rtsp_client.c | 2 +- src/modules/rtp/sap.c | 2 +- src/modules/rtp/sdp.c | 2 +- src/pulsecore/arpa-inet.c | 108 +++++++++++++++++++++++++++++++++++++ src/pulsecore/arpa-inet.h | 23 ++++++++ src/pulsecore/inet_ntop.c | 82 ---------------------------- src/pulsecore/inet_ntop.h | 12 ----- src/pulsecore/inet_pton.c | 63 ---------------------- src/pulsecore/inet_pton.h | 12 ----- src/pulsecore/ipacl.c | 8 +-- src/pulsecore/parseaddr.c | 6 +-- src/pulsecore/socket-client.c | 4 +- src/pulsecore/socket-server.c | 11 +--- src/pulsecore/socket-util.c | 8 +-- src/tests/ipacl-test.c | 5 +- 22 files changed, 146 insertions(+), 218 deletions(-) create mode 100644 src/pulsecore/arpa-inet.c create mode 100644 src/pulsecore/arpa-inet.h delete mode 100644 src/pulsecore/inet_ntop.c delete mode 100644 src/pulsecore/inet_ntop.h delete mode 100644 src/pulsecore/inet_pton.c delete mode 100644 src/pulsecore/inet_pton.h diff --git a/configure.ac b/configure.ac index 8b4f5866..7a36d5ba 100644 --- a/configure.ac +++ b/configure.ac @@ -469,7 +469,7 @@ AC_FUNC_FORK AC_FUNC_GETGROUPS AC_FUNC_SELECT_ARGTYPES AC_CHECK_FUNCS_ONCE([chmod chown fstat fchown fchmod clock_gettime getaddrinfo getgrgid_r getgrnam_r \ - getpwnam_r getpwuid_r gettimeofday getuid inet_ntop inet_pton mlock nanosleep \ + getpwnam_r getpwuid_r gettimeofday getuid mlock nanosleep \ pipe posix_fadvise posix_madvise posix_memalign setpgid setsid shm_open \ sigaction sleep symlink sysconf uname pthread_setaffinity_np]) AC_CHECK_FUNCS([mkfifo], [HAVE_MKFIFO=1], [HAVE_MKFIFO=0]) diff --git a/src/Makefile.am b/src/Makefile.am index 2d73b72c..f160c944 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -597,8 +597,7 @@ libpulsecommon_@PA_MAJORMINOR@_la_SOURCES = \ pulsecore/flist.c pulsecore/flist.h \ pulsecore/hashmap.c pulsecore/hashmap.h \ pulsecore/idxset.c pulsecore/idxset.h \ - pulsecore/inet_ntop.c pulsecore/inet_ntop.h \ - pulsecore/inet_pton.c pulsecore/inet_pton.h \ + pulsecore/arpa-inet.c pulsecore/arpa-inet.h \ pulsecore/iochannel.c pulsecore/iochannel.h \ pulsecore/ioline.c pulsecore/ioline.h \ pulsecore/ipacl.h pulsecore/ipacl.c \ diff --git a/src/modules/module-protocol-stub.c b/src/modules/module-protocol-stub.c index 7ba54054..52506f95 100644 --- a/src/modules/module-protocol-stub.c +++ b/src/modules/module-protocol-stub.c @@ -30,9 +30,6 @@ #include #include -#ifdef HAVE_ARPA_INET_H -#include -#endif #ifdef HAVE_NETINET_IN_H #include #endif @@ -49,6 +46,7 @@ #include #include #include +#include #ifdef USE_TCP_SOCKETS #define SOCKET_DESCRIPTION "(TCP sockets)" diff --git a/src/modules/raop/raop_client.c b/src/modules/raop/raop_client.c index e3152dd3..7dd96839 100644 --- a/src/modules/raop/raop_client.c +++ b/src/modules/raop/raop_client.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include diff --git a/src/modules/rtp/module-rtp-recv.c b/src/modules/rtp/module-rtp-recv.c index a920e66e..1144169b 100644 --- a/src/modules/rtp/module-rtp-recv.c +++ b/src/modules/rtp/module-rtp-recv.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -54,6 +53,7 @@ #include #include #include +#include #include "module-rtp-recv-symdef.h" diff --git a/src/modules/rtp/module-rtp-send.c b/src/modules/rtp/module-rtp-send.c index ab815223..f53020d1 100644 --- a/src/modules/rtp/module-rtp-send.c +++ b/src/modules/rtp/module-rtp-send.c @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -49,6 +48,7 @@ #include #include #include +#include #include "module-rtp-send-symdef.h" diff --git a/src/modules/rtp/rtp.c b/src/modules/rtp/rtp.c index 74f0ac38..22e491bf 100644 --- a/src/modules/rtp/rtp.c +++ b/src/modules/rtp/rtp.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include @@ -43,6 +42,7 @@ #include #include #include +#include #include "rtp.h" diff --git a/src/modules/rtp/rtsp_client.c b/src/modules/rtp/rtsp_client.c index 6094eb82..fd3b1de3 100644 --- a/src/modules/rtp/rtsp_client.c +++ b/src/modules/rtp/rtsp_client.c @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -46,6 +45,7 @@ #include #include #include +#include #include "rtsp_client.h" diff --git a/src/modules/rtp/sap.c b/src/modules/rtp/sap.c index adde16df..87c8b8f6 100644 --- a/src/modules/rtp/sap.c +++ b/src/modules/rtp/sap.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include #include @@ -48,6 +47,7 @@ #include #include #include +#include #include "sap.h" #include "sdp.h" diff --git a/src/modules/rtp/sdp.c b/src/modules/rtp/sdp.c index 7fc7e38c..3e61d9b8 100644 --- a/src/modules/rtp/sdp.c +++ b/src/modules/rtp/sdp.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include @@ -37,6 +36,7 @@ #include #include #include +#include #include "sdp.h" #include "rtp.h" diff --git a/src/pulsecore/arpa-inet.c b/src/pulsecore/arpa-inet.c new file mode 100644 index 00000000..3d6f316a --- /dev/null +++ b/src/pulsecore/arpa-inet.c @@ -0,0 +1,108 @@ +/*** + This file is part of PulseAudio. + + Copyright 2006 Pierre Ossman for Cendio AB + + PulseAudio 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. + + PulseAudio 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 PulseAudio; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + USA. +***/ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#if !defined(HAVE_ARPA_INET_H) && defined(OS_IS_WIN32) + +#include + +#include +#include +#include + +#include "arpa-inet.h" + +const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt) { + struct in_addr *in = (struct in_addr*)src; +#ifdef HAVE_IPV6 + struct in6_addr *in6 = (struct in6_addr*)src; +#endif + + pa_assert(src); + pa_assert(dst); + + switch (af) { + case AF_INET: + pa_snprintf(dst, cnt, "%d.%d.%d.%d", +#ifdef WORDS_BIGENDIAN + (int)(in->s_addr >> 24) & 0xff, + (int)(in->s_addr >> 16) & 0xff, + (int)(in->s_addr >> 8) & 0xff, + (int)(in->s_addr >> 0) & 0xff); +#else + (int)(in->s_addr >> 0) & 0xff, + (int)(in->s_addr >> 8) & 0xff, + (int)(in->s_addr >> 16) & 0xff, + (int)(in->s_addr >> 24) & 0xff); +#endif + break; +#ifdef HAVE_IPV6 + case AF_INET6: + pa_snprintf(dst, cnt, "%x:%x:%x:%x:%x:%x:%x:%x", + in6->s6_addr[ 0] << 8 | in6->s6_addr[ 1], + in6->s6_addr[ 2] << 8 | in6->s6_addr[ 3], + in6->s6_addr[ 4] << 8 | in6->s6_addr[ 5], + in6->s6_addr[ 6] << 8 | in6->s6_addr[ 7], + in6->s6_addr[ 8] << 8 | in6->s6_addr[ 9], + in6->s6_addr[10] << 8 | in6->s6_addr[11], + in6->s6_addr[12] << 8 | in6->s6_addr[13], + in6->s6_addr[14] << 8 | in6->s6_addr[15]); + break; +#endif + default: + errno = EAFNOSUPPORT; + return NULL; + } + + return dst; +} + +int inet_pton(int af, const char *src, void *dst) { + struct in_addr *in = (struct in_addr*)dst; +#ifdef HAVE_IPV6 + struct in6_addr *in6 = (struct in6_addr*)dst; +#endif + + pa_assert(src); + pa_assert(dst); + + switch (af) { + case AF_INET: + in->s_addr = inet_addr(src); + if (in->s_addr == INADDR_NONE) + return 0; + break; +#ifdef HAVE_IPV6 + case AF_INET6: + /* FIXME */ +#endif + default: + errno = EAFNOSUPPORT; + return -1; + } + + return 1; +} + +#endif diff --git a/src/pulsecore/arpa-inet.h b/src/pulsecore/arpa-inet.h new file mode 100644 index 00000000..303c905b --- /dev/null +++ b/src/pulsecore/arpa-inet.h @@ -0,0 +1,23 @@ +#ifndef fooarpa_inethfoo +#define fooarpa_inethfoo + + +#if defined(HAVE_ARPA_INET_H) + +#include + +#elif defined(OS_IS_WIN32) + +/* On Windows winsock2.h (here included via pulsecore/socket.h) provides most of the functionality of arpa/inet.h, except for + * the inet_ntop and inet_pton functions, which are implemented here. */ + +#include + +const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt); + +int inet_pton(int af, const char *src, void *dst); + +#endif + + +#endif diff --git a/src/pulsecore/inet_ntop.c b/src/pulsecore/inet_ntop.c deleted file mode 100644 index 059b25cc..00000000 --- a/src/pulsecore/inet_ntop.c +++ /dev/null @@ -1,82 +0,0 @@ -/*** - This file is part of PulseAudio. - - Copyright 2006 Pierre Ossman for Cendio AB - - PulseAudio 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. - - PulseAudio 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 PulseAudio; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - USA. -***/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include - -#ifndef HAVE_INET_NTOP - -#include -#include -#include - -#include "inet_ntop.h" - -const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt) { - struct in_addr *in = (struct in_addr*)src; -#ifdef HAVE_IPV6 - struct in6_addr *in6 = (struct in6_addr*)src; -#endif - - pa_assert(src); - pa_assert(dst); - - switch (af) { - case AF_INET: - pa_snprintf(dst, cnt, "%d.%d.%d.%d", -#ifdef WORDS_BIGENDIAN - (int)(in->s_addr >> 24) & 0xff, - (int)(in->s_addr >> 16) & 0xff, - (int)(in->s_addr >> 8) & 0xff, - (int)(in->s_addr >> 0) & 0xff); -#else - (int)(in->s_addr >> 0) & 0xff, - (int)(in->s_addr >> 8) & 0xff, - (int)(in->s_addr >> 16) & 0xff, - (int)(in->s_addr >> 24) & 0xff); -#endif - break; -#ifdef HAVE_IPV6 - case AF_INET6: - pa_snprintf(dst, cnt, "%x:%x:%x:%x:%x:%x:%x:%x", - in6->s6_addr[ 0] << 8 | in6->s6_addr[ 1], - in6->s6_addr[ 2] << 8 | in6->s6_addr[ 3], - in6->s6_addr[ 4] << 8 | in6->s6_addr[ 5], - in6->s6_addr[ 6] << 8 | in6->s6_addr[ 7], - in6->s6_addr[ 8] << 8 | in6->s6_addr[ 9], - in6->s6_addr[10] << 8 | in6->s6_addr[11], - in6->s6_addr[12] << 8 | in6->s6_addr[13], - in6->s6_addr[14] << 8 | in6->s6_addr[15]); - break; -#endif - default: - errno = EAFNOSUPPORT; - return NULL; - } - - return dst; -} - -#endif /* INET_NTOP */ diff --git a/src/pulsecore/inet_ntop.h b/src/pulsecore/inet_ntop.h deleted file mode 100644 index 77ace6a4..00000000 --- a/src/pulsecore/inet_ntop.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef fooinet_ntophfoo -#define fooinet_ntophfoo - -#ifndef HAVE_INET_NTOP - -#include - -const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt); - -#endif - -#endif diff --git a/src/pulsecore/inet_pton.c b/src/pulsecore/inet_pton.c deleted file mode 100644 index efb15263..00000000 --- a/src/pulsecore/inet_pton.c +++ /dev/null @@ -1,63 +0,0 @@ -/*** - This file is part of PulseAudio. - - Copyright 2006 Pierre Ossman for Cendio AB - - PulseAudio 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. - - PulseAudio 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 PulseAudio; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - USA. -***/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include - -#ifndef HAVE_INET_PTON - -#include -#include - -#include "inet_pton.h" - -int inet_pton(int af, const char *src, void *dst) { - struct in_addr *in = (struct in_addr*)dst; -#ifdef HAVE_IPV6 - struct in6_addr *in6 = (struct in6_addr*)dst; -#endif - - pa_assert(src); - pa_assert(dst); - - switch (af) { - case AF_INET: - in->s_addr = inet_addr(src); - if (in->s_addr == INADDR_NONE) - return 0; - break; -#ifdef HAVE_IPV6 - case AF_INET6: - /* FIXME */ -#endif - default: - errno = EAFNOSUPPORT; - return -1; - } - - return 1; -} - -#endif /* INET_PTON */ diff --git a/src/pulsecore/inet_pton.h b/src/pulsecore/inet_pton.h deleted file mode 100644 index 913efc4c..00000000 --- a/src/pulsecore/inet_pton.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef fooinet_ptonhfoo -#define fooinet_ptonhfoo - -#ifndef HAVE_INET_PTON - -#include - -int inet_pton(int af, const char *src, void *dst); - -#endif - -#endif diff --git a/src/pulsecore/ipacl.c b/src/pulsecore/ipacl.c index 0cbe34af..3930ba61 100644 --- a/src/pulsecore/ipacl.c +++ b/src/pulsecore/ipacl.c @@ -37,9 +37,6 @@ #ifdef HAVE_NETINET_IP_H #include #endif -#ifdef HAVE_ARPA_INET_H -#include -#endif #include @@ -48,10 +45,7 @@ #include #include #include - -#ifndef HAVE_INET_PTON -#include -#endif +#include #include "ipacl.h" diff --git a/src/pulsecore/parseaddr.c b/src/pulsecore/parseaddr.c index 99fdcbf4..4b6cf9db 100644 --- a/src/pulsecore/parseaddr.c +++ b/src/pulsecore/parseaddr.c @@ -26,16 +26,12 @@ #include #include -#ifdef HAVE_ARPA_INET_H -#include -#endif - #include #include #include #include -#include +#include #include "parseaddr.h" diff --git a/src/pulsecore/socket-client.c b/src/pulsecore/socket-client.c index ae7abc9e..23d5d880 100644 --- a/src/pulsecore/socket-client.c +++ b/src/pulsecore/socket-client.c @@ -35,9 +35,6 @@ #ifdef HAVE_SYS_UN_H #include #endif -#ifdef HAVE_ARPA_INET_H -#include -#endif #ifdef HAVE_NETINET_IN_H #include #endif @@ -63,6 +60,7 @@ #include #include #include +#include #include "socket-client.h" diff --git a/src/pulsecore/socket-server.c b/src/pulsecore/socket-server.c index e45ded04..23096a0d 100644 --- a/src/pulsecore/socket-server.c +++ b/src/pulsecore/socket-server.c @@ -39,9 +39,6 @@ ((size_t)(((struct sockaddr_un *) 0)->sun_path) + strlen((ptr)->sun_path)) #endif #endif -#ifdef HAVE_ARPA_INET_H -#include -#endif #ifdef HAVE_NETINET_IN_H #include #endif @@ -50,13 +47,6 @@ #include #endif -#ifndef HAVE_INET_NTOP -#include -#endif -#ifndef HAVE_INET_PTON -#include -#endif - #include #include @@ -67,6 +57,7 @@ #include #include #include +#include #include "socket-server.h" diff --git a/src/pulsecore/socket-util.c b/src/pulsecore/socket-util.c index 0b16e0f9..3023395c 100644 --- a/src/pulsecore/socket-util.c +++ b/src/pulsecore/socket-util.c @@ -54,13 +54,6 @@ #ifdef HAVE_NETDB_H #include #endif -#ifdef HAVE_ARPA_INET_H -#include -#endif - -#ifndef HAVE_INET_NTOP -#include -#endif #include @@ -69,6 +62,7 @@ #include #include #include +#include #include "socket-util.h" diff --git a/src/tests/ipacl-test.c b/src/tests/ipacl-test.c index 58663468..be9caadf 100644 --- a/src/tests/ipacl-test.c +++ b/src/tests/ipacl-test.c @@ -17,14 +17,11 @@ #ifdef HAVE_NETINET_IP_H #include #endif -#ifdef HAVE_ARPA_INET_H -#include -#endif #include #include #include -#include +#include int main(int argc, char *argv[]) { struct sockaddr_in sa; -- cgit