mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Don't build seperate ipv4/ipv6 versions of the protocol plugins

Browse source 
* Instead try IPv6 and if that fails fall back to IPv4


git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@548 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-02-21 01:08:53 +00:00
parent c07928a32d
commit 8c80dd6302
4 changed files with 51 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/polypcore/socket-server.c
View file

@ -101,18 +101,18 @@ static void callback(pa_mainloop_api *mainloop, pa_io_event *e, int fd, PA_GCC_U
#ifdef HAVE_LIBWRAP
if (s->type == SOCKET_SERVER_IPV4 && s->tcpwrap_service) {
if (s->tcpwrap_service) {
struct request_info req;
request_init(&req, RQ_DAEMON, s->tcpwrap_service, RQ_FILE, nfd, NULL);
fromhost(&req);
if (!hosts_access(&req)) {
pa_log(__FILE__": TCP connection refused by tcpwrap.\n");
pa_log_warn(__FILE__": TCP connection refused by tcpwrap.\n");
close(nfd);
goto finish;
}
pa_log(__FILE__": TCP connection accepted by tcpwrap.\n");
pa_log_info(__FILE__": TCP connection accepted by tcpwrap.\n");
}
#endif
@ -221,7 +221,7 @@ pa_socket_server* pa_socket_server_new_ipv4(pa_mainloop_api *m, uint32_t address
assert(m && port);
if ((fd = socket(PF_INET, SOCK_STREAM, 0)) < 0) {
pa_log(__FILE__": socket(): %s\n", strerror(errno));
pa_log(__FILE__": socket(PF_INET): %s\n", strerror(errno));
goto fail;
}
@ -261,7 +261,7 @@ fail:
return NULL;
}
pa_socket_server* pa_socket_server_new_ipv6(pa_mainloop_api *m, const uint8_t address[16], uint16_t port) {
pa_socket_server* pa_socket_server_new_ipv6(pa_mainloop_api *m, const uint8_t address[16], uint16_t port, const char *tcpwrap_service) {
pa_socket_server *ss;
int fd = -1;
struct sockaddr_in6 sa;
@ -270,7 +270,7 @@ pa_socket_server* pa_socket_server_new_ipv6(pa_mainloop_api *m, const uint8_t ad
assert(m && port);
if ((fd = socket(PF_INET6, SOCK_STREAM, 0)) < 0) {
pa_log(__FILE__": socket(): %s\n", strerror(errno));
pa_log(__FILE__": socket(PF_INET6): %s\n", strerror(errno));
goto fail;
}
@ -296,9 +296,11 @@ pa_socket_server* pa_socket_server_new_ipv6(pa_mainloop_api *m, const uint8_t ad
goto fail;
}
if ((ss = pa_socket_server_new(m, fd)))
if ((ss = pa_socket_server_new(m, fd))) {
ss->type = SOCKET_SERVER_IPV6;
ss->tcpwrap_service = pa_xstrdup(tcpwrap_service);
}
return ss;
fail:
@ -308,6 +310,31 @@ fail:
return NULL;
}
pa_socket_server* pa_socket_server_new_ip_loopback(pa_mainloop_api *m, uint16_t port, const char *tcpwrap_service) {
pa_socket_server *s;
assert(m);
assert(port > 0);
if (!(s = pa_socket_server_new_ipv6(m, in6addr_loopback.s6_addr, port, tcpwrap_service)))
s = pa_socket_server_new_ipv4(m, INADDR_LOOPBACK, port, tcpwrap_service);
return s;
}
pa_socket_server* pa_socket_server_new_ip_any(pa_mainloop_api *m, uint16_t port, const char *tcpwrap_service) {
pa_socket_server *s;
assert(m);
assert(port > 0);
if (!(s = pa_socket_server_new_ipv6(m, in6addr_any.s6_addr, port, tcpwrap_service)))
s = pa_socket_server_new_ipv4(m, INADDR_ANY, port, tcpwrap_service);
return s;
}
static void socket_server_free(pa_socket_server*s) {
assert(s);
close(s->fd);