#include "../polypcore/winsock.h"
+#include <polyp/xmalloc.h>
+
+#include <polypcore/core-error.h>
#include <polypcore/module.h>
#include <polypcore/socket-server.h>
#include <polypcore/socket-util.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/modargs.h>
#include <polypcore/log.h>
#include <polypcore/native-common.h>
NULL
};
-static pa_socket_server *create_socket_server(pa_core *c, pa_modargs *ma) {
- pa_socket_server *s;
+struct userdata {
#if defined(USE_TCP_SOCKETS)
+ void *protocol_ipv4;
+ void *protocol_ipv6;
+#else
+ void *protocol_unix;
+ char *socket_path;
+#endif
+};
+
+int pa__init(pa_core *c, pa_module*m) {
+ pa_modargs *ma = NULL;
+ int ret = -1;
+
+ struct userdata *u = NULL;
+
+#if defined(USE_TCP_SOCKETS)
+ pa_socket_server *s_ipv4 = NULL, *s_ipv6 = NULL;
int loopback = 1;
uint32_t port = IPV4_PORT;
const char *listen_on;
+#else
+ pa_socket_server *s;
+ int r;
+ const char *v;
+ char tmp[PATH_MAX];
+#endif
+
+ assert(c && m);
+
+ if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
+ pa_log(__FILE__": Failed to parse module arguments");
+ goto finish;
+ }
+
+ u = pa_xnew0(struct userdata, 1);
+#if defined(USE_TCP_SOCKETS)
if (pa_modargs_get_value_boolean(ma, "loopback", &loopback) < 0) {
pa_log(__FILE__": loopback= expects a boolean argument.");
- return NULL;
+ goto fail;
}
if (pa_modargs_get_value_u32(ma, "port", &port) < 0 || port < 1 || port > 0xFFFF) {
pa_log(__FILE__": port= expects a numerical argument between 1 and 65535.");
- return NULL;
+ goto fail;
}
listen_on = pa_modargs_get_value(ma, "listen", NULL);
if (listen_on) {
- if (!(s = pa_socket_server_new_ip_string(c->mainloop, listen_on, port, TCPWRAP_SERVICE)))
- return NULL;
+ s_ipv6 = pa_socket_server_new_ipv6_string(c->mainloop, listen_on, port, TCPWRAP_SERVICE);
+ s_ipv4 = pa_socket_server_new_ipv4_string(c->mainloop, listen_on, port, TCPWRAP_SERVICE);
} else if (loopback) {
- if (!(s = pa_socket_server_new_ip_loopback(c->mainloop, port, TCPWRAP_SERVICE)))
- return NULL;
+ s_ipv6 = pa_socket_server_new_ipv6_loopback(c->mainloop, port, TCPWRAP_SERVICE);
+ s_ipv4 = pa_socket_server_new_ipv4_loopback(c->mainloop, port, TCPWRAP_SERVICE);
} else {
- if (!(s = pa_socket_server_new_ip_any(c->mainloop, port, TCPWRAP_SERVICE)))
- return NULL;
+ s_ipv6 = pa_socket_server_new_ipv6_any(c->mainloop, port, TCPWRAP_SERVICE);
+ s_ipv4 = pa_socket_server_new_ipv4_any(c->mainloop, port, TCPWRAP_SERVICE);
}
-
-#else
- int r;
- const char *v;
- char tmp[PATH_MAX];
- v = pa_modargs_get_value(ma, "socket", UNIX_SOCKET);
- assert(v);
+ if (!s_ipv4 && !s_ipv6)
+ goto fail;
+
+ if (s_ipv4)
+ if (!(u->protocol_ipv4 = protocol_new(c, s_ipv4, m, ma)))
+ pa_socket_server_unref(s_ipv4);
+ if (s_ipv6)
+ if (!(u->protocol_ipv6 = protocol_new(c, s_ipv6, m, ma)))
+ pa_socket_server_unref(s_ipv6);
+
+ if (!u->protocol_ipv4 && !u->protocol_ipv6)
+ goto fail;
+
+#else
+ v = pa_modargs_get_value(ma, "socket", UNIX_SOCKET);
pa_runtime_path(v, tmp, sizeof(tmp));
+ u->socket_path = pa_xstrdup(tmp);
if (pa_make_secure_parent_dir(tmp) < 0) {
pa_log(__FILE__": Failed to create secure socket directory.");
- return NULL;
+ goto fail;
}
if ((r = pa_unix_socket_remove_stale(tmp)) < 0) {
- pa_log(__FILE__": Failed to remove stale UNIX socket '%s': %s", tmp, strerror(errno));
- return NULL;
+ pa_log(__FILE__": Failed to remove stale UNIX socket '%s': %s", tmp, pa_cstrerror(errno));
+ goto fail;
}
if (r)
pa_log(__FILE__": Removed stale UNIX socket '%s'.", tmp);
if (!(s = pa_socket_server_new_unix(c->mainloop, tmp)))
- return NULL;
-
-#endif
- return s;
-}
+ goto fail;
-int pa__init(pa_core *c, pa_module*m) {
- pa_socket_server *s;
- pa_modargs *ma = NULL;
- int ret = -1;
- assert(c && m);
+ if (!(u->protocol_unix = protocol_new(c, s, m, ma)))
+ goto fail;
- if (!(ma = pa_modargs_new(m->argument, valid_modargs))) {
- pa_log(__FILE__": Failed to parse module arguments");
- goto finish;
- }
+#endif
- if (!(s = create_socket_server(c, ma)))
- goto finish;
-
- if (!(m->userdata = protocol_new(c, s, m, ma))) {
- pa_socket_server_unref(s);
- goto finish;
- }
+ m->userdata = u;
ret = 0;
pa_modargs_free(ma);
return ret;
+
+fail:
+ if (u) {
+#if defined(USE_TCP_SOCKETS)
+ if (u->protocol_ipv4)
+ protocol_free(u->protocol_ipv4);
+ if (u->protocol_ipv6)
+ protocol_free(u->protocol_ipv6);
+#else
+ if (u->protocol_unix)
+ protocol_free(u->protocol_unix);
+
+ if (u->socket_path)
+ pa_xfree(u->socket_path);
+#endif
+
+ pa_xfree(u);
+ } else {
+#if defined(USE_TCP_SOCKETS)
+ if (s_ipv4)
+ pa_socket_server_unref(s_ipv4);
+ if (s_ipv6)
+ pa_socket_server_unref(s_ipv6);
+#else
+ if (s)
+ pa_socket_server_unref(s);
+#endif
+ }
+
+ goto finish;
}
void pa__done(pa_core *c, pa_module*m) {
- assert(c && m);
+ struct userdata *u;
+
+ assert(c);
+ assert(m);
+
+ u = m->userdata;
-#if defined(USE_PROTOCOL_ESOUND) && !defined(USE_TCP_SOCKETS)
- if (remove(ESD_UNIX_SOCKET_NAME) != 0)
- pa_log("%s: Failed to remove %s : %s.", __FILE__, ESD_UNIX_SOCKET_NAME, strerror (errno));
- if (remove(ESD_UNIX_SOCKET_DIR) != 0)
- pa_log("%s: Failed to remove %s : %s.", __FILE__, ESD_UNIX_SOCKET_DIR, strerror (errno));
+#if defined(USE_TCP_SOCKETS)
+ if (u->protocol_ipv4)
+ protocol_free(u->protocol_ipv4);
+ if (u->protocol_ipv6)
+ protocol_free(u->protocol_ipv6);
+#else
+ if (u->protocol_unix)
+ protocol_free(u->protocol_unix);
+
+ if (u->socket_path) {
+ char *p;
+
+ if ((p = pa_parent_dir(u->socket_path))) {
+ if (rmdir(p) < 0 && errno != ENOENT && errno != ENOTEMPTY)
+ pa_log(__FILE__": Failed to remove %s: %s.", u->socket_path, pa_cstrerror(errno));
+
+ pa_xfree(p);
+ }
+
+ pa_xfree(u->socket_path);
+ }
#endif
- protocol_free(m->userdata);
+ pa_xfree(u);
}