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

@@ -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])

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/arpa-inet.c pulsecore/arpa-inet.h \
-		pulsecore/inet_pton.c pulsecore/inet_pton.h \
 		pulsecore/iochannel.c pulsecore/iochannel.h \
 		pulsecore/ioline.c pulsecore/ioline.h \
 		pulsecore/ipacl.h pulsecore/ipacl.c \

src/modules/module-protocol-stub.c

@@ -30,9 +30,6 @@
 #include <unistd.h>
 #include <limits.h>
 
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
@@ -49,6 +46,7 @@
 #include <pulsecore/log.h>
 #include <pulsecore/native-common.h>
 #include <pulsecore/creds.h>
+#include <pulsecore/arpa-inet.h>
 
 #ifdef USE_TCP_SOCKETS
 #define SOCKET_DESCRIPTION "(TCP sockets)"

src/modules/raop/raop_client.c

@@ -27,7 +27,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <arpa/inet.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
 

src/modules/rtp/module-rtp-recv.c

@@ -27,7 +27,6 @@
 #include <stdio.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <arpa/inet.h>
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
@@ -54,6 +53,7 @@
 #include <pulsecore/socket-util.h>
 #include <pulsecore/once.h>
 #include <pulsecore/poll.h>
+#include <pulsecore/arpa-inet.h>
 
 #include "module-rtp-recv-symdef.h"
 

src/modules/rtp/module-rtp-send.c

@@ -26,7 +26,6 @@
 #include <stdio.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <arpa/inet.h>
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
@@ -49,6 +48,7 @@
 #include <pulsecore/sample-util.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/socket-util.h>
+#include <pulsecore/arpa-inet.h>
 
 #include "module-rtp-send-symdef.h"
 

src/modules/rtp/rtp.c

@@ -27,7 +27,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <arpa/inet.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
 
@@ -43,6 +42,7 @@
 #include <pulsecore/log.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/core-util.h>
+#include <pulsecore/arpa-inet.h>
 
 #include "rtp.h"
 

src/modules/rtp/rtsp_client.c

@@ -27,7 +27,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <arpa/inet.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <netinet/in.h>
@@ -46,6 +45,7 @@
 #include <pulsecore/strbuf.h>
 #include <pulsecore/ioline.h>
 #include <pulsecore/poll.h>
+#include <pulsecore/arpa-inet.h>
 
 #include "rtsp_client.h"
 

src/modules/rtp/sap.c

@@ -28,7 +28,6 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <arpa/inet.h>
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
@@ -48,6 +47,7 @@
 #include <pulsecore/core-util.h>
 #include <pulsecore/log.h>
 #include <pulsecore/macro.h>
+#include <pulsecore/arpa-inet.h>
 
 #include "sap.h"
 #include "sdp.h"

src/modules/rtp/sdp.c

@@ -28,7 +28,6 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <arpa/inet.h>
 #include <string.h>
 
 #include <pulse/xmalloc.h>
@@ -37,6 +36,7 @@
 #include <pulsecore/core-util.h>
 #include <pulsecore/log.h>
 #include <pulsecore/macro.h>
+#include <pulsecore/arpa-inet.h>
 
 #include "sdp.h"
 #include "rtp.h"

src/pulsecore/arpa-inet.c

@@ -23,16 +23,15 @@
 #include <config.h>
 #endif
 
-#include <stdio.h>
+#if !defined(HAVE_ARPA_INET_H) && defined(OS_IS_WIN32)
-#include <errno.h>
 
-#ifndef HAVE_INET_NTOP
+#include <errno.h>
 
 #include <pulsecore/core-util.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/socket.h>
 
-#include "inet_ntop.h"
+#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;
@@ -79,4 +78,31 @@ const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt) {
     return dst;
 }
 
-#endif /* INET_NTOP */
+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

src/pulsecore/arpa-inet.h

@@ -0,0 +1,23 @@
+#ifndef fooarpa_inethfoo
+#define fooarpa_inethfoo
+
+
+#if defined(HAVE_ARPA_INET_H)
+
+#include <arpa/inet.h>
+
+#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 <pulsecore/socket.h>
+
+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

src/pulsecore/inet_ntop.h

@@ -1,12 +0,0 @@
-#ifndef fooinet_ntophfoo
-#define fooinet_ntophfoo
-
-#ifndef HAVE_INET_NTOP
-
-#include <pulsecore/socket.h>
-
-const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt);
-
-#endif
-
-#endif

src/pulsecore/inet_pton.c

@@ -1,63 +0,0 @@
-/***
-  This file is part of PulseAudio.
-
-  Copyright 2006 Pierre Ossman <ossman@cendio.se> 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 <config.h>
-#endif
-
-#include <stdio.h>
-#include <errno.h>
-
-#ifndef HAVE_INET_PTON
-
-#include <pulsecore/macro.h>
-#include <pulsecore/socket.h>
-
-#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 */

src/pulsecore/inet_pton.h

@@ -1,12 +0,0 @@
-#ifndef fooinet_ptonhfoo
-#define fooinet_ptonhfoo
-
-#ifndef HAVE_INET_PTON
-
-#include <pulsecore/socket.h>
-
-int inet_pton(int af, const char *src, void *dst);
-
-#endif
-
-#endif

src/pulsecore/ipacl.c

@@ -37,9 +37,6 @@
 #ifdef HAVE_NETINET_IP_H
 #include <netinet/ip.h>
 #endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
 
 #include <pulse/xmalloc.h>
 
@@ -48,10 +45,7 @@
 #include <pulsecore/log.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/socket.h>
-
+#include <pulsecore/arpa-inet.h>
-#ifndef HAVE_INET_PTON
-#include <pulsecore/inet_pton.h>
-#endif
 
 #include "ipacl.h"
 

src/pulsecore/parseaddr.c

@@ -26,16 +26,12 @@
 #include <string.h>
 #include <stdlib.h>
 
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-
 #include <pulse/xmalloc.h>
 #include <pulse/util.h>
 
 #include <pulsecore/core-util.h>
 #include <pulsecore/macro.h>
-#include <pulsecore/inet_pton.h>
+#include <pulsecore/arpa-inet.h>
 
 #include "parseaddr.h"
 

src/pulsecore/socket-client.c

@@ -35,9 +35,6 @@
 #ifdef HAVE_SYS_UN_H
 #include <sys/un.h>
 #endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
@@ -63,6 +60,7 @@
 #include <pulsecore/parseaddr.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/refcnt.h>
+#include <pulsecore/arpa-inet.h>
 
 #include "socket-client.h"
 

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 <arpa/inet.h>
-#endif
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
@@ -50,13 +47,6 @@
 #include <tcpd.h>
 #endif
 
-#ifndef HAVE_INET_NTOP
-#include <pulsecore/inet_ntop.h>
-#endif
-#ifndef HAVE_INET_PTON
-#include <pulsecore/inet_pton.h>
-#endif
-
 #include <pulse/xmalloc.h>
 #include <pulse/util.h>
 
@@ -67,6 +57,7 @@
 #include <pulsecore/macro.h>
 #include <pulsecore/core-error.h>
 #include <pulsecore/refcnt.h>
+#include <pulsecore/arpa-inet.h>
 
 #include "socket-server.h"
 

src/pulsecore/socket-util.c

@@ -54,13 +54,6 @@
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
-
-#ifndef HAVE_INET_NTOP
-#include <pulsecore/inet_ntop.h>
-#endif
 
 #include <pulse/xmalloc.h>
 
@@ -69,6 +62,7 @@
 #include <pulsecore/log.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/socket.h>
+#include <pulsecore/arpa-inet.h>
 
 #include "socket-util.h"
 

src/tests/ipacl-test.c

@@ -17,14 +17,11 @@
 #ifdef HAVE_NETINET_IP_H
 #include <netinet/ip.h>
 #endif
-#ifdef HAVE_ARPA_INET_H
-#include <arpa/inet.h>
-#endif
 
 #include <pulsecore/socket.h>
 #include <pulsecore/macro.h>
 #include <pulsecore/ipacl.h>
-#include <pulsecore/inet_pton.h>
+#include <pulsecore/arpa-inet.h>
 
 int main(int argc, char *argv[]) {
     struct sockaddr_in sa;