#include <stdio.h>
#include <stdlib.h>
+#ifdef HAVE_X11
+#include <xcb/xcb.h>
+#endif
+
#include <pulse/rtclock.h>
#include <pulse/timeval.h>
#include <pulse/util.h>
#include <pulsecore/proplist-util.h>
#include <pulsecore/auth-cookie.h>
#include <pulsecore/mcalign.h>
+#include <pulsecore/strlist.h>
+
+#ifdef HAVE_X11
+#include <pulsecore/x11prop.h>
+#endif
#ifdef TUNNEL_SINK
#include "module-tunnel-sink-symdef.h"
#include "module-tunnel-source-symdef.h"
#endif
+#define ENV_DEFAULT_SINK "PULSE_SINK"
+#define ENV_DEFAULT_SOURCE "PULSE_SOURCE"
+#define ENV_DEFAULT_SERVER "PULSE_SERVER"
+#define ENV_COOKIE_FILE "PULSE_COOKIE"
+
#ifdef TUNNEL_SINK
PA_MODULE_DESCRIPTION("Tunnel module for sinks");
PA_MODULE_USAGE(
"sink_name=<name for the local sink> "
"sink_properties=<properties for the local sink> "
+ "auto=<determine server/sink/cookie automatically> "
"server=<address> "
"sink=<remote sink name> "
"cookie=<filename> "
PA_MODULE_USAGE(
"source_name=<name for the local source> "
"source_properties=<properties for the local source> "
+ "auto=<determine server/source/cookie automatically> "
"server=<address> "
"source=<remote source name> "
"cookie=<filename> "
PA_MODULE_AUTHOR("Lennart Poettering");
PA_MODULE_VERSION(PACKAGE_VERSION);
-PA_MODULE_LOAD_ONCE(FALSE);
+PA_MODULE_LOAD_ONCE(false);
static const char* const valid_modargs[] = {
+ "auto",
"server",
"cookie",
"format",
int64_t counter, counter_delta;
- pa_bool_t remote_corked:1;
- pa_bool_t remote_suspended:1;
+ bool remote_corked:1;
+ bool remote_suspended:1;
pa_usec_t transport_usec; /* maintained in the main thread */
pa_usec_t thread_transport_usec; /* maintained in the IO thread */
pa_assert(u->pdispatch == pd);
pa_log_warn("Stream killed");
- pa_module_unload_request(u->module, TRUE);
+ pa_module_unload_request(u->module, true);
}
/* Called from main context */
static void command_suspended(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
struct userdata *u = userdata;
uint32_t channel;
- pa_bool_t suspended;
+ bool suspended;
pa_assert(pd);
pa_assert(t);
!pa_tagstruct_eof(t)) {
pa_log("Invalid packet.");
- pa_module_unload_request(u->module, TRUE);
+ pa_module_unload_request(u->module, true);
return;
}
struct userdata *u = userdata;
uint32_t channel, di;
const char *dn;
- pa_bool_t suspended;
+ bool suspended;
pa_assert(pd);
pa_assert(t);
pa_tagstruct_get_boolean(t, &suspended) < 0) {
pa_log_error("Invalid packet.");
- pa_module_unload_request(u->module, TRUE);
+ pa_module_unload_request(u->module, true);
return;
}
pa_tagstruct_getu32(t, &maxlength) < 0) {
pa_log_error("Invalid packet.");
- pa_module_unload_request(u->module, TRUE);
+ pa_module_unload_request(u->module, true);
return;
}
pa_tagstruct_get_usec(t, &usec) < 0) {
pa_log_error("Invalid packet.");
- pa_module_unload_request(u->module, TRUE);
+ pa_module_unload_request(u->module, true);
return;
}
} else {
pa_tagstruct_get_usec(t, &usec) < 0) {
pa_log_error("Invalid packet.");
- pa_module_unload_request(u->module, TRUE);
+ pa_module_unload_request(u->module, true);
return;
}
}
#endif
/* Called from IO thread context */
-static void check_smoother_status(struct userdata *u, pa_bool_t past) {
+static void check_smoother_status(struct userdata *u, bool past) {
pa_usec_t x;
pa_assert(u);
if (u->remote_suspended || u->remote_corked)
pa_smoother_pause(u->smoother, x);
else
- pa_smoother_resume(u->smoother, x, TRUE);
+ pa_smoother_resume(u->smoother, x, true);
}
/* Called from IO thread context */
-static void stream_cork_within_thread(struct userdata *u, pa_bool_t cork) {
+static void stream_cork_within_thread(struct userdata *u, bool cork) {
pa_assert(u);
if (u->remote_corked == cork)
return;
u->remote_corked = cork;
- check_smoother_status(u, FALSE);
+ check_smoother_status(u, false);
}
/* Called from main context */
-static void stream_cork(struct userdata *u, pa_bool_t cork) {
+static void stream_cork(struct userdata *u, bool cork) {
pa_tagstruct *t;
pa_assert(u);
}
/* Called from IO thread context */
-static void stream_suspend_within_thread(struct userdata *u, pa_bool_t suspend) {
+static void stream_suspend_within_thread(struct userdata *u, bool suspend) {
pa_assert(u);
if (u->remote_suspended == suspend)
return;
u->remote_suspended = suspend;
- check_smoother_status(u, TRUE);
+ check_smoother_status(u, true);
}
#ifdef TUNNEL_SINK
/* First, change the state, because otherwise pa_sink_render() would fail */
if ((r = pa_sink_process_msg(o, code, data, offset, chunk)) >= 0) {
- stream_cork_within_thread(u, u->sink->state == PA_SINK_SUSPENDED);
+ stream_cork_within_thread(u, u->sink->thread_info.state == PA_SINK_SUSPENDED);
- if (PA_SINK_IS_OPENED(u->sink->state))
+ if (PA_SINK_IS_OPENED(u->sink->thread_info.state))
send_data(u);
}
return 0;
-
case SINK_MESSAGE_REMOTE_SUSPEND:
stream_suspend_within_thread(u, !!PA_PTR_TO_UINT(data));
return 0;
-
case SINK_MESSAGE_UPDATE_LATENCY: {
pa_usec_t y;
case PA_SINK_SUSPENDED:
pa_assert(PA_SINK_IS_OPENED(s->state));
- stream_cork(u, TRUE);
+ stream_cork(u, true);
break;
case PA_SINK_IDLE:
case PA_SINK_RUNNING:
if (s->state == PA_SINK_SUSPENDED)
- stream_cork(u, FALSE);
+ stream_cork(u, false);
break;
case PA_SINK_UNLINKED:
int r;
if ((r = pa_source_process_msg(o, code, data, offset, chunk)) >= 0)
- stream_cork_within_thread(u, u->source->state == PA_SOURCE_SUSPENDED);
+ stream_cork_within_thread(u, u->source->thread_info.state == PA_SOURCE_SUSPENDED);
return r;
}
case PA_SOURCE_SUSPENDED:
pa_assert(PA_SOURCE_IS_OPENED(s->state));
- stream_cork(u, TRUE);
+ stream_cork(u, true);
break;
case PA_SOURCE_IDLE:
case PA_SOURCE_RUNNING:
if (s->state == PA_SOURCE_SUSPENDED)
- stream_cork(u, FALSE);
+ stream_cork(u, false);
break;
case PA_SOURCE_UNLINKED:
int ret;
#ifdef TUNNEL_SINK
- if (PA_SINK_IS_OPENED(u->sink->thread_info.state))
- if (PA_UNLIKELY(u->sink->thread_info.rewind_requested))
- pa_sink_process_rewind(u->sink, 0);
+ if (PA_UNLIKELY(u->sink->thread_info.rewind_requested))
+ pa_sink_process_rewind(u->sink, 0);
#endif
- if ((ret = pa_rtpoll_run(u->rtpoll, TRUE)) < 0)
+ if ((ret = pa_rtpoll_run(u->rtpoll, true)) < 0)
goto fail;
if (ret == 0)
return;
fail:
- pa_module_unload_request(u->module, TRUE);
+ pa_module_unload_request(u->module, true);
}
#endif
static void stream_get_latency_callback(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
struct userdata *u = userdata;
pa_usec_t sink_usec, source_usec;
- pa_bool_t playing;
+ bool playing;
int64_t write_index, read_index;
struct timeval local, remote, now;
pa_sample_spec *ss;
fail:
- pa_module_unload_request(u->module, TRUE);
+ pa_module_unload_request(u->module, true);
}
/* Called from main context */
return;
fail:
- pa_module_unload_request(u->module, TRUE);
+ pa_module_unload_request(u->module, true);
}
-static int read_ports(struct userdata *u, pa_tagstruct *t)
-{
+static int read_ports(struct userdata *u, pa_tagstruct *t) {
if (u->version >= 16) {
uint32_t n_ports;
const char *s;
return 0;
}
+static int read_formats(struct userdata *u, pa_tagstruct *t) {
+ uint8_t n_formats;
+ pa_format_info *format;
+
+ if (pa_tagstruct_getu8(t, &n_formats) < 0) { /* no. of formats */
+ pa_log("Parse failure");
+ return -PA_ERR_PROTOCOL;
+ }
+
+ for (uint8_t j = 0; j < n_formats; j++) {
+ format = pa_format_info_new();
+ if (pa_tagstruct_get_format_info(t, format)) { /* format info */
+ pa_format_info_free(format);
+ pa_log("Parse failure");
+ return -PA_ERR_PROTOCOL;
+ }
+ pa_format_info_free(format);
+ }
+ return 0;
+}
+
#ifdef TUNNEL_SINK
/* Called from main context */
pa_sample_spec ss;
pa_channel_map cm;
pa_cvolume volume;
- pa_bool_t mute;
+ bool mute;
pa_usec_t latency;
- pa_proplist *pl;
pa_assert(pd);
pa_assert(u);
- pl = pa_proplist_new();
-
if (command != PA_COMMAND_REPLY) {
if (command == PA_COMMAND_ERROR)
pa_log("Failed to get info.");
if (u->version >= 13) {
pa_usec_t configured_latency;
- if (pa_tagstruct_get_proplist(t, pl) < 0 ||
+ if (pa_tagstruct_get_proplist(t, NULL) < 0 ||
pa_tagstruct_get_usec(t, &configured_latency) < 0) {
pa_log("Parse failure");
if (read_ports(u, t) < 0)
goto fail;
- if (u->version >= 21) {
- uint8_t n_formats;
- pa_format_info *format;
-
- if (pa_tagstruct_getu8(t, &n_formats) < 0) { /* no. of formats */
- pa_log("Parse failure");
- goto fail;
- }
-
- for (uint8_t j = 0; j < n_formats; j++) {
- format = pa_format_info_new();
- if (pa_tagstruct_get_format_info(t, format)) { /* format info */
- pa_format_info_free(format);
- pa_log("Parse failure");
- goto fail;
- }
- pa_format_info_free(format);
- }
- }
+ if (u->version >= 21 && read_formats(u, t) < 0)
+ goto fail;
if (!pa_tagstruct_eof(t)) {
pa_log("Packet too long");
goto fail;
}
- pa_proplist_free(pl);
-
- if (!u->sink_name || strcmp(name, u->sink_name))
+ if (!u->sink_name || !pa_streq(name, u->sink_name))
return;
pa_xfree(u->device_description);
return;
fail:
- pa_module_unload_request(u->module, TRUE);
- pa_proplist_free(pl);
+ pa_module_unload_request(u->module, true);
}
/* Called from main context */
uint32_t idx, owner_module, client, sink;
pa_usec_t buffer_usec, sink_usec;
const char *name, *driver, *resample_method;
- pa_bool_t mute = FALSE;
+ bool mute = false;
pa_sample_spec sample_spec;
pa_channel_map channel_map;
pa_cvolume volume;
- pa_proplist *pl;
- pa_bool_t b;
+ bool b;
pa_assert(pd);
pa_assert(u);
- pl = pa_proplist_new();
-
if (command != PA_COMMAND_REPLY) {
if (command == PA_COMMAND_ERROR)
pa_log("Failed to get info.");
}
if (u->version >= 13) {
- if (pa_tagstruct_get_proplist(t, pl) < 0) {
+ if (pa_tagstruct_get_proplist(t, NULL) < 0) {
pa_log("Parse failure");
goto fail;
goto fail;
}
- pa_proplist_free(pl);
-
if (idx != u->device_index)
return;
return;
fail:
- pa_module_unload_request(u->module, TRUE);
- pa_proplist_free(pl);
+ pa_module_unload_request(u->module, true);
}
#else
pa_sample_spec ss;
pa_channel_map cm;
pa_cvolume volume;
- pa_bool_t mute;
+ bool mute;
pa_usec_t latency, configured_latency;
- pa_proplist *pl;
pa_assert(pd);
pa_assert(u);
- pl = pa_proplist_new();
-
if (command != PA_COMMAND_REPLY) {
if (command == PA_COMMAND_ERROR)
pa_log("Failed to get info.");
}
if (u->version >= 13) {
- if (pa_tagstruct_get_proplist(t, pl) < 0 ||
+ if (pa_tagstruct_get_proplist(t, NULL) < 0 ||
pa_tagstruct_get_usec(t, &configured_latency) < 0) {
pa_log("Parse failure");
if (read_ports(u, t) < 0)
goto fail;
+ if (u->version >= 22 && read_formats(u, t) < 0)
+ goto fail;
+
if (!pa_tagstruct_eof(t)) {
pa_log("Packet too long");
goto fail;
}
- pa_proplist_free(pl);
-
- if (!u->source_name || strcmp(name, u->source_name))
+ if (!u->source_name || !pa_streq(name, u->source_name))
return;
pa_xfree(u->device_description);
return;
fail:
- pa_module_unload_request(u->module, TRUE);
- pa_proplist_free(pl);
+ pa_module_unload_request(u->module, true);
}
#endif
if (pa_tagstruct_getu32(t, &e) < 0 ||
pa_tagstruct_getu32(t, &idx) < 0) {
pa_log("Invalid protocol reply");
- pa_module_unload_request(u->module, TRUE);
+ pa_module_unload_request(u->module, true);
return;
}
pa_channel_map cm;
uint32_t device_index;
const char *dn;
- pa_bool_t suspended;
+ bool suspended;
if (pa_tagstruct_get_sample_spec(t, &ss) < 0 ||
pa_tagstruct_get_channel_map(t, &cm) < 0 ||
pa_log("Invalid reply. (Create stream)");
fail:
- pa_module_unload_request(u->module, TRUE);
+ pa_module_unload_request(u->module, true);
}
struct userdata *u = userdata;
pa_tagstruct *reply;
char name[256], un[128], hn[128];
-#ifdef TUNNEL_SINK
pa_cvolume volume;
-#endif
pa_assert(pd);
pa_assert(u);
#endif
if (u->version >= 12) {
- pa_tagstruct_put_boolean(reply, FALSE); /* no_remap */
- pa_tagstruct_put_boolean(reply, FALSE); /* no_remix */
- pa_tagstruct_put_boolean(reply, FALSE); /* fix_format */
- pa_tagstruct_put_boolean(reply, FALSE); /* fix_rate */
- pa_tagstruct_put_boolean(reply, FALSE); /* fix_channels */
- pa_tagstruct_put_boolean(reply, TRUE); /* no_move */
- pa_tagstruct_put_boolean(reply, FALSE); /* variable_rate */
+ pa_tagstruct_put_boolean(reply, false); /* no_remap */
+ pa_tagstruct_put_boolean(reply, false); /* no_remix */
+ pa_tagstruct_put_boolean(reply, false); /* fix_format */
+ pa_tagstruct_put_boolean(reply, false); /* fix_rate */
+ pa_tagstruct_put_boolean(reply, false); /* fix_channels */
+ pa_tagstruct_put_boolean(reply, true); /* no_move */
+ pa_tagstruct_put_boolean(reply, false); /* variable_rate */
}
if (u->version >= 13) {
pa_proplist *pl;
- pa_tagstruct_put_boolean(reply, FALSE); /* start muted/peak detect*/
- pa_tagstruct_put_boolean(reply, TRUE); /* adjust_latency */
+ pa_tagstruct_put_boolean(reply, false); /* start muted/peak detect*/
+ pa_tagstruct_put_boolean(reply, true); /* adjust_latency */
pl = pa_proplist_new();
pa_proplist_sets(pl, PA_PROP_MEDIA_NAME, name);
if (u->version >= 14) {
#ifdef TUNNEL_SINK
- pa_tagstruct_put_boolean(reply, FALSE); /* volume_set */
+ pa_tagstruct_put_boolean(reply, false); /* volume_set */
#endif
- pa_tagstruct_put_boolean(reply, TRUE); /* early rquests */
+ pa_tagstruct_put_boolean(reply, true); /* early rquests */
}
if (u->version >= 15) {
#ifdef TUNNEL_SINK
- pa_tagstruct_put_boolean(reply, FALSE); /* muted_set */
+ pa_tagstruct_put_boolean(reply, false); /* muted_set */
#endif
- pa_tagstruct_put_boolean(reply, FALSE); /* don't inhibit auto suspend */
- pa_tagstruct_put_boolean(reply, FALSE); /* fail on suspend */
+ pa_tagstruct_put_boolean(reply, false); /* don't inhibit auto suspend */
+ pa_tagstruct_put_boolean(reply, false); /* fail on suspend */
}
#ifdef TUNNEL_SINK
if (u->version >= 17)
- pa_tagstruct_put_boolean(reply, FALSE); /* relative volume */
+ pa_tagstruct_put_boolean(reply, false); /* relative volume */
if (u->version >= 18)
- pa_tagstruct_put_boolean(reply, FALSE); /* passthrough stream */
+ pa_tagstruct_put_boolean(reply, false); /* passthrough stream */
#endif
#ifdef TUNNEL_SINK
/* We're not using the extended API, so n_formats = 0 and that's that */
pa_tagstruct_putu8(reply, 0);
}
+#else
+ if (u->version >= 22) {
+ /* We're not using the extended API, so n_formats = 0 and that's that */
+ pa_tagstruct_putu8(reply, 0);
+ pa_cvolume_reset(&volume, u->source->sample_spec.channels);
+ pa_tagstruct_put_cvolume(reply, &volume);
+ pa_tagstruct_put_boolean(reply, false); /* muted */
+ pa_tagstruct_put_boolean(reply, false); /* volume_set */
+ pa_tagstruct_put_boolean(reply, false); /* muted_set */
+ pa_tagstruct_put_boolean(reply, false); /* relative volume */
+ pa_tagstruct_put_boolean(reply, false); /* passthrough stream */
+ }
#endif
pa_pstream_send_tagstruct(u->pstream, reply);
return;
fail:
- pa_module_unload_request(u->module, TRUE);
+ pa_module_unload_request(u->module, true);
}
/* Called from main context */
pa_assert(u);
pa_log_warn("Stream died.");
- pa_module_unload_request(u->module, TRUE);
+ pa_module_unload_request(u->module, true);
}
/* Called from main context */
if (pa_pdispatch_run(u->pdispatch, packet, creds, u) < 0) {
pa_log("Invalid packet");
- pa_module_unload_request(u->module, TRUE);
+ pa_module_unload_request(u->module, true);
return;
}
}
if (channel != u->channel) {
pa_log("Received memory block on bad channel.");
- pa_module_unload_request(u->module, TRUE);
+ pa_module_unload_request(u->module, true);
return;
}
if (!io) {
pa_log("Connection failed: %s", pa_cstrerror(errno));
- pa_module_unload_request(u->module, TRUE);
+ pa_module_unload_request(u->module, true);
return;
}
u->pstream = pa_pstream_new(u->core->mainloop, io, u->core->mempool);
- u->pdispatch = pa_pdispatch_new(u->core->mainloop, TRUE, command_table, PA_COMMAND_MAX);
+ u->pdispatch = pa_pdispatch_new(u->core->mainloop, true, command_table, PA_COMMAND_MAX);
pa_pstream_set_die_callback(u->pstream, pstream_die_callback, u);
pa_pstream_set_receive_packet_callback(u->pstream, pstream_packet_callback, u);
int pa__init(pa_module*m) {
pa_modargs *ma = NULL;
struct userdata *u = NULL;
+ char *server = NULL;
+ pa_strlist *server_list = NULL;
pa_sample_spec ss;
pa_channel_map map;
char *dn = NULL;
#else
pa_source_new_data data;
#endif
+ bool automatic;
+#ifdef HAVE_X11
+ xcb_connection_t *xcb = NULL;
+#endif
+ const char *cookie_path;
pa_assert(m);
u->smoother = pa_smoother_new(
PA_USEC_PER_SEC,
PA_USEC_PER_SEC*2,
- TRUE,
- TRUE,
+ true,
+ true,
10,
pa_rtclock_now(),
- FALSE);
+ false);
u->ctag = 1;
u->device_index = u->channel = PA_INVALID_INDEX;
u->time_event = NULL;
u->ignore_latency_before = 0;
u->transport_usec = u->thread_transport_usec = 0;
- u->remote_suspended = u->remote_corked = FALSE;
+ u->remote_suspended = u->remote_corked = false;
u->counter = u->counter_delta = 0;
u->rtpoll = pa_rtpoll_new();
pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll);
- if (!(u->auth_cookie = pa_auth_cookie_get(u->core, pa_modargs_get_value(ma, "cookie", PA_NATIVE_COOKIE_FILE), PA_NATIVE_COOKIE_LENGTH)))
+ if (pa_modargs_get_value_boolean(ma, "auto", &automatic) < 0) {
+ pa_log("Failed to parse argument \"auto\".");
goto fail;
+ }
- if (!(u->server_name = pa_xstrdup(pa_modargs_get_value(ma, "server", NULL)))) {
- pa_log("No server specified.");
- goto fail;
+ cookie_path = pa_modargs_get_value(ma, "cookie", NULL);
+ server = pa_xstrdup(pa_modargs_get_value(ma, "server", NULL));
+
+ if (automatic) {
+#ifdef HAVE_X11
+ /* Need an X11 connection to get root properties */
+ if (getenv("DISPLAY") != NULL) {
+ if (!(xcb = xcb_connect(getenv("DISPLAY"), NULL)))
+ pa_log("xcb_connect() failed");
+ else {
+ if (xcb_connection_has_error(xcb)) {
+ pa_log("xcb_connection_has_error() returned true");
+ xcb_disconnect(xcb);
+ xcb = NULL;
+ }
+ }
+ }
+#endif
+
+ /* Figure out the cookie the same way a normal client would */
+ if (!cookie_path)
+ cookie_path = getenv(ENV_COOKIE_FILE);
+
+#ifdef HAVE_X11
+ if (!cookie_path && xcb) {
+ char t[1024];
+ if (pa_x11_get_prop(xcb, 0, "PULSE_COOKIE", t, sizeof(t))) {
+ uint8_t cookie[PA_NATIVE_COOKIE_LENGTH];
+
+ if (pa_parsehex(t, cookie, sizeof(cookie)) != sizeof(cookie))
+ pa_log("Failed to parse cookie data");
+ else {
+ if (!(u->auth_cookie = pa_auth_cookie_create(u->core, cookie, sizeof(cookie))))
+ goto fail;
+ }
+ }
+ }
+#endif
+
+ /* Same thing for the server name */
+ if (!server)
+ server = pa_xstrdup(getenv(ENV_DEFAULT_SERVER));
+
+#ifdef HAVE_X11
+ if (!server && xcb) {
+ char t[1024];
+ if (pa_x11_get_prop(xcb, 0, "PULSE_SERVER", t, sizeof(t)))
+ server = pa_xstrdup(t);
+ }
+#endif
+
+ /* Also determine the default sink/source on the other server */
+#ifdef TUNNEL_SINK
+ if (!u->sink_name)
+ u->sink_name = pa_xstrdup(getenv(ENV_DEFAULT_SINK));
+
+#ifdef HAVE_X11
+ if (!u->sink_name && xcb) {
+ char t[1024];
+ if (pa_x11_get_prop(xcb, 0, "PULSE_SINK", t, sizeof(t)))
+ u->sink_name = pa_xstrdup(t);
+ }
+#endif
+#else
+ if (!u->source_name)
+ u->source_name = pa_xstrdup(getenv(ENV_DEFAULT_SOURCE));
+
+#ifdef HAVE_X11
+ if (!u->source_name && xcb) {
+ char t[1024];
+ if (pa_x11_get_prop(xcb, 0, "PULSE_SOURCE", t, sizeof(t)))
+ u->source_name = pa_xstrdup(t);
+ }
+#endif
+#endif
+ }
+
+ if (!cookie_path && !u->auth_cookie)
+ cookie_path = PA_NATIVE_COOKIE_FILE;
+
+ if (cookie_path) {
+ if (!(u->auth_cookie = pa_auth_cookie_get(u->core, cookie_path, true, PA_NATIVE_COOKIE_LENGTH)))
+ goto fail;
+ }
+
+ if (server) {
+ if (!(server_list = pa_strlist_parse(server))) {
+ pa_log("Invalid server specified.");
+ goto fail;
+ }
+ } else {
+ char *ufn;
+
+ if (!automatic) {
+ pa_log("No server specified.");
+ goto fail;
+ }
+
+ pa_log("No server address found. Attempting default local sockets.");
+
+ /* The system wide instance via PF_LOCAL */
+ server_list = pa_strlist_prepend(server_list, PA_SYSTEM_RUNTIME_PATH PA_PATH_SEP PA_NATIVE_DEFAULT_UNIX_SOCKET);
+
+ /* The user instance via PF_LOCAL */
+ if ((ufn = pa_runtime_path(PA_NATIVE_DEFAULT_UNIX_SOCKET))) {
+ server_list = pa_strlist_prepend(server_list, ufn);
+ pa_xfree(ufn);
+ }
}
ss = m->core->default_sample_spec;
goto fail;
}
- if (!(u->client = pa_socket_client_new_string(m->core->mainloop, TRUE, u->server_name, PA_NATIVE_DEFAULT_PORT))) {
- pa_log("Failed to connect to server '%s'", u->server_name);
- goto fail;
- }
+ for (;;) {
+ server_list = pa_strlist_pop(server_list, &u->server_name);
+
+ if (!u->server_name) {
+ pa_log("Failed to connect to server '%s'", server);
+ goto fail;
+ }
+
+ pa_log_debug("Trying to connect to %s...", u->server_name);
+
+ if (!(u->client = pa_socket_client_new_string(m->core->mainloop, true, u->server_name, PA_NATIVE_DEFAULT_PORT))) {
+ pa_xfree(u->server_name);
+ u->server_name = NULL;
+ continue;
+ }
+
+ break;
+ }
pa_socket_client_set_callback(u->client, on_connection, u);
pa_sink_new_data_init(&data);
data.driver = __FILE__;
data.module = m;
- data.namereg_fail = TRUE;
+ data.namereg_fail = false;
pa_sink_new_data_set_name(&data, dn);
pa_sink_new_data_set_sample_spec(&data, &ss);
pa_sink_new_data_set_channel_map(&data, &map);
pa_sink_set_set_volume_callback(u->sink, sink_set_volume);
pa_sink_set_set_mute_callback(u->sink, sink_set_mute);
- u->sink->refresh_volume = u->sink->refresh_muted = FALSE;
+ u->sink->refresh_volume = u->sink->refresh_muted = false;
/* pa_sink_set_latency_range(u->sink, MIN_NETWORK_LATENCY_USEC, 0); */
pa_source_new_data_init(&data);
data.driver = __FILE__;
data.module = m;
- data.namereg_fail = TRUE;
+ data.namereg_fail = false;
pa_source_new_data_set_name(&data, dn);
pa_source_new_data_set_sample_spec(&data, &ss);
pa_source_new_data_set_channel_map(&data, &map);
pa_source_put(u->source);
#endif
+ if (server)
+ pa_xfree(server);
+
+ if (server_list)
+ pa_strlist_free(server_list);
+
+#ifdef HAVE_X11
+ if (xcb)
+ xcb_disconnect(xcb);
+#endif
+
pa_modargs_free(ma);
return 0;
fail:
pa__done(m);
+ if (server)
+ pa_xfree(server);
+
+ if (server_list)
+ pa_strlist_free(server_list);
+
+#ifdef HAVE_X11
+ if (xcb)
+ xcb_disconnect(xcb);
+#endif
+
if (ma)
pa_modargs_free(ma);