X-Git-Url: https://code.delx.au/pulseaudio/blobdiff_plain/42f92a8087b2cefdee47439bcd0a79c7f883af03..efec98280f54012238062714b2152c2faf22775b:/src/modules/module-tunnel.c diff --git a/src/modules/module-tunnel.c b/src/modules/module-tunnel.c index f788f660..6b3512e2 100644 --- a/src/modules/module-tunnel.c +++ b/src/modules/module-tunnel.c @@ -31,6 +31,10 @@ #include #include +#ifdef HAVE_X11 +#include +#endif + #include #include #include @@ -42,12 +46,10 @@ #include #include #include -#include #include #include #include #include -#include #include #include #include @@ -56,6 +58,11 @@ #include #include #include +#include + +#ifdef HAVE_X11 +#include +#endif #ifdef TUNNEL_SINK #include "module-tunnel-sink-symdef.h" @@ -63,11 +70,17 @@ #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= " "sink_properties= " + "auto= " "server=
" "sink= " "cookie= " @@ -80,6 +93,7 @@ PA_MODULE_DESCRIPTION("Tunnel module for sources"); PA_MODULE_USAGE( "source_name= " "source_properties= " + "auto= " "server=
" "source= " "cookie= " @@ -91,9 +105,10 @@ PA_MODULE_USAGE( 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", @@ -207,8 +222,8 @@ struct userdata { 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 */ @@ -250,7 +265,7 @@ static void command_stream_killed(pa_pdispatch *pd, uint32_t command, uint32_t 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 */ @@ -270,7 +285,7 @@ static void command_overflow_or_underflow(pa_pdispatch *pd, uint32_t command, 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); @@ -282,7 +297,7 @@ static void command_suspended(pa_pdispatch *pd, uint32_t command, uint32_t tag !pa_tagstruct_eof(t)) { pa_log("Invalid packet."); - pa_module_unload_request(u->module, TRUE); + pa_module_unload_request(u->module, true); return; } @@ -302,7 +317,7 @@ static void command_moved(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa struct userdata *u = userdata; uint32_t channel, di; const char *dn; - pa_bool_t suspended; + bool suspended; pa_assert(pd); pa_assert(t); @@ -315,7 +330,7 @@ static void command_moved(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa 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; } @@ -332,7 +347,7 @@ static void command_moved(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa static void command_stream_buffer_attr_changed(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) { struct userdata *u = userdata; - uint32_t channel, maxlength, tlength, fragsize, prebuf, minreq; + uint32_t channel, maxlength, tlength = 0, fragsize, prebuf, minreq; pa_usec_t usec; pa_assert(pd); @@ -344,7 +359,7 @@ static void command_stream_buffer_attr_changed(pa_pdispatch *pd, uint32_t comman 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; } @@ -353,7 +368,7 @@ static void command_stream_buffer_attr_changed(pa_pdispatch *pd, uint32_t comman 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 { @@ -363,7 +378,7 @@ static void command_stream_buffer_attr_changed(pa_pdispatch *pd, uint32_t comman 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; } } @@ -379,7 +394,7 @@ static void command_stream_buffer_attr_changed(pa_pdispatch *pd, uint32_t comman /* Called from main context */ static void command_started(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) { - struct userdata *u = userdata; + struct userdata *u = userdata; pa_assert(pd); pa_assert(t); @@ -393,7 +408,7 @@ static void command_started(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa #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); @@ -412,22 +427,22 @@ static void check_smoother_status(struct userdata *u, pa_bool_t past) { 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); @@ -449,14 +464,14 @@ static void stream_cork(struct userdata *u, pa_bool_t cork) { } /* 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 @@ -487,12 +502,12 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offse case PA_SINK_MESSAGE_SET_STATE: { int r; - /* First, change the state, because otherwide pa_sink_render() would fail */ + /* 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); } @@ -519,13 +534,11 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offse 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; @@ -571,13 +584,13 @@ static int sink_set_state(pa_sink *s, pa_sink_state_t state) { 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: @@ -601,7 +614,7 @@ static int source_process_msg(pa_msgobject *o, int code, void *data, int64_t off 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; } @@ -667,13 +680,13 @@ static int source_set_state(pa_source *s, pa_source_state_t state) { 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: @@ -700,12 +713,11 @@ static void thread_func(void *userdata) { 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) @@ -749,7 +761,7 @@ static void command_request(pa_pdispatch *pd, uint32_t command, uint32_t tag, p return; fail: - pa_module_unload_request(u->module, TRUE); + pa_module_unload_request(u->module, true); } #endif @@ -758,7 +770,7 @@ fail: 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; @@ -860,7 +872,7 @@ static void stream_get_latency_callback(pa_pdispatch *pd, uint32_t command, uint fail: - pa_module_unload_request(u->module, TRUE); + pa_module_unload_request(u->module, true); } /* Called from main context */ @@ -973,8 +985,7 @@ static void server_info_cb(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa pa_tagstruct_gets(t, &default_sink_name) < 0 || pa_tagstruct_gets(t, &default_source_name) < 0 || pa_tagstruct_getu32(t, &cookie) < 0 || - (u->version >= 15 && - pa_tagstruct_get_channel_map(t, &cm) < 0)) { + (u->version >= 15 && pa_tagstruct_get_channel_map(t, &cm) < 0)) { pa_log("Parse failure"); goto fail; @@ -996,7 +1007,62 @@ static void server_info_cb(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa 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) { + if (u->version >= 16) { + uint32_t n_ports; + const char *s; + + if (pa_tagstruct_getu32(t, &n_ports)) { + pa_log("Parse failure"); + return -PA_ERR_PROTOCOL; + } + + for (uint32_t j = 0; j < n_ports; j++) { + uint32_t priority; + + if (pa_tagstruct_gets(t, &s) < 0 || /* name */ + pa_tagstruct_gets(t, &s) < 0 || /* description */ + pa_tagstruct_getu32(t, &priority) < 0) { + + pa_log("Parse failure"); + return -PA_ERR_PROTOCOL; + } + if (u->version >= 24 && pa_tagstruct_getu32(t, &priority) < 0) { /* available */ + pa_log("Parse failure"); + return -PA_ERR_PROTOCOL; + } + } + + if (pa_tagstruct_gets(t, &s) < 0) { /* active port */ + pa_log("Parse failure"); + return -PA_ERR_PROTOCOL; + } + } + 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 @@ -1009,15 +1075,12 @@ static void sink_info_cb(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_t 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."); @@ -1047,7 +1110,7 @@ static void sink_info_cb(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_t 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"); @@ -1069,14 +1132,18 @@ static void sink_info_cb(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_t } } + if (read_ports(u, t) < 0) + goto fail; + + 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); @@ -1087,8 +1154,7 @@ static void sink_info_cb(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_t return; fail: - pa_module_unload_request(u->module, TRUE); - pa_proplist_free(pl); + pa_module_unload_request(u->module, true); } /* Called from main context */ @@ -1097,17 +1163,15 @@ static void sink_input_info_cb(pa_pdispatch *pd, uint32_t command, uint32_t tag uint32_t idx, owner_module, client, sink; pa_usec_t buffer_usec, sink_usec; const char *name, *driver, *resample_method; - pa_bool_t mute; + bool mute = false; pa_sample_spec sample_spec; pa_channel_map channel_map; pa_cvolume volume; - pa_proplist *pl; + 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."); @@ -1142,39 +1206,64 @@ static void sink_input_info_cb(pa_pdispatch *pd, uint32_t command, uint32_t tag } 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; + } + } + + if (u->version >= 19) { + if (pa_tagstruct_get_boolean(t, &b) < 0) { pa_log("Parse failure"); goto fail; } } + if (u->version >= 20) { + if (pa_tagstruct_get_boolean(t, &b) < 0 || + pa_tagstruct_get_boolean(t, &b) < 0) { + + pa_log("Parse failure"); + goto fail; + } + } + + if (u->version >= 21) { + pa_format_info *format = pa_format_info_new(); + + if (pa_tagstruct_get_format_info(t, format) < 0) { + pa_format_info_free(format); + pa_log("Parse failure"); + goto fail; + } + pa_format_info_free(format); + } + if (!pa_tagstruct_eof(t)) { pa_log("Packet too long"); goto fail; } - pa_proplist_free(pl); - if (idx != u->device_index) return; pa_assert(u->sink); if ((u->version < 11 || !!mute == !!u->sink->muted) && - pa_cvolume_equal(&volume, &u->sink->virtual_volume)) + pa_cvolume_equal(&volume, &u->sink->real_volume)) return; - pa_sink_volume_changed(u->sink, &volume, FALSE); + pa_sink_volume_changed(u->sink, &volume); if (u->version >= 11) - pa_sink_mute_changed(u->sink, mute, FALSE); + pa_sink_mute_changed(u->sink, mute); return; fail: - pa_module_unload_request(u->module, TRUE); - pa_proplist_free(pl); + pa_module_unload_request(u->module, true); } #else @@ -1187,15 +1276,12 @@ static void source_info_cb(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa 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."); @@ -1223,7 +1309,7 @@ static void source_info_cb(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa } 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"); @@ -1245,14 +1331,18 @@ static void source_info_cb(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa } } + 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); @@ -1263,8 +1353,7 @@ static void source_info_cb(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa return; fail: - pa_module_unload_request(u->module, TRUE); - pa_proplist_free(pl); + pa_module_unload_request(u->module, true); } #endif @@ -1325,7 +1414,7 @@ static void command_subscribe_event(pa_pdispatch *pd, uint32_t command, uint32 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; } @@ -1345,12 +1434,11 @@ static void command_subscribe_event(pa_pdispatch *pd, uint32_t command, uint32 /* Called from main context */ static void start_subscribe(struct userdata *u) { pa_tagstruct *t; - uint32_t tag; pa_assert(u); t = pa_tagstruct_new(NULL, 0); pa_tagstruct_putu32(t, PA_COMMAND_SUBSCRIBE); - pa_tagstruct_putu32(t, tag = u->ctag++); + pa_tagstruct_putu32(t, u->ctag++); pa_tagstruct_putu32(t, PA_SUBSCRIPTION_MASK_SERVER| #ifdef TUNNEL_SINK PA_SUBSCRIPTION_MASK_SINK_INPUT|PA_SUBSCRIPTION_MASK_SINK @@ -1408,7 +1496,7 @@ static void create_stream_callback(pa_pdispatch *pd, uint32_t command, uint32_t 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 || @@ -1439,6 +1527,17 @@ static void create_stream_callback(pa_pdispatch *pd, uint32_t command, uint32_t /* #endif */ } + if (u->version >= 21) { + pa_format_info *format = pa_format_info_new(); + + if (pa_tagstruct_get_format_info(t, format) < 0) { + pa_format_info_free(format); + goto parse_error; + } + + pa_format_info_free(format); + } + if (!pa_tagstruct_eof(t)) goto parse_error; @@ -1462,7 +1561,7 @@ parse_error: pa_log("Invalid reply. (Create stream)"); fail: - pa_module_unload_request(u->module, TRUE); + pa_module_unload_request(u->module, true); } @@ -1471,9 +1570,7 @@ static void setup_complete_callback(pa_pdispatch *pd, uint32_t command, uint32_t 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); @@ -1526,7 +1623,7 @@ static void setup_complete_callback(pa_pdispatch *pd, uint32_t command, uint32_t reply = pa_tagstruct_new(NULL, 0); pa_tagstruct_putu32(reply, PA_COMMAND_SET_CLIENT_NAME); - pa_tagstruct_putu32(reply, tag = u->ctag++); + pa_tagstruct_putu32(reply, u->ctag++); if (u->version >= 13) { pa_proplist *pl; @@ -1592,20 +1689,20 @@ static void setup_complete_callback(pa_pdispatch *pd, uint32_t command, uint32_t #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); @@ -1620,19 +1717,46 @@ static void setup_complete_callback(pa_pdispatch *pd, uint32_t command, uint32_t 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 */ + + if (u->version >= 18) + pa_tagstruct_put_boolean(reply, false); /* passthrough stream */ +#endif + +#ifdef TUNNEL_SINK + if (u->version >= 21) { + /* 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); pa_pdispatch_register_reply(u->pdispatch, tag, DEFAULT_TIMEOUT, create_stream_callback, u, NULL); @@ -1641,7 +1765,7 @@ static void setup_complete_callback(pa_pdispatch *pd, uint32_t command, uint32_t return; fail: - pa_module_unload_request(u->module, TRUE); + pa_module_unload_request(u->module, true); } /* Called from main context */ @@ -1652,7 +1776,7 @@ static void pstream_die_callback(pa_pstream *p, void *userdata) { 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 */ @@ -1665,7 +1789,7 @@ static void pstream_packet_callback(pa_pstream *p, pa_packet *packet, const pa_c 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; } } @@ -1681,7 +1805,7 @@ static void pstream_memblock_callback(pa_pstream *p, uint32_t channel, int64_t o 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; } @@ -1706,17 +1830,17 @@ static void on_connection(pa_socket_client *sc, pa_iochannel *io, void *userdata 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_recieve_packet_callback(u->pstream, pstream_packet_callback, u); + pa_pstream_set_receive_packet_callback(u->pstream, pstream_packet_callback, u); #ifndef TUNNEL_SINK - pa_pstream_set_recieve_memblock_callback(u->pstream, pstream_memblock_callback, u); + pa_pstream_set_receive_memblock_callback(u->pstream, pstream_memblock_callback, u); #endif t = pa_tagstruct_new(NULL, 0); @@ -1753,7 +1877,6 @@ static void on_connection(pa_socket_client *sc, pa_iochannel *io, void *userdata static void sink_set_volume(pa_sink *sink) { struct userdata *u; pa_tagstruct *t; - uint32_t tag; pa_assert(sink); u = sink->userdata; @@ -1761,9 +1884,9 @@ static void sink_set_volume(pa_sink *sink) { t = pa_tagstruct_new(NULL, 0); pa_tagstruct_putu32(t, PA_COMMAND_SET_SINK_INPUT_VOLUME); - pa_tagstruct_putu32(t, tag = u->ctag++); + pa_tagstruct_putu32(t, u->ctag++); pa_tagstruct_putu32(t, u->device_index); - pa_tagstruct_put_cvolume(t, &sink->virtual_volume); + pa_tagstruct_put_cvolume(t, &sink->real_volume); pa_pstream_send_tagstruct(u->pstream, t); } @@ -1771,7 +1894,6 @@ static void sink_set_volume(pa_sink *sink) { static void sink_set_mute(pa_sink *sink) { struct userdata *u; pa_tagstruct *t; - uint32_t tag; pa_assert(sink); u = sink->userdata; @@ -1782,7 +1904,7 @@ static void sink_set_mute(pa_sink *sink) { t = pa_tagstruct_new(NULL, 0); pa_tagstruct_putu32(t, PA_COMMAND_SET_SINK_INPUT_MUTE); - pa_tagstruct_putu32(t, tag = u->ctag++); + pa_tagstruct_putu32(t, u->ctag++); pa_tagstruct_putu32(t, u->device_index); pa_tagstruct_put_boolean(t, !!sink->muted); pa_pstream_send_tagstruct(u->pstream, t); @@ -1793,6 +1915,8 @@ static void sink_set_mute(pa_sink *sink) { 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; @@ -1801,6 +1925,11 @@ int pa__init(pa_module*m) { #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); @@ -1827,28 +1956,135 @@ int pa__init(pa_module*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; @@ -1858,22 +2094,36 @@ int pa__init(pa_module*m) { 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); #ifdef TUNNEL_SINK if (!(dn = pa_xstrdup(pa_modargs_get_value(ma, "sink_name", NULL)))) - dn = pa_sprintf_malloc("tunnel.%s", u->server_name); + dn = pa_sprintf_malloc("tunnel-sink.%s", u->server_name); 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); @@ -1888,7 +2138,7 @@ int pa__init(pa_module*m) { goto fail; } - u->sink = pa_sink_new(m->core, &data, PA_SINK_NETWORK|PA_SINK_LATENCY|PA_SINK_HW_VOLUME_CTRL|PA_SINK_HW_MUTE_CTRL); + u->sink = pa_sink_new(m->core, &data, PA_SINK_NETWORK|PA_SINK_LATENCY); pa_sink_new_data_done(&data); if (!u->sink) { @@ -1899,10 +2149,10 @@ int pa__init(pa_module*m) { u->sink->parent.process_msg = sink_process_msg; u->sink->userdata = u; u->sink->set_state = sink_set_state; - u->sink->set_volume = sink_set_volume; - u->sink->set_mute = sink_set_mute; + 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); */ @@ -1912,12 +2162,12 @@ int pa__init(pa_module*m) { #else if (!(dn = pa_xstrdup(pa_modargs_get_value(ma, "source_name", NULL)))) - dn = pa_sprintf_malloc("tunnel.%s", u->server_name); + dn = pa_sprintf_malloc("tunnel-source.%s", u->server_name); 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); @@ -1963,7 +2213,7 @@ int pa__init(pa_module*m) { u->fragsize = (uint32_t) -1; #endif - if (!(u->thread = pa_thread_new(thread_func, u))) { + if (!(u->thread = pa_thread_new("module-tunnel", thread_func, u))) { pa_log("Failed to create thread."); goto fail; } @@ -1974,6 +2224,17 @@ int pa__init(pa_module*m) { 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; @@ -1981,12 +2242,23 @@ int pa__init(pa_module*m) { 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); pa_xfree(dn); - return -1; + return -1; } void pa__done(pa_module*m) {