-- cgit From 026a6bdd0ecdc68288b2167aed6dfd4e6f407edb Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 31 Jul 2008 01:25:33 +0200 Subject: Work around D-Bus bug that involves dbus_shutdown() to call exit() when it shouldn't. Patch from Coling Guthrie --- src/daemon/polkit.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/daemon/polkit.c b/src/daemon/polkit.c index 256e3199..dc0eee78 100644 --- a/src/daemon/polkit.c +++ b/src/daemon/polkit.c @@ -54,6 +54,11 @@ int pa_polkit_check(const char *action_id) { goto finish; } + /* There seems to be a bug in D-Bus that causes dbus_shutdown() to + * call exit() when a connection without this flag disabled was + * created during runtime.*/ + dbus_connection_set_exit_on_disconnect(bus, FALSE); + if (!(caller = polkit_caller_new_from_pid(bus, getpid(), &dbus_error))) { pa_log_error("Cannot get caller from PID: %s", dbus_error.message); goto finish; -- cgit From 4ccbc4dbe27b286b548ad27435c390131075fc8b Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 31 Jul 2008 21:22:43 +0200 Subject: reword comment on dbus a bit --- src/daemon/polkit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/daemon/polkit.c b/src/daemon/polkit.c index dc0eee78..08155cf2 100644 --- a/src/daemon/polkit.c +++ b/src/daemon/polkit.c @@ -54,9 +54,9 @@ int pa_polkit_check(const char *action_id) { goto finish; } - /* There seems to be a bug in D-Bus that causes dbus_shutdown() to - * call exit() when a connection without this flag disabled was - * created during runtime.*/ + /* There seems to be a bug in some versions of D-Bus that causes + * dbus_shutdown() to call exit() when a connection without this + * flag disabled was created during runtime.*/ dbus_connection_set_exit_on_disconnect(bus, FALSE); if (!(caller = polkit_caller_new_from_pid(bus, getpid(), &dbus_error))) { -- cgit From 4f3193dbefd5f82955a672c7473bf86d780afafc Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 31 Jul 2008 21:24:23 +0200 Subject: allow global tsched setting for all modules loaded by module-hal --- src/modules/module-alsa-sink.c | 2 +- src/modules/module-hal-detect.c | 23 +++++++++++++++++++---- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/modules/module-alsa-sink.c b/src/modules/module-alsa-sink.c index 8e66f796..aad6801e 100644 --- a/src/modules/module-alsa-sink.c +++ b/src/modules/module-alsa-sink.c @@ -1148,7 +1148,7 @@ int pa__init(pa_module*m) { } if (pa_modargs_get_value_boolean(ma, "tsched", &use_tsched) < 0) { - pa_log("Failed to parse timer_scheduling argument."); + pa_log("Failed to parse tsched argument."); goto fail; } diff --git a/src/modules/module-hal-detect.c b/src/modules/module-hal-detect.c index ab5b206f..5354717e 100644 --- a/src/modules/module-hal-detect.c +++ b/src/modules/module-hal-detect.c @@ -56,9 +56,11 @@ PA_MODULE_DESCRIPTION("Detect available audio hardware and load matching drivers PA_MODULE_VERSION(PACKAGE_VERSION); PA_MODULE_LOAD_ONCE(TRUE); #if defined(HAVE_ALSA) && defined(HAVE_OSS) -PA_MODULE_USAGE("api="); +PA_MODULE_USAGE("api= " + "tsched="); #elif defined(HAVE_ALSA) -PA_MODULE_USAGE("api="); +PA_MODULE_USAGE("api= " + "tsched="); #elif defined(HAVE_OSS) PA_MODULE_USAGE("api="); #endif @@ -76,6 +78,9 @@ struct userdata { pa_dbus_connection *connection; pa_hashmap *devices; const char *capability; +#ifdef HAVE_ALSA + pa_bool_t use_tsched; +#endif }; struct timerdata { @@ -88,6 +93,9 @@ struct timerdata { static const char* const valid_modargs[] = { "api", +#ifdef HAVE_ALSA + "tsched", +#endif NULL }; @@ -189,12 +197,12 @@ static pa_module* hal_device_load_alsa(struct userdata *u, const char *udi, char *sink_name = pa_sprintf_malloc("alsa_output.%s", strip_udi(udi)); module_name = "module-alsa-sink"; - args = pa_sprintf_malloc("device_id=%u sink_name=%s", card, *sink_name); + args = pa_sprintf_malloc("device_id=%u sink_name=%s tsched=%i", card, *sink_name, (int) u->use_tsched); } else { *source_name = pa_sprintf_malloc("alsa_input.%s", strip_udi(udi)); module_name = "module-alsa-source"; - args = pa_sprintf_malloc("device_id=%u source_name=%s", card, *source_name); + args = pa_sprintf_malloc("device_id=%u source_name=%s tsched=%i", card, *source_name, (int) u->use_tsched); } pa_log_debug("Loading %s with arguments '%s'", module_name, args); @@ -724,6 +732,7 @@ int pa__init(pa_module*m) { int n = 0; pa_modargs *ma; const char *api; + pa_bool_t use_tsched = TRUE; pa_assert(m); @@ -734,6 +743,11 @@ int pa__init(pa_module*m) { goto fail; } + if (pa_modargs_get_value_boolean(ma, "tsched", &use_tsched) < 0) { + pa_log("Failed to parse tsched argument."); + goto fail; + } + if ((api = pa_modargs_get_value(ma, "api", NULL))) { int good = 0; @@ -775,6 +789,7 @@ int pa__init(pa_module*m) { u->connection = conn; u->devices = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func); u->capability = api; + u->use_tsched = use_tsched; m->userdata = u; #ifdef HAVE_ALSA -- cgit From 5150738333dc9e612fd404b3414e0bf9e74e6051 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 31 Jul 2008 21:25:58 +0200 Subject: a bit of pa_bool_t'ization --- src/modules/module-hal-detect.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/modules/module-hal-detect.c b/src/modules/module-hal-detect.c index 5354717e..b2f97a10 100644 --- a/src/modules/module-hal-detect.c +++ b/src/modules/module-hal-detect.c @@ -69,7 +69,7 @@ struct device { uint32_t index; char *udi; char *sink_name, *source_name; - int acl_race_fix; + pa_bool_t acl_race_fix; }; struct userdata { @@ -337,7 +337,7 @@ static struct device* hal_device_add(struct userdata *u, const char *udi) { return NULL; d = pa_xnew(struct device, 1); - d->acl_race_fix = 0; + d->acl_race_fix = FALSE; d->udi = pa_xstrdup(udi); d->index = m->index; d->sink_name = sink_name; @@ -568,9 +568,9 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *message, vo udi = dbus_message_get_path(message); if ((d = pa_hashmap_get(u->devices, udi))) { - int send_acl_race_fix_message = 0; + pa_bool_t send_acl_race_fix_message = FALSE; - d->acl_race_fix = 0; + d->acl_race_fix = FALSE; if (d->sink_name) { pa_sink *sink; @@ -583,12 +583,12 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *message, vo if (pa_sink_suspend(sink, 0) >= 0) pa_scache_play_item_by_name(u->core, "pulse-access", d->sink_name, FALSE, PA_VOLUME_NORM, NULL, NULL); else - d->acl_race_fix = 1; + d->acl_race_fix = TRUE; } else if (!prev_suspended && suspend) { /* suspend */ if (pa_sink_suspend(sink, 1) >= 0) - send_acl_race_fix_message = 1; + send_acl_race_fix_message = TRUE; } } } @@ -602,12 +602,12 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *message, vo if (prev_suspended && !suspend) { /* resume */ if (pa_source_suspend(source, 0) < 0) - d->acl_race_fix = 1; + d->acl_race_fix = TRUE; } else if (!prev_suspended && suspend) { /* suspend */ if (pa_source_suspend(source, 0) >= 0) - send_acl_race_fix_message = 1; + send_acl_race_fix_message = TRUE; } } } @@ -639,7 +639,7 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *message, vo if ((d = pa_hashmap_get(u->devices, udi)) && d->acl_race_fix) { pa_log_debug("Got dirty give up message for '%s', trying resume ...", udi); - d->acl_race_fix = 0; + d->acl_race_fix = FALSE; if (d->sink_name) { pa_sink *sink; -- cgit From 80428d80b03b3c26bd25169fa4083e16cf6bfafc Mon Sep 17 00:00:00 2001 From: Stanley Cai Date: Thu, 31 Jul 2008 21:34:47 +0800 Subject: A fix on src/Makefile.am It needs dbus not hal to build module-console-kit.so Signed-off-by: Lennart Poettering --- src/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 51fd9976..63707192 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1512,8 +1512,8 @@ module_hal_detect_la_CFLAGS = $(AM_CFLAGS) $(HAL_CFLAGS) module_console_kit_la_SOURCES = modules/module-console-kit.c module_console_kit_la_LDFLAGS = -module -avoid-version -module_console_kit_la_LIBADD = $(AM_LIBADD) $(HAL_LIBS) libpulsecore.la libdbus-util.la -module_console_kit_la_CFLAGS = $(AM_CFLAGS) $(HAL_CFLAGS) +module_console_kit_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) libpulsecore.la libdbus-util.la +module_console_kit_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS) # GConf support module_gconf_la_SOURCES = modules/gconf/module-gconf.c -- cgit From a5a7b79938c14d3ca89da52e3d25d276bbbafc7b Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 1 Aug 2008 01:54:53 +0300 Subject: fix build without ALSA --- src/modules/module-hal-detect.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/modules/module-hal-detect.c b/src/modules/module-hal-detect.c index b2f97a10..bfabd91a 100644 --- a/src/modules/module-hal-detect.c +++ b/src/modules/module-hal-detect.c @@ -789,7 +789,9 @@ int pa__init(pa_module*m) { u->connection = conn; u->devices = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func); u->capability = api; +#ifdef HAVE_ALSA u->use_tsched = use_tsched; +#endif m->userdata = u; #ifdef HAVE_ALSA -- cgit From edc56a7f7a993aa60b979a4093e39f66e7f7a8c8 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 1 Aug 2008 01:56:09 +0300 Subject: rename pa_property_xxx to pa_shared_xxx to avoid confusion with property lists --- src/modules/dbus-util.c | 6 ++-- src/modules/module-x11-publish.c | 2 +- src/pulsecore/authkey-prop.c | 14 ++++---- src/pulsecore/cli-command.c | 8 ++--- src/pulsecore/core.c | 4 +-- src/pulsecore/core.h | 2 +- src/pulsecore/props.c | 74 ++++++++++++++++++++-------------------- src/pulsecore/props.h | 41 +++++++++++----------- src/pulsecore/protocol-native.c | 10 +++--- src/pulsecore/x11wrap.c | 6 ++-- 10 files changed, 84 insertions(+), 83 deletions(-) diff --git a/src/modules/dbus-util.c b/src/modules/dbus-util.c index 905be13f..e18b6ab9 100644 --- a/src/modules/dbus-util.c +++ b/src/modules/dbus-util.c @@ -254,7 +254,7 @@ static pa_dbus_connection* pa_dbus_connection_new(pa_core* c, DBusConnection *co pconn->connection = conn; pconn->dispatch_event = c->mainloop->defer_new(c->mainloop, dispatch_cb, conn); - pa_property_set(c, name, pconn); + pa_shared_set(c, name, pconn); return pconn; } @@ -282,7 +282,7 @@ void pa_dbus_connection_unref(pa_dbus_connection *c) { } /* already disconnected, just free */ - pa_property_remove(c->core, c->property_name); + pa_shared_remove(c->core, c->property_name); c->core->mainloop->defer_free(c->dispatch_event); dbus_connection_unref(c->connection); pa_xfree(c); @@ -309,7 +309,7 @@ pa_dbus_connection* pa_dbus_bus_get(pa_core *c, DBusBusType type, DBusError *err pa_assert(type == DBUS_BUS_SYSTEM || type == DBUS_BUS_SESSION || type == DBUS_BUS_STARTER); - if ((pconn = pa_property_get(c, prop_name[type]))) + if ((pconn = pa_shared_get(c, prop_name[type]))) return pa_dbus_connection_ref(pconn); if (!(conn = dbus_bus_get_private(type, error))) diff --git a/src/modules/module-x11-publish.c b/src/modules/module-x11-publish.c index 705d90f4..d0ce344f 100644 --- a/src/modules/module-x11-publish.c +++ b/src/modules/module-x11-publish.c @@ -152,7 +152,7 @@ int pa__init(pa_module*m) { if (!(u->x11_wrapper = pa_x11_wrapper_get(m->core, pa_modargs_get_value(ma, "display", NULL)))) goto fail; - if (!(l = pa_property_get(m->core, PA_NATIVE_SERVER_PROPERTY_NAME))) + if (!(l = pa_shared_get(m->core, PA_NATIVE_SERVER_PROPERTY_NAME))) goto fail; l = pa_strlist_reverse(l); diff --git a/src/pulsecore/authkey-prop.c b/src/pulsecore/authkey-prop.c index a953bf7d..9e147ec1 100644 --- a/src/pulsecore/authkey-prop.c +++ b/src/pulsecore/authkey-prop.c @@ -47,7 +47,7 @@ int pa_authkey_prop_get(pa_core *c, const char *name, void *data, size_t len) { pa_assert(data); pa_assert(len > 0); - if (!(a = pa_property_get(c, name))) + if (!(a = pa_shared_get(c, name))) return -1; pa_assert(a->length == len); @@ -62,7 +62,7 @@ int pa_authkey_prop_put(pa_core *c, const char *name, const void *data, size_t l pa_assert(c); pa_assert(name); - if (pa_property_get(c, name)) + if (pa_shared_get(c, name)) return -1; a = pa_xmalloc(PA_ALIGN(sizeof(struct authkey_data)) + len); @@ -70,7 +70,7 @@ int pa_authkey_prop_put(pa_core *c, const char *name, const void *data, size_t l a->length = len; memcpy((uint8_t*) a + PA_ALIGN(sizeof(struct authkey_data)), data, len); - pa_property_set(c, name, a); + pa_shared_set(c, name, a); return 0; } @@ -81,7 +81,7 @@ void pa_authkey_prop_ref(pa_core *c, const char *name) { pa_assert(c); pa_assert(name); - a = pa_property_get(c, name); + a = pa_shared_get(c, name); pa_assert(a); pa_assert(PA_REFCNT_VALUE(a) >= 1); PA_REFCNT_INC(a); @@ -93,14 +93,12 @@ void pa_authkey_prop_unref(pa_core *c, const char *name) { pa_assert(c); pa_assert(name); - a = pa_property_get(c, name); + a = pa_shared_get(c, name); pa_assert(a); pa_assert(PA_REFCNT_VALUE(a) >= 1); if (PA_REFCNT_DEC(a) <= 0) { - pa_property_remove(c, name); + pa_shared_remove(c, name); pa_xfree(a); } } - - diff --git a/src/pulsecore/cli-command.c b/src/pulsecore/cli-command.c index cbdb602a..43ec1042 100644 --- a/src/pulsecore/cli-command.c +++ b/src/pulsecore/cli-command.c @@ -110,7 +110,7 @@ static int pa_cli_command_autoload_list(pa_core *c, pa_tokenizer *t, pa_strbuf * static int pa_cli_command_autoload_add(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, pa_bool_t *fail); static int pa_cli_command_autoload_remove(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, pa_bool_t *fail); static int pa_cli_command_dump(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, pa_bool_t *fail); -static int pa_cli_command_list_props(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, pa_bool_t *fail); +static int pa_cli_command_list_shared_props(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, pa_bool_t *fail); static int pa_cli_command_move_sink_input(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, pa_bool_t *fail); static int pa_cli_command_move_source_output(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, pa_bool_t *fail); static int pa_cli_command_vacuum(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, pa_bool_t *fail); @@ -160,7 +160,7 @@ static const struct command commands[] = { { "remove-autoload-sink", pa_cli_command_autoload_remove, NULL /*"Remove autoload entry for a sink (args: name)"*/, 2}, { "remove-autoload-source", pa_cli_command_autoload_remove, NULL /*"Remove autoload entry for a source (args: name)"*/, 2}, { "dump", pa_cli_command_dump, "Dump daemon configuration", 1}, - { "list-props", pa_cli_command_list_props, NULL, 1}, + { "shared", pa_cli_command_list_shared_props, NULL, 1}, { "move-sink-input", pa_cli_command_move_sink_input, "Move sink input to another sink (args: index, sink)", 3}, { "move-source-output", pa_cli_command_move_source_output, "Move source output to another source (args: index, source)", 3}, { "vacuum", pa_cli_command_vacuum, NULL, 1}, @@ -996,13 +996,13 @@ static int pa_cli_command_autoload_list(pa_core *c, pa_tokenizer *t, pa_strbuf * return 0; } -static int pa_cli_command_list_props(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, pa_bool_t *fail) { +static int pa_cli_command_list_shared_props(pa_core *c, pa_tokenizer *t, pa_strbuf *buf, pa_bool_t *fail) { pa_core_assert_ref(c); pa_assert(t); pa_assert(buf); pa_assert(fail); - pa_property_dump(c, buf); + pa_shared_dump(c, buf); return 0; } diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c index b2638b10..9aabd37d 100644 --- a/src/pulsecore/core.c +++ b/src/pulsecore/core.c @@ -141,7 +141,7 @@ pa_core* pa_core_new(pa_mainloop_api *m, int shared) { for (j = 0; j < PA_CORE_HOOK_MAX; j++) pa_hook_init(&c->hooks[j], c); - pa_property_init(c); + pa_shared_init(c); pa_random(&c->cookie, sizeof(c->cookie)); @@ -189,7 +189,7 @@ static void core_free(pa_object *o) { pa_silence_cache_done(&c->silence_cache); pa_mempool_free(c->mempool); - pa_property_cleanup(c); + pa_shared_cleanup(c); for (j = 0; j < PA_CORE_HOOK_MAX; j++) pa_hook_free(&c->hooks[j]); diff --git a/src/pulsecore/core.h b/src/pulsecore/core.h index 14a2c78d..e11655ef 100644 --- a/src/pulsecore/core.h +++ b/src/pulsecore/core.h @@ -94,7 +94,7 @@ struct pa_core { pa_idxset *clients, *sinks, *sources, *sink_inputs, *source_outputs, *modules, *scache, *autoload_idxset; /* Some hashmaps for all sorts of entities */ - pa_hashmap *namereg, *autoload_hashmap, *properties; + pa_hashmap *namereg, *autoload_hashmap, *shared; /* The name of the default sink/source */ char *default_source_name, *default_sink_name; diff --git a/src/pulsecore/props.c b/src/pulsecore/props.c index 23d432ec..1bfb297a 100644 --- a/src/pulsecore/props.c +++ b/src/pulsecore/props.c @@ -29,110 +29,110 @@ #include "props.h" -typedef struct pa_property { - char *name; /* Points to memory allocated by the property subsystem */ +typedef struct pa_shared { + char *name; /* Points to memory allocated by the shared property system */ void *data; /* Points to memory maintained by the caller */ -} pa_property; +} pa_shared; -/* Allocate a new property object */ -static pa_property* property_new(const char *name, void *data) { - pa_property* p; +/* Allocate a new shared property object */ +static pa_shared* shared_new(const char *name, void *data) { + pa_shared* p; pa_assert(name); pa_assert(data); - p = pa_xnew(pa_property, 1); + p = pa_xnew(pa_shared, 1); p->name = pa_xstrdup(name); p->data = data; return p; } -/* Free a property object */ -static void property_free(pa_property *p) { +/* Free a shared property object */ +static void shared_free(pa_shared *p) { pa_assert(p); pa_xfree(p->name); pa_xfree(p); } -void* pa_property_get(pa_core *c, const char *name) { - pa_property *p; +void* pa_shared_get(pa_core *c, const char *name) { + pa_shared *p; pa_assert(c); pa_assert(name); - pa_assert(c->properties); + pa_assert(c->shared); - if (!(p = pa_hashmap_get(c->properties, name))) + if (!(p = pa_hashmap_get(c->shared, name))) return NULL; return p->data; } -int pa_property_set(pa_core *c, const char *name, void *data) { - pa_property *p; +int pa_shared_set(pa_core *c, const char *name, void *data) { + pa_shared *p; pa_assert(c); pa_assert(name); pa_assert(data); - pa_assert(c->properties); + pa_assert(c->shared); - if (pa_hashmap_get(c->properties, name)) + if (pa_hashmap_get(c->shared, name)) return -1; - p = property_new(name, data); - pa_hashmap_put(c->properties, p->name, p); + p = shared_new(name, data); + pa_hashmap_put(c->shared, p->name, p); return 0; } -int pa_property_remove(pa_core *c, const char *name) { - pa_property *p; +int pa_shared_remove(pa_core *c, const char *name) { + pa_shared *p; pa_assert(c); pa_assert(name); - pa_assert(c->properties); + pa_assert(c->shared); - if (!(p = pa_hashmap_remove(c->properties, name))) + if (!(p = pa_hashmap_remove(c->shared, name))) return -1; - property_free(p); + shared_free(p); return 0; } -void pa_property_init(pa_core *c) { +void pa_shared_init(pa_core *c) { pa_assert(c); - c->properties = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func); + c->shared = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func); } -void pa_property_cleanup(pa_core *c) { +void pa_shared_cleanup(pa_core *c) { pa_assert(c); - if (!c->properties) + if (!c->shared) return; - pa_assert(!pa_hashmap_size(c->properties)); + pa_assert(pa_hashmap_isempty(c->shared)); - pa_hashmap_free(c->properties, NULL, NULL); - c->properties = NULL; + pa_hashmap_free(c->shared, NULL, NULL); + c->shared = NULL; } -void pa_property_dump(pa_core *c, pa_strbuf *s) { +void pa_shared_dump(pa_core *c, pa_strbuf *s) { void *state = NULL; - pa_property *p; + pa_shared *p; pa_assert(c); pa_assert(s); - while ((p = pa_hashmap_iterate(c->properties, &state, NULL))) + while ((p = pa_hashmap_iterate(c->shared, &state, NULL))) pa_strbuf_printf(s, "[%s] -> [%p]\n", p->name, p->data); } -int pa_property_replace(pa_core *c, const char *name, void *data) { +int pa_shared_replace(pa_core *c, const char *name, void *data) { pa_assert(c); pa_assert(name); - pa_property_remove(c, name); - return pa_property_set(c, name, data); + pa_shared_remove(c, name); + return pa_shared_set(c, name, data); } diff --git a/src/pulsecore/props.h b/src/pulsecore/props.h index 95db229b..dd3f94e2 100644 --- a/src/pulsecore/props.h +++ b/src/pulsecore/props.h @@ -1,5 +1,5 @@ -#ifndef foopropshfoo -#define foopropshfoo +#ifndef foosharedshfoo +#define foosharedshfoo /*** This file is part of PulseAudio. @@ -25,34 +25,37 @@ #include #include -/* The property subsystem is to be used to share data between +/* The shared property subsystem is to be used to share data between * modules. Consider them to be kind of "global" variables for a * core. Why not use the hashmap functions directly? The hashmap * functions copy neither the key nor value, while this property * system copies the key. Users of this system have to think about * reference counting themselves. */ -/* Return a pointer to the value of the specified property. */ -void* pa_property_get(pa_core *c, const char *name); +/* Note: please don't confuse this with the proplist framework in + * pulse/proplist.[ch]! */ -/* Set the property 'name' to 'data'. This function fails in case a - * property by this name already exists. The property data is not - * copied or reference counted. This is the caller's job. */ -int pa_property_set(pa_core *c, const char *name, void *data); +/* Return a pointer to the value of the specified shared property. */ +void* pa_shared_get(pa_core *c, const char *name); -/* Remove the specified property. Return non-zero on failure */ -int pa_property_remove(pa_core *c, const char *name); +/* Set the shared property 'name' to 'data'. This function fails in + * case a property by this name already exists. The property data is + * not copied or reference counted. This is the caller's job. */ +int pa_shared_set(pa_core *c, const char *name, void *data); -/* A combination of pa_property_remove() and pa_property_set() */ -int pa_property_replace(pa_core *c, const char *name, void *data); +/* Remove the specified shared property. Return non-zero on failure */ +int pa_shared_remove(pa_core *c, const char *name); -/* Free all memory used by the property system */ -void pa_property_cleanup(pa_core *c); +/* A combination of pa_shared_remove() and pa_shared_set() */ +int pa_shared_replace(pa_core *c, const char *name, void *data); -/* Initialize the properties subsystem */ -void pa_property_init(pa_core *c); +/* Free all memory used by the shared property system */ +void pa_shared_cleanup(pa_core *c); -/* Dump the current set of properties */ -void pa_property_dump(pa_core *c, pa_strbuf *s); +/* Initialize the shared property system */ +void pa_shared_init(pa_core *c); + +/* Dump the current set of shared properties */ +void pa_shared_dump(pa_core *c, pa_strbuf *s); #endif diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c index e1303597..f279b6af 100644 --- a/src/pulsecore/protocol-native.c +++ b/src/pulsecore/protocol-native.c @@ -4134,9 +4134,9 @@ pa_protocol_native* pa_protocol_native_new(pa_core *core, pa_socket_server *serv if (pa_socket_server_get_address(p->server, t, sizeof(t))) { pa_strlist *l; - l = pa_property_get(core, PA_NATIVE_SERVER_PROPERTY_NAME); + l = pa_shared_get(core, PA_NATIVE_SERVER_PROPERTY_NAME); l = pa_strlist_prepend(l, t); - pa_property_replace(core, PA_NATIVE_SERVER_PROPERTY_NAME, l); + pa_shared_replace(core, PA_NATIVE_SERVER_PROPERTY_NAME, l); } return p; @@ -4155,13 +4155,13 @@ void pa_protocol_native_free(pa_protocol_native *p) { if (pa_socket_server_get_address(p->server, t, sizeof(t))) { pa_strlist *l; - l = pa_property_get(p->core, PA_NATIVE_SERVER_PROPERTY_NAME); + l = pa_shared_get(p->core, PA_NATIVE_SERVER_PROPERTY_NAME); l = pa_strlist_remove(l, t); if (l) - pa_property_replace(p->core, PA_NATIVE_SERVER_PROPERTY_NAME, l); + pa_shared_replace(p->core, PA_NATIVE_SERVER_PROPERTY_NAME, l); else - pa_property_remove(p->core, PA_NATIVE_SERVER_PROPERTY_NAME); + pa_shared_remove(p->core, PA_NATIVE_SERVER_PROPERTY_NAME); } pa_socket_server_unref(p->server); diff --git a/src/pulsecore/x11wrap.c b/src/pulsecore/x11wrap.c index 00b6a157..9186cf74 100644 --- a/src/pulsecore/x11wrap.c +++ b/src/pulsecore/x11wrap.c @@ -192,7 +192,7 @@ static pa_x11_wrapper* x11_wrapper_new(pa_core *c, const char *name, const char XAddConnectionWatch(d, x11_watch, (XPointer) w); - pa_assert_se(pa_property_set(c, w->property_name, w) >= 0); + pa_assert_se(pa_shared_set(c, w->property_name, w) >= 0); return w; } @@ -200,7 +200,7 @@ static pa_x11_wrapper* x11_wrapper_new(pa_core *c, const char *name, const char static void x11_wrapper_free(pa_x11_wrapper*w) { pa_assert(w); - pa_assert_se(pa_property_remove(w->core, w->property_name) >= 0); + pa_assert_se(pa_shared_remove(w->core, w->property_name) >= 0); pa_assert(!w->clients); @@ -224,7 +224,7 @@ pa_x11_wrapper* pa_x11_wrapper_get(pa_core *c, const char *name) { pa_core_assert_ref(c); pa_snprintf(t, sizeof(t), "x11-wrapper%s%s", name ? "-" : "", name ? name : ""); - if ((w = pa_property_get(c, t))) + if ((w = pa_shared_get(c, t))) return pa_x11_wrapper_ref(w); return x11_wrapper_new(c, name, t); -- cgit From d36c5c97e53ac8865971bdd34ea27bf11bde49e1 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 1 Aug 2008 02:10:54 +0300 Subject: rename props.[ch] to shared.[ch] --- src/Makefile.am | 4 +- src/modules/dbus-util.c | 2 +- src/modules/module-x11-publish.c | 2 +- src/pulsecore/authkey-prop.c | 2 +- src/pulsecore/cli-command.c | 2 +- src/pulsecore/core.c | 2 +- src/pulsecore/props.c | 138 --------------------------------------- src/pulsecore/props.h | 61 ----------------- src/pulsecore/protocol-native.c | 2 +- src/pulsecore/shared.c | 138 +++++++++++++++++++++++++++++++++++++++ src/pulsecore/shared.h | 61 +++++++++++++++++ src/pulsecore/x11wrap.c | 2 +- 12 files changed, 208 insertions(+), 208 deletions(-) delete mode 100644 src/pulsecore/props.c delete mode 100644 src/pulsecore/props.h create mode 100644 src/pulsecore/shared.c create mode 100644 src/pulsecore/shared.h diff --git a/src/Makefile.am b/src/Makefile.am index 63707192..268409bd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -686,7 +686,7 @@ noinst_HEADERS = \ pulsecore/pid.h \ pulsecore/play-memchunk.h \ pulsecore/play-memblockq.h \ - pulsecore/props.h \ + pulsecore/shared.h \ pulsecore/queue.h \ pulsecore/random.h \ pulsecore/resampler.h \ @@ -758,7 +758,7 @@ libpulsecore_la_SOURCES += \ pulsecore/play-memchunk.c pulsecore/play-memchunk.h \ pulsecore/play-memblockq.c pulsecore/play-memblockq.h \ pulsecore/poll.c pulsecore/poll.h \ - pulsecore/props.c pulsecore/props.h \ + pulsecore/shared.c pulsecore/shared.h \ pulsecore/queue.c pulsecore/queue.h \ pulsecore/random.c pulsecore/random.h \ pulsecore/resampler.c pulsecore/resampler.h \ diff --git a/src/modules/dbus-util.c b/src/modules/dbus-util.c index e18b6ab9..8e0066bc 100644 --- a/src/modules/dbus-util.c +++ b/src/modules/dbus-util.c @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include "dbus-util.h" diff --git a/src/modules/module-x11-publish.c b/src/modules/module-x11-publish.c index d0ce344f..4ef4873a 100644 --- a/src/modules/module-x11-publish.c +++ b/src/modules/module-x11-publish.c @@ -47,7 +47,7 @@ #include #include #include -#include +#include #include "module-x11-publish-symdef.h" diff --git a/src/pulsecore/authkey-prop.c b/src/pulsecore/authkey-prop.c index 9e147ec1..d52bdcf4 100644 --- a/src/pulsecore/authkey-prop.c +++ b/src/pulsecore/authkey-prop.c @@ -27,7 +27,7 @@ #include -#include +#include #include #include #include diff --git a/src/pulsecore/cli-command.c b/src/pulsecore/cli-command.c index 43ec1042..0bd4070c 100644 --- a/src/pulsecore/cli-command.c +++ b/src/pulsecore/cli-command.c @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c index 9aabd37d..fd836fb2 100644 --- a/src/pulsecore/core.c +++ b/src/pulsecore/core.c @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/pulsecore/props.c b/src/pulsecore/props.c deleted file mode 100644 index 1bfb297a..00000000 --- a/src/pulsecore/props.c +++ /dev/null @@ -1,138 +0,0 @@ -/*** - This file is part of PulseAudio. - - Copyright 2004-2006 Lennart Poettering - - 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 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 - 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 -#endif - -#include -#include -#include - -#include "props.h" - -typedef struct pa_shared { - char *name; /* Points to memory allocated by the shared property system */ - void *data; /* Points to memory maintained by the caller */ -} pa_shared; - -/* Allocate a new shared property object */ -static pa_shared* shared_new(const char *name, void *data) { - pa_shared* p; - - pa_assert(name); - pa_assert(data); - - p = pa_xnew(pa_shared, 1); - p->name = pa_xstrdup(name); - p->data = data; - - return p; -} - -/* Free a shared property object */ -static void shared_free(pa_shared *p) { - pa_assert(p); - - pa_xfree(p->name); - pa_xfree(p); -} - -void* pa_shared_get(pa_core *c, const char *name) { - pa_shared *p; - - pa_assert(c); - pa_assert(name); - pa_assert(c->shared); - - if (!(p = pa_hashmap_get(c->shared, name))) - return NULL; - - return p->data; -} - -int pa_shared_set(pa_core *c, const char *name, void *data) { - pa_shared *p; - - pa_assert(c); - pa_assert(name); - pa_assert(data); - pa_assert(c->shared); - - if (pa_hashmap_get(c->shared, name)) - return -1; - - p = shared_new(name, data); - pa_hashmap_put(c->shared, p->name, p); - return 0; -} - -int pa_shared_remove(pa_core *c, const char *name) { - pa_shared *p; - - pa_assert(c); - pa_assert(name); - pa_assert(c->shared); - - if (!(p = pa_hashmap_remove(c->shared, name))) - return -1; - - shared_free(p); - return 0; -} - -void pa_shared_init(pa_core *c) { - pa_assert(c); - - c->shared = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func); -} - -void pa_shared_cleanup(pa_core *c) { - pa_assert(c); - - if (!c->shared) - return; - - pa_assert(pa_hashmap_isempty(c->shared)); - - pa_hashmap_free(c->shared, NULL, NULL); - c->shared = NULL; - -} - -void pa_shared_dump(pa_core *c, pa_strbuf *s) { - void *state = NULL; - pa_shared *p; - - pa_assert(c); - pa_assert(s); - - while ((p = pa_hashmap_iterate(c->shared, &state, NULL))) - pa_strbuf_printf(s, "[%s] -> [%p]\n", p->name, p->data); -} - -int pa_shared_replace(pa_core *c, const char *name, void *data) { - pa_assert(c); - pa_assert(name); - - pa_shared_remove(c, name); - return pa_shared_set(c, name, data); -} diff --git a/src/pulsecore/props.h b/src/pulsecore/props.h deleted file mode 100644 index dd3f94e2..00000000 --- a/src/pulsecore/props.h +++ /dev/null @@ -1,61 +0,0 @@ -#ifndef foosharedshfoo -#define foosharedshfoo - -/*** - This file is part of PulseAudio. - - Copyright 2004-2006 Lennart Poettering - - 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 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 - 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. -***/ - -#include -#include - -/* The shared property subsystem is to be used to share data between - * modules. Consider them to be kind of "global" variables for a - * core. Why not use the hashmap functions directly? The hashmap - * functions copy neither the key nor value, while this property - * system copies the key. Users of this system have to think about - * reference counting themselves. */ - -/* Note: please don't confuse this with the proplist framework in - * pulse/proplist.[ch]! */ - -/* Return a pointer to the value of the specified shared property. */ -void* pa_shared_get(pa_core *c, const char *name); - -/* Set the shared property 'name' to 'data'. This function fails in - * case a property by this name already exists. The property data is - * not copied or reference counted. This is the caller's job. */ -int pa_shared_set(pa_core *c, const char *name, void *data); - -/* Remove the specified shared property. Return non-zero on failure */ -int pa_shared_remove(pa_core *c, const char *name); - -/* A combination of pa_shared_remove() and pa_shared_set() */ -int pa_shared_replace(pa_core *c, const char *name, void *data); - -/* Free all memory used by the shared property system */ -void pa_shared_cleanup(pa_core *c); - -/* Initialize the shared property system */ -void pa_shared_init(pa_core *c); - -/* Dump the current set of shared properties */ -void pa_shared_dump(pa_core *c, pa_strbuf *s); - -#endif diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c index f279b6af..853f2447 100644 --- a/src/pulsecore/protocol-native.c +++ b/src/pulsecore/protocol-native.c @@ -52,7 +52,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/pulsecore/shared.c b/src/pulsecore/shared.c new file mode 100644 index 00000000..77d919d3 --- /dev/null +++ b/src/pulsecore/shared.c @@ -0,0 +1,138 @@ +/*** + This file is part of PulseAudio. + + Copyright 2004-2006 Lennart Poettering + + 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 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 + 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 +#endif + +#include +#include +#include + +#include "shared.h" + +typedef struct pa_shared { + char *name; /* Points to memory allocated by the shared property system */ + void *data; /* Points to memory maintained by the caller */ +} pa_shared; + +/* Allocate a new shared property object */ +static pa_shared* shared_new(const char *name, void *data) { + pa_shared* p; + + pa_assert(name); + pa_assert(data); + + p = pa_xnew(pa_shared, 1); + p->name = pa_xstrdup(name); + p->data = data; + + return p; +} + +/* Free a shared property object */ +static void shared_free(pa_shared *p) { + pa_assert(p); + + pa_xfree(p->name); + pa_xfree(p); +} + +void* pa_shared_get(pa_core *c, const char *name) { + pa_shared *p; + + pa_assert(c); + pa_assert(name); + pa_assert(c->shared); + + if (!(p = pa_hashmap_get(c->shared, name))) + return NULL; + + return p->data; +} + +int pa_shared_set(pa_core *c, const char *name, void *data) { + pa_shared *p; + + pa_assert(c); + pa_assert(name); + pa_assert(data); + pa_assert(c->shared); + + if (pa_hashmap_get(c->shared, name)) + return -1; + + p = shared_new(name, data); + pa_hashmap_put(c->shared, p->name, p); + return 0; +} + +int pa_shared_remove(pa_core *c, const char *name) { + pa_shared *p; + + pa_assert(c); + pa_assert(name); + pa_assert(c->shared); + + if (!(p = pa_hashmap_remove(c->shared, name))) + return -1; + + shared_free(p); + return 0; +} + +void pa_shared_init(pa_core *c) { + pa_assert(c); + + c->shared = pa_hashmap_new(pa_idxset_string_hash_func, pa_idxset_string_compare_func); +} + +void pa_shared_cleanup(pa_core *c) { + pa_assert(c); + + if (!c->shared) + return; + + pa_assert(pa_hashmap_isempty(c->shared)); + + pa_hashmap_free(c->shared, NULL, NULL); + c->shared = NULL; + +} + +void pa_shared_dump(pa_core *c, pa_strbuf *s) { + void *state = NULL; + pa_shared *p; + + pa_assert(c); + pa_assert(s); + + while ((p = pa_hashmap_iterate(c->shared, &state, NULL))) + pa_strbuf_printf(s, "[%s] -> [%p]\n", p->name, p->data); +} + +int pa_shared_replace(pa_core *c, const char *name, void *data) { + pa_assert(c); + pa_assert(name); + + pa_shared_remove(c, name); + return pa_shared_set(c, name, data); +} diff --git a/src/pulsecore/shared.h b/src/pulsecore/shared.h new file mode 100644 index 00000000..dd3f94e2 --- /dev/null +++ b/src/pulsecore/shared.h @@ -0,0 +1,61 @@ +#ifndef foosharedshfoo +#define foosharedshfoo + +/*** + This file is part of PulseAudio. + + Copyright 2004-2006 Lennart Poettering + + 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 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 + 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. +***/ + +#include +#include + +/* The shared property subsystem is to be used to share data between + * modules. Consider them to be kind of "global" variables for a + * core. Why not use the hashmap functions directly? The hashmap + * functions copy neither the key nor value, while this property + * system copies the key. Users of this system have to think about + * reference counting themselves. */ + +/* Note: please don't confuse this with the proplist framework in + * pulse/proplist.[ch]! */ + +/* Return a pointer to the value of the specified shared property. */ +void* pa_shared_get(pa_core *c, const char *name); + +/* Set the shared property 'name' to 'data'. This function fails in + * case a property by this name already exists. The property data is + * not copied or reference counted. This is the caller's job. */ +int pa_shared_set(pa_core *c, const char *name, void *data); + +/* Remove the specified shared property. Return non-zero on failure */ +int pa_shared_remove(pa_core *c, const char *name); + +/* A combination of pa_shared_remove() and pa_shared_set() */ +int pa_shared_replace(pa_core *c, const char *name, void *data); + +/* Free all memory used by the shared property system */ +void pa_shared_cleanup(pa_core *c); + +/* Initialize the shared property system */ +void pa_shared_init(pa_core *c); + +/* Dump the current set of shared properties */ +void pa_shared_dump(pa_core *c, pa_strbuf *s); + +#endif diff --git a/src/pulsecore/x11wrap.c b/src/pulsecore/x11wrap.c index 9186cf74..1519aa86 100644 --- a/src/pulsecore/x11wrap.c +++ b/src/pulsecore/x11wrap.c @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include -- cgit From 06712c2a86cb829aa1d7de47bf9a291a157d45b4 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 3 Aug 2008 16:15:37 +0200 Subject: add new auth cookie singleton --- src/pulsecore/auth-cookie.c | 109 ++++++++++++++++++++++++++++++++++++++++++++ src/pulsecore/auth-cookie.h | 35 ++++++++++++++ 2 files changed, 144 insertions(+) create mode 100644 src/pulsecore/auth-cookie.c create mode 100644 src/pulsecore/auth-cookie.h diff --git a/src/pulsecore/auth-cookie.c b/src/pulsecore/auth-cookie.c new file mode 100644 index 00000000..68b01473 --- /dev/null +++ b/src/pulsecore/auth-cookie.c @@ -0,0 +1,109 @@ +/*** + This file is part of PulseAudio. + + Copyright 2008 Lennart Poettering + + 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 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 + 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 +#endif + +#include + +#include +#include + +#include +#include +#include +#include +#include + +#include "auth-cookie.h" + +struct pa_auth_cookie { + PA_REFCNT_DECLARE; + pa_core *core; + char *name; + size_t size; +}; + +pa_auth_cookie* pa_auth_cookie_get(pa_core *core, const char *cn, size_t size) { + pa_auth_cookie *c; + char *t; + + pa_assert(core); + pa_assert(size > 0); + + t = pa_sprintf_malloc("auth-cookie%s%s", cn ? "@" : "", cn ? cn : ""); + + if ((c = pa_shared_get(core, t))) { + + pa_xfree(t); + + if (c->size != size) + return NULL; + + return pa_auth_cookie_ref(c); + } + + c = pa_xmalloc(PA_ALIGN(sizeof(pa_auth_cookie)) + size); + PA_REFCNT_INIT(c); + c->core = core; + c->name = t; + c->size = size; + + pa_assert_se(pa_shared_set(core, t, c) >= 0); + + if (pa_authkey_load_auto(cn, (uint8_t*) c + PA_ALIGN(sizeof(pa_auth_cookie)), size) < 0) { + pa_auth_cookie_unref(c); + return NULL; + } + + return c; +} + +pa_auth_cookie* pa_auth_cookie_ref(pa_auth_cookie *c) { + pa_assert(c); + pa_assert(PA_REFCNT_VALUE(c) >= 1); + + PA_REFCNT_INC(c); + + return c; +} + +void pa_auth_cookie_unref(pa_auth_cookie *c) { + pa_assert(c); + pa_assert(PA_REFCNT_VALUE(c) >= 1); + + if (PA_REFCNT_DEC(c) > 0) + return; + + pa_assert_se(pa_shared_remove(c->core, c->name) >= 0); + + pa_xfree(c->name); + pa_xfree(c); +} + +const uint8_t* pa_auth_cookie_read(pa_auth_cookie *c, size_t size) { + pa_assert(c); + pa_assert(PA_REFCNT_VALUE(c) >= 1); + pa_assert(c->size == size); + + return (const uint8_t*) c + PA_ALIGN(sizeof(pa_auth_cookie)); +} diff --git a/src/pulsecore/auth-cookie.h b/src/pulsecore/auth-cookie.h new file mode 100644 index 00000000..c08cbd82 --- /dev/null +++ b/src/pulsecore/auth-cookie.h @@ -0,0 +1,35 @@ +#ifndef fooauthcookiehfoo +#define fooauthcookiehfoo + +/*** + This file is part of PulseAudio. + + Copyright 2008 Lennart Poettering + + 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 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 + 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. +***/ + +#include + +typedef struct pa_auth_cookie pa_auth_cookie; + +pa_auth_cookie* pa_auth_cookie_get(pa_core *c, const char *cn, size_t size); +pa_auth_cookie* pa_auth_cookie_ref(pa_auth_cookie *c); +void pa_auth_cookie_unref(pa_auth_cookie *c); + +const uint8_t* pa_auth_cookie_read(pa_auth_cookie *, size_t size); + +#endif -- cgit From 32f63f2a61e91b37e1725923f3894ee41d8a8cb7 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 3 Aug 2008 16:16:22 +0200 Subject: allow running of PA with a valgring that doesn't know cap_set_caps --- src/daemon/caps.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/daemon/caps.c b/src/daemon/caps.c index ae07119c..8a49e373 100644 --- a/src/daemon/caps.c +++ b/src/daemon/caps.c @@ -109,6 +109,14 @@ void pa_limit_caps(void) { void pa_drop_caps(void) { cap_t caps; +#ifndef __OPTIMIZE__ + /* Valgrind doesn't not know set_caps, so we bypass it here -- but + * only in development builts.*/ + + if (getenv("VALGRIND") && !pa_have_caps()) + return; +#endif + pa_assert_se(prctl(PR_SET_KEEPCAPS, 0, 0, 0, 0) == 0); pa_assert_se(caps = cap_init()); @@ -123,7 +131,12 @@ pa_bool_t pa_have_caps(void) { cap_t caps; cap_flag_value_t flag = CAP_CLEAR; +#ifdef __OPTIMIZE__ pa_assert_se(caps = cap_get_proc()); +#else + if (!(caps = cap_get_proc())) + return FALSE; +#endif pa_assert_se(cap_get_flag(caps, CAP_SYS_NICE, CAP_EFFECTIVE, &flag) >= 0); pa_assert_se(cap_free(caps) == 0); -- cgit From 5916b5bc2d66da7cf4acfac00e5b784c5476df5f Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 3 Aug 2008 16:17:17 +0200 Subject: make sure we don't leak userdata struct --- src/modules/module-default-device-restore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/module-default-device-restore.c b/src/modules/module-default-device-restore.c index 2168ac71..7f21efa0 100644 --- a/src/modules/module-default-device-restore.c +++ b/src/modules/module-default-device-restore.c @@ -158,7 +158,7 @@ int pa__init(pa_module *m) { pa_assert(m); - u = pa_xnew0(struct userdata, 1); + m->userdata = u = pa_xnew0(struct userdata, 1); u->core = m->core; if (!(u->sink_filename = pa_state_path(DEFAULT_SINK_FILE))) -- cgit From 34c435480fc2c6110994efac5ab85e27bcd653d9 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 3 Aug 2008 16:17:50 +0200 Subject: use @ as seperator between shared name variable and instance --- src/pulsecore/x11wrap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pulsecore/x11wrap.c b/src/pulsecore/x11wrap.c index 1519aa86..353b120b 100644 --- a/src/pulsecore/x11wrap.c +++ b/src/pulsecore/x11wrap.c @@ -223,7 +223,8 @@ pa_x11_wrapper* pa_x11_wrapper_get(pa_core *c, const char *name) { pa_core_assert_ref(c); - pa_snprintf(t, sizeof(t), "x11-wrapper%s%s", name ? "-" : "", name ? name : ""); + pa_snprintf(t, sizeof(t), "x11-wrapper%s%s", name ? "@" : "", name ? name : ""); + if ((w = pa_shared_get(c, t))) return pa_x11_wrapper_ref(w); -- cgit From 084f4292f6d1f36ae175b9fd1de070dc942ff29e Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 3 Aug 2008 16:21:08 +0200 Subject: rename pa_hook_free() to pa_hook_done() since the hook struct is allocated on the stack not via malloc --- src/pulsecore/core.c | 2 +- src/pulsecore/hook-list.c | 2 +- src/pulsecore/hook-list.h | 2 +- src/tests/hook-list-test.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c index fd836fb2..1907fcaf 100644 --- a/src/pulsecore/core.c +++ b/src/pulsecore/core.c @@ -192,7 +192,7 @@ static void core_free(pa_object *o) { pa_shared_cleanup(c); for (j = 0; j < PA_CORE_HOOK_MAX; j++) - pa_hook_free(&c->hooks[j]); + pa_hook_done(&c->hooks[j]); pa_xfree(c); } diff --git a/src/pulsecore/hook-list.c b/src/pulsecore/hook-list.c index 0aac4759..39694038 100644 --- a/src/pulsecore/hook-list.c +++ b/src/pulsecore/hook-list.c @@ -44,7 +44,7 @@ static void slot_free(pa_hook *hook, pa_hook_slot *slot) { pa_xfree(slot); } -void pa_hook_free(pa_hook *hook) { +void pa_hook_done(pa_hook *hook) { pa_assert(hook); pa_assert(hook->n_firing == 0); diff --git a/src/pulsecore/hook-list.h b/src/pulsecore/hook-list.h index cf85aca5..de947ad5 100644 --- a/src/pulsecore/hook-list.h +++ b/src/pulsecore/hook-list.h @@ -64,7 +64,7 @@ struct pa_hook { }; void pa_hook_init(pa_hook *hook, void *data); -void pa_hook_free(pa_hook *hook); +void pa_hook_done(pa_hook *hook); pa_hook_slot* pa_hook_connect(pa_hook *hook, pa_hook_priority_t prio, pa_hook_cb_t cb, void *data); void pa_hook_slot_free(pa_hook_slot *slot); diff --git a/src/tests/hook-list-test.c b/src/tests/hook-list-test.c index 60b965cd..452e4776 100644 --- a/src/tests/hook-list-test.c +++ b/src/tests/hook-list-test.c @@ -31,7 +31,7 @@ int main(int argc, char *argv[]) { pa_hook_fire(&hook, (void*) "call2"); - pa_hook_free(&hook); + pa_hook_done(&hook); return 0; } -- cgit From 5042284d45b524f1201232f6c09fda65977b70cc Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 3 Aug 2008 16:41:52 +0200 Subject: introduce pa_cli_eof_cb_t --- src/pulsecore/cli.c | 12 ++++++------ src/pulsecore/cli.h | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/pulsecore/cli.c b/src/pulsecore/cli.c index b3c639f8..2057b67a 100644 --- a/src/pulsecore/cli.c +++ b/src/pulsecore/cli.c @@ -52,7 +52,7 @@ struct pa_cli { pa_core *core; pa_ioline *line; - void (*eof_callback)(pa_cli *c, void *userdata); + pa_cli_eof_cb_t eof_callback; void *userdata; pa_client *client; @@ -107,12 +107,11 @@ static void client_kill(pa_client *client) { pa_assert_se(c = client->userdata); pa_log_debug("CLI client killed."); + if (c->defer_kill) c->kill_requested = TRUE; - else { - if (c->eof_callback) - c->eof_callback(c, c->userdata); - } + else if (c->eof_callback) + c->eof_callback(c, c->userdata); } static void line_callback(pa_ioline *line, const char *s, void *userdata) { @@ -125,6 +124,7 @@ static void line_callback(pa_ioline *line, const char *s, void *userdata) { if (!s) { pa_log_debug("CLI got EOF from user."); + if (c->eof_callback) c->eof_callback(c, c->userdata); @@ -145,7 +145,7 @@ static void line_callback(pa_ioline *line, const char *s, void *userdata) { pa_ioline_puts(line, PROMPT); } -void pa_cli_set_eof_callback(pa_cli *c, void (*cb)(pa_cli*c, void *userdata), void *userdata) { +void pa_cli_set_eof_callback(pa_cli *c, pa_cli_eof_cb_t cb, void *userdata) { pa_assert(c); c->eof_callback = cb; diff --git a/src/pulsecore/cli.h b/src/pulsecore/cli.h index 6077a8e8..3f7a6fa4 100644 --- a/src/pulsecore/cli.h +++ b/src/pulsecore/cli.h @@ -28,6 +28,8 @@ typedef struct pa_cli pa_cli; +typedef void (*pa_cli_eof_cb_t)(pa_cli *c, void *userdata); + /* Create a new command line session on the specified io channel owned by the specified module */ pa_cli* pa_cli_new(pa_core *core, pa_iochannel *io, pa_module *m); void pa_cli_free(pa_cli *cli); -- cgit From 0a2fced2ee54917819a5cbbfd631419c7540965b Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 3 Aug 2008 16:42:16 +0200 Subject: add new api function pa_cli_get_module() --- src/pulsecore/cli.c | 6 ++++++ src/pulsecore/cli.h | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/pulsecore/cli.c b/src/pulsecore/cli.c index 2057b67a..67bf1e73 100644 --- a/src/pulsecore/cli.c +++ b/src/pulsecore/cli.c @@ -151,3 +151,9 @@ void pa_cli_set_eof_callback(pa_cli *c, pa_cli_eof_cb_t cb, void *userdata) { c->eof_callback = cb; c->userdata = userdata; } + +pa_module *pa_cli_get_module(pa_cli *c) { + pa_assert(c); + + return c->client->module; +} diff --git a/src/pulsecore/cli.h b/src/pulsecore/cli.h index 3f7a6fa4..d8604611 100644 --- a/src/pulsecore/cli.h +++ b/src/pulsecore/cli.h @@ -35,6 +35,8 @@ pa_cli* pa_cli_new(pa_core *core, pa_iochannel *io, pa_module *m); void pa_cli_free(pa_cli *cli); /* Set a callback function that is called whenever the command line session is terminated */ -void pa_cli_set_eof_callback(pa_cli *cli, void (*cb)(pa_cli*c, void *userdata), void *userdata); +void pa_cli_set_eof_callback(pa_cli *cli, pa_cli_eof_cb_t cb, void *userdata); + +pa_module *pa_cli_get_module(pa_cli *c); #endif -- cgit From 1ae1dfcc1062d08360c8253e885993d2a693d81c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 3 Aug 2008 16:42:41 +0200 Subject: simplify a bit --- src/pulsecore/x11wrap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pulsecore/x11wrap.c b/src/pulsecore/x11wrap.c index 353b120b..17f8e6a4 100644 --- a/src/pulsecore/x11wrap.c +++ b/src/pulsecore/x11wrap.c @@ -243,8 +243,10 @@ void pa_x11_wrapper_unref(pa_x11_wrapper* w) { pa_assert(w); pa_assert(PA_REFCNT_VALUE(w) >= 1); - if (PA_REFCNT_DEC(w) <= 0) - x11_wrapper_free(w); + if (PA_REFCNT_DEC(w) > 0) + return; + + x11_wrapper_free(w); } Display *pa_x11_wrapper_get_display(pa_x11_wrapper *w) { -- cgit From aaaafb059cfb523d8034425f1429af47b9e55e1a Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 3 Aug 2008 16:43:51 +0200 Subject: use pa_channel_map_init_extend() instead of pa_channel_map_init_auto() to make things more robust --- src/pulsecore/modargs.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/pulsecore/modargs.c b/src/pulsecore/modargs.c index 5f5902c9..d257b4ce 100644 --- a/src/pulsecore/modargs.c +++ b/src/pulsecore/modargs.c @@ -322,8 +322,7 @@ int pa_modargs_get_sample_spec_and_channel_map(pa_modargs *ma, pa_sample_spec *r if (pa_modargs_get_sample_spec(ma, &ss) < 0) return -1; - if (!pa_channel_map_init_auto(&map, ss.channels, def)) - map.channels = 0; + pa_channel_map_init_extend(&map, ss.channels, def); if (pa_modargs_get_channel_map(ma, NULL, &map) < 0) return -1; -- cgit From 065e7644acf6cdbda0611b69ef06f97cda960110 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 3 Aug 2008 16:44:38 +0200 Subject: make all protocol objects global singletons --- src/Makefile.am | 18 +- src/modules/module-native-protocol-fd.c | 24 +- src/modules/module-protocol-stub.c | 403 ++++++++++++++++++++------------ src/modules/module-tunnel.c | 44 +--- src/modules/module-x11-publish.c | 101 ++++---- src/pulsecore/protocol-cli.c | 87 +++++-- src/pulsecore/protocol-cli.h | 9 +- src/pulsecore/protocol-esound.c | 269 ++++++++++++++------- src/pulsecore/protocol-esound.h | 30 ++- src/pulsecore/protocol-http.c | 96 +++++--- src/pulsecore/protocol-http.h | 12 +- src/pulsecore/protocol-native.c | 391 ++++++++++++++++++------------- src/pulsecore/protocol-native.h | 42 +++- src/pulsecore/protocol-simple.c | 218 ++++++++++------- src/pulsecore/protocol-simple.h | 28 ++- 15 files changed, 1132 insertions(+), 640 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 268409bd..2770b934 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -827,7 +827,7 @@ noinst_HEADERS += \ pulsecore/pstream-util.h \ pulsecore/pdispatch.h \ pulsecore/authkey.h \ - pulsecore/authkey-prop.h \ + pulsecore/auth-cookie.h \ pulsecore/strlist.h \ pulsecore/protocol-simple.h \ pulsecore/esound.h \ @@ -857,7 +857,7 @@ modlibexec_LTLIBRARIES = \ libpstream-util.la \ libpdispatch.la \ libauthkey.la \ - libauthkey-prop.la \ + libauth-cookie.la \ libstrlist.la \ libprotocol-simple.la \ libprotocol-http.la \ @@ -958,7 +958,7 @@ libprotocol_http_la_LIBADD = $(AM_LIBADD) libsocket-server.la libioline.la libpu libprotocol_native_la_SOURCES = pulsecore/protocol-native.c pulsecore/protocol-native.h pulsecore/native-common.h libprotocol_native_la_LDFLAGS = -avoid-version -libprotocol_native_la_LIBADD = $(AM_LIBADD) libsocket-server.la libpstream.la libpstream-util.la libpdispatch.la libtagstruct.la libauthkey.la libauthkey-prop.la libstrlist.la libpulsecore.la libiochannel.la libipacl.la +libprotocol_native_la_LIBADD = $(AM_LIBADD) libsocket-server.la libpstream.la libpstream-util.la libpdispatch.la libtagstruct.la libauthkey.la libauth-cookie.la libstrlist.la libpulsecore.la libiochannel.la libipacl.la libtagstruct_la_SOURCES = pulsecore/tagstruct.c pulsecore/tagstruct.h libtagstruct_la_LDFLAGS = -avoid-version @@ -972,9 +972,9 @@ libauthkey_la_SOURCES = pulsecore/authkey.c pulsecore/authkey.h libauthkey_la_LDFLAGS = -avoid-version libauthkey_la_LIBADD = $(AM_LIBADD) libpulsecore.la -libauthkey_prop_la_SOURCES = pulsecore/authkey-prop.c pulsecore/authkey-prop.h -libauthkey_prop_la_LDFLAGS = -avoid-version -libauthkey_prop_la_LIBADD = $(AM_LIBADD) libpulsecore.la +libauth_cookie_la_SOURCES = pulsecore/auth-cookie.c pulsecore/auth-cookie.h +libauth_cookie_la_LDFLAGS = -avoid-version +libauth_cookie_la_LIBADD = $(AM_LIBADD) libpulsecore.la libsocket_util_la_SOURCES = \ pulsecore/inet_ntop.c pulsecore/inet_ntop.h \ @@ -1339,11 +1339,11 @@ module_match_la_LIBADD = $(AM_LIBADD) libpulsecore.la module_tunnel_sink_la_SOURCES = modules/module-tunnel.c module_tunnel_sink_la_CFLAGS = -DTUNNEL_SINK=1 $(AM_CFLAGS) module_tunnel_sink_la_LDFLAGS = -module -avoid-version -module_tunnel_sink_la_LIBADD = $(AM_LIBADD) libpulsecore.la libsocket-client.la libpstream.la libpstream-util.la libpdispatch.la libtagstruct.la libauthkey.la libauthkey-prop.la libsocket-util.la libiochannel.la +module_tunnel_sink_la_LIBADD = $(AM_LIBADD) libpulsecore.la libsocket-client.la libpstream.la libpstream-util.la libpdispatch.la libtagstruct.la libauthkey.la libauth-cookie.la libsocket-util.la libiochannel.la module_tunnel_source_la_SOURCES = modules/module-tunnel.c module_tunnel_source_la_LDFLAGS = -module -avoid-version -module_tunnel_source_la_LIBADD = $(AM_LIBADD) libpulsecore.la libsocket-client.la libpstream.la libpstream-util.la libpdispatch.la libtagstruct.la libauthkey.la libauthkey-prop.la libsocket-util.la libiochannel.la +module_tunnel_source_la_LIBADD = $(AM_LIBADD) libpulsecore.la libsocket-client.la libpstream.la libpstream-util.la libpdispatch.la libtagstruct.la libauthkey.la libauth-cookie.la libsocket-util.la libiochannel.la # X11 @@ -1355,7 +1355,7 @@ module_x11_bell_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA module_x11_publish_la_SOURCES = modules/module-x11-publish.c module_x11_publish_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) module_x11_publish_la_LDFLAGS = -module -avoid-version -module_x11_publish_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS) libx11wrap.la libauthkey.la libauthkey-prop.la libx11prop.la libstrlist.la libpulsecore.la +module_x11_publish_la_LIBADD = $(AM_LIBADD) $(X_PRE_LIBS) -lX11 $(X_LIBS) $(X_EXTRA_LIBS) libx11wrap.la libauthkey.la libauth-cookie.la libx11prop.la libstrlist.la libpulsecore.la module_x11_xsmp_la_SOURCES = modules/module-x11-xsmp.c module_x11_xsmp_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) diff --git a/src/modules/module-native-protocol-fd.c b/src/modules/module-native-protocol-fd.c index 1a6f5368..fa9c0e4f 100644 --- a/src/modules/module-native-protocol-fd.c +++ b/src/modules/module-native-protocol-fd.c @@ -42,8 +42,6 @@ PA_MODULE_LOAD_ONCE(TRUE); static const char* const valid_modargs[] = { "fd", - "public", - "cookie", NULL, }; @@ -51,6 +49,7 @@ int pa__init(pa_module*m) { pa_iochannel *io; pa_modargs *ma; int fd, r = -1; + pa_native_options *options = NULL; pa_assert(m); @@ -64,12 +63,17 @@ int pa__init(pa_module*m) { goto finish; } + options = pa_native_options_new(); + options->module = m; + options->auth_anonymous = TRUE; + io = pa_iochannel_new(m->core->mainloop, fd, fd); - if (!(m->userdata = pa_protocol_native_new_iochannel(m->core, io, m, ma))) { - pa_iochannel_free(io); - goto finish; - } + m->userdata = pa_native_protocol_get(m->core); + + pa_native_protocol_connect(m->userdata, io, options); + + pa_native_options_unref(options); r = 0; @@ -77,11 +81,17 @@ finish: if (ma) pa_modargs_free(ma); + if (options) + pa_native_options_unref(options); + return r; } void pa__done(pa_module*m) { pa_assert(m); - pa_protocol_native_free(m->userdata); + if (m->userdata) { + pa_native_protocol_disconnect(m->userdata, m); + pa_native_protocol_unref(m->userdata); + } } diff --git a/src/modules/module-protocol-stub.c b/src/modules/module-protocol-stub.c index 0c9529c3..8136c6fc 100644 --- a/src/modules/module-protocol-stub.c +++ b/src/modules/module-protocol-stub.c @@ -62,19 +62,19 @@ #endif #if defined(USE_PROTOCOL_SIMPLE) - #include - #define protocol_new pa_protocol_simple_new - #define protocol_free pa_protocol_simple_free - #define TCPWRAP_SERVICE "pulseaudio-simple" - #define IPV4_PORT 4711 - #define UNIX_SOCKET "simple" - #define MODULE_ARGUMENTS "rate", "format", "channels", "sink", "source", "playback", "record", - #if defined(USE_TCP_SOCKETS) - #include "module-simple-protocol-tcp-symdef.h" - #else - #include "module-simple-protocol-unix-symdef.h" - #endif -PA_MODULE_DESCRIPTION("Simple protocol "SOCKET_DESCRIPTION); +# include +# define TCPWRAP_SERVICE "pulseaudio-simple" +# define IPV4_PORT 4711 +# define UNIX_SOCKET "simple" +# define MODULE_ARGUMENTS "rate", "format", "channels", "sink", "source", "playback", "record", + +# if defined(USE_TCP_SOCKETS) +# include "module-simple-protocol-tcp-symdef.h" +# else +# include "module-simple-protocol-unix-symdef.h" +# endif + + PA_MODULE_DESCRIPTION("Simple protocol "SOCKET_DESCRIPTION); PA_MODULE_USAGE("rate= " "format= " "channels= " @@ -84,96 +84,96 @@ PA_MODULE_DESCRIPTION("Simple protocol "SOCKET_DESCRIPTION); "record= " SOCKET_USAGE); #elif defined(USE_PROTOCOL_CLI) - #include - #define protocol_new pa_protocol_cli_new - #define protocol_free pa_protocol_cli_free - #define TCPWRAP_SERVICE "pulseaudio-cli" - #define IPV4_PORT 4712 - #define UNIX_SOCKET "cli" - #define MODULE_ARGUMENTS - #ifdef USE_TCP_SOCKETS - #include "module-cli-protocol-tcp-symdef.h" - #else - #include "module-cli-protocol-unix-symdef.h" - #endif +# include +# define TCPWRAP_SERVICE "pulseaudio-cli" +# define IPV4_PORT 4712 +# define UNIX_SOCKET "cli" +# define MODULE_ARGUMENTS + +# ifdef USE_TCP_SOCKETS +# include "module-cli-protocol-tcp-symdef.h" +# else +# include "module-cli-protocol-unix-symdef.h" +# endif + PA_MODULE_DESCRIPTION("Command line interface protocol "SOCKET_DESCRIPTION); PA_MODULE_USAGE(SOCKET_USAGE); #elif defined(USE_PROTOCOL_HTTP) - #include - #define protocol_new pa_protocol_http_new - #define protocol_free pa_protocol_http_free - #define TCPWRAP_SERVICE "pulseaudio-http" - #define IPV4_PORT 4714 - #define UNIX_SOCKET "http" - #define MODULE_ARGUMENTS - #ifdef USE_TCP_SOCKETS - #include "module-http-protocol-tcp-symdef.h" - #else - #include "module-http-protocol-unix-symdef.h" - #endif +# include +# define TCPWRAP_SERVICE "pulseaudio-http" +# define IPV4_PORT 4714 +# define UNIX_SOCKET "http" +# define MODULE_ARGUMENTS + +# ifdef USE_TCP_SOCKETS +# include "module-http-protocol-tcp-symdef.h" +# else +# include "module-http-protocol-unix-symdef.h" +# endif + PA_MODULE_DESCRIPTION("HTTP "SOCKET_DESCRIPTION); PA_MODULE_USAGE(SOCKET_USAGE); #elif defined(USE_PROTOCOL_NATIVE) - #include - #define protocol_new pa_protocol_native_new - #define protocol_free pa_protocol_native_free - #define TCPWRAP_SERVICE "pulseaudio-native" - #define IPV4_PORT PA_NATIVE_DEFAULT_PORT - #define UNIX_SOCKET PA_NATIVE_DEFAULT_UNIX_SOCKET - #define MODULE_ARGUMENTS_COMMON "cookie", "auth-anonymous", - #ifdef USE_TCP_SOCKETS - #include "module-native-protocol-tcp-symdef.h" - #else - #include "module-native-protocol-unix-symdef.h" - #endif - - #if defined(HAVE_CREDS) && !defined(USE_TCP_SOCKETS) - #define MODULE_ARGUMENTS MODULE_ARGUMENTS_COMMON "auth-group", "auth-group-enable", - #define AUTH_USAGE "auth-group= auth-group-enable= " - #elif defined(USE_TCP_SOCKETS) - #define MODULE_ARGUMENTS MODULE_ARGUMENTS_COMMON "auth-ip-acl", - #define AUTH_USAGE "auth-ip-acl= " - #else - #define MODULE_ARGUMENTS MODULE_ARGUMENTS_COMMON - #define AUTH_USAGE - #endif +# include +# define TCPWRAP_SERVICE "pulseaudio-native" +# define IPV4_PORT PA_NATIVE_DEFAULT_PORT +# define UNIX_SOCKET PA_NATIVE_DEFAULT_UNIX_SOCKET +# define MODULE_ARGUMENTS_COMMON "cookie", "auth-cookie", "auth-cookie-enabled", "auth-anonymous", + +# ifdef USE_TCP_SOCKETS +# include "module-native-protocol-tcp-symdef.h" +# else +# include "module-native-protocol-unix-symdef.h" +# endif + +# if defined(HAVE_CREDS) && !defined(USE_TCP_SOCKETS) +# define MODULE_ARGUMENTS MODULE_ARGUMENTS_COMMON "auth-group", "auth-group-enable", +# define AUTH_USAGE "auth-group= auth-group-enable= " +# elif defined(USE_TCP_SOCKETS) +# define MODULE_ARGUMENTS MODULE_ARGUMENTS_COMMON "auth-ip-acl", +# define AUTH_USAGE "auth-ip-acl= " +# else +# define MODULE_ARGUMENTS MODULE_ARGUMENTS_COMMON +# define AUTH_USAGE +# endif PA_MODULE_DESCRIPTION("Native protocol "SOCKET_DESCRIPTION); PA_MODULE_USAGE("auth-anonymous= " - "cookie= " + "auth-cookie= " + "auth-cookie-enabled= - #include - #define protocol_new pa_protocol_esound_new - #define protocol_free pa_protocol_esound_free - #define TCPWRAP_SERVICE "esound" - #define IPV4_PORT ESD_DEFAULT_PORT - #define MODULE_ARGUMENTS_COMMON "sink", "source", "auth-anonymous", "cookie", - #ifdef USE_TCP_SOCKETS - #include "module-esound-protocol-tcp-symdef.h" - #else - #include "module-esound-protocol-unix-symdef.h" - #endif - - #if defined(USE_TCP_SOCKETS) - #define MODULE_ARGUMENTS MODULE_ARGUMENTS_COMMON "auth-ip-acl", - #define AUTH_USAGE "auth-ip-acl= " - #else - #define MODULE_ARGUMENTS MODULE_ARGUMENTS_COMMON - #define AUTH_USAGE - #endif +# include +# include +# define TCPWRAP_SERVICE "esound" +# define IPV4_PORT ESD_DEFAULT_PORT +# define MODULE_ARGUMENTS_COMMON "sink", "source", "auth-anonymous", "cookie", "auth-cookie", "auth-cookie-enabled" + +# ifdef USE_TCP_SOCKETS +# include "module-esound-protocol-tcp-symdef.h" +# else +# include "module-esound-protocol-unix-symdef.h" +# endif + +# if defined(USE_TCP_SOCKETS) +# define MODULE_ARGUMENTS MODULE_ARGUMENTS_COMMON "auth-ip-acl", +# define AUTH_USAGE "auth-ip-acl= " +# else +# define MODULE_ARGUMENTS MODULE_ARGUMENTS_COMMON +# define AUTH_USAGE +# endif PA_MODULE_DESCRIPTION("ESOUND protocol "SOCKET_DESCRIPTION); PA_MODULE_USAGE("sink= " "source= " "auth-anonymous= " - "cookie= " + "auth-cookie= " + "auth-cookie-enabled=simple_protocol, io, u->simple_options); +#elif defined(USE_PROTOCOL_CLI) + pa_cli_protocol_connect(u->cli_protocol, io, u->module); +#elif defined(USE_PROTOCOL_HTTP) + pa_http_protocol_connect(u->http_protocol, io, u->module); +#elif defined(USE_PROTOCOL_NATIVE) + pa_native_protocol_connect(u->native_protocol, io, u->native_options); +#else + pa_esound_protocol_connect(u->esound_protocol, io, u->esound_options); +#endif +} + int pa__init(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; uint32_t port = IPV4_PORT; const char *listen_on; #else - pa_socket_server *s; int r; #endif +#if defined(USE_PROTOCOL_NATIVE) + char t[256]; +#endif + pa_assert(m); if (!(ma = pa_modargs_new(m->argument, valid_modargs))) { pa_log("Failed to parse module arguments"); - goto finish; + goto fail; } u = pa_xnew0(struct userdata, 1); + u->module = m; + +#if defined(USE_PROTOCOL_SIMPLE) + u->simple_protocol = pa_simple_protocol_get(m->core); + + u->simple_options = pa_simple_options_new(); + if (pa_simple_options_parse(u->simple_options, m->core, ma) < 0) + goto fail; + u->simple_options->module = m; +#elif defined(USE_PROTOCOL_CLI) + u->cli_protocol = pa_cli_protocol_get(m->core); +#elif defined(USE_PROTOCOL_HTTP) + u->http_protocol = pa_http_protocol_get(m->core); +#elif defined(USE_PROTOCOL_NATIVE) + u->native_protocol = pa_native_protocol_get(m->core); + + u->native_options = pa_native_options_new(); + if (pa_native_options_parse(u->native_options, m->core, ma) < 0) + goto fail; + u->native_options->module = m; +#else + u->esound_protocol = pa_esound_protocol_get(m->core); + + u->esound_options = pa_esound_options_new(); + if (pa_esound_options_parse(u->esound_options, m->core, ma) < 0) + goto fail; + u->esound_options->module = m; +#endif #if defined(USE_TCP_SOCKETS) if (pa_modargs_get_value_u32(ma, "port", &port) < 0 || port < 1 || port > 0xFFFF) { @@ -233,38 +299,30 @@ int pa__init(pa_module*m) { listen_on = pa_modargs_get_value(ma, "listen", NULL); if (listen_on) { - s_ipv6 = pa_socket_server_new_ipv6_string(m->core->mainloop, listen_on, port, TCPWRAP_SERVICE); - s_ipv4 = pa_socket_server_new_ipv4_string(m->core->mainloop, listen_on, port, TCPWRAP_SERVICE); + u->socket_server_ipv6 = pa_socket_server_new_ipv6_string(m->core->mainloop, listen_on, port, TCPWRAP_SERVICE); + u->socket_server_ipv4 = pa_socket_server_new_ipv4_string(m->core->mainloop, listen_on, port, TCPWRAP_SERVICE); } else { - s_ipv6 = pa_socket_server_new_ipv6_any(m->core->mainloop, port, TCPWRAP_SERVICE); - s_ipv4 = pa_socket_server_new_ipv4_any(m->core->mainloop, port, TCPWRAP_SERVICE); + u->socket_server_ipv6 = pa_socket_server_new_ipv6_any(m->core->mainloop, port, TCPWRAP_SERVICE); + u->socket_server_ipv4 = pa_socket_server_new_ipv4_any(m->core->mainloop, port, TCPWRAP_SERVICE); } - if (!s_ipv4 && !s_ipv6) + if (!u->socket_server_ipv4 && !u->socket_server_ipv6) goto fail; - if (s_ipv4) - u->protocol_ipv4 = protocol_new(m->core, s_ipv4, m, ma); - if (s_ipv6) - u->protocol_ipv6 = protocol_new(m->core, s_ipv6, m, ma); - - if (!u->protocol_ipv4 && !u->protocol_ipv6) - goto fail; - - if (s_ipv6) - pa_socket_server_unref(s_ipv6); - if (s_ipv6) - pa_socket_server_unref(s_ipv4); + if (u->socket_server_ipv4) + pa_socket_server_set_callback(u->socket_server_ipv4, socket_server_on_connection_cb, u); + if (u->socket_server_ipv6) + pa_socket_server_set_callback(u->socket_server_ipv6, socket_server_on_connection_cb, u); #else -#if defined(USE_PROTOCOL_ESOUND) +# if defined(USE_PROTOCOL_ESOUND) -#if defined(USE_PER_USER_ESOUND_SOCKET) +# if defined(USE_PER_USER_ESOUND_SOCKET) u->socket_path = pa_sprintf_malloc("/tmp/.esd-%lu/socket", (unsigned long) getuid()); -#else +# else u->socket_path = pa_xstrdup("/tmp/.esd/socket"); -#endif +# endif /* This socket doesn't reside in our own runtime dir but in * /tmp/.esd/, hence we have to create the dir first */ @@ -274,12 +332,12 @@ int pa__init(pa_module*m) { goto fail; } -#else +# else if (!(u->socket_path = pa_runtime_path(pa_modargs_get_value(ma, "socket", UNIX_SOCKET)))) { pa_log("Failed to generate socket path."); goto fail; } -#endif +# endif if ((r = pa_unix_socket_remove_stale(u->socket_path)) < 0) { pa_log("Failed to remove stale UNIX socket '%s': %s", u->socket_path, pa_cstrerror(errno)); @@ -287,53 +345,44 @@ int pa__init(pa_module*m) { } else if (r > 0) pa_log_info("Removed stale UNIX socket '%s'.", u->socket_path); - if (!(s = pa_socket_server_new_unix(m->core->mainloop, u->socket_path))) + if (!(u->socket_server_unix = pa_socket_server_new_unix(m->core->mainloop, u->socket_path))) goto fail; - if (!(u->protocol_unix = protocol_new(m->core, s, m, ma))) - goto fail; + pa_socket_server_set_callback(u->socket_server_unix, socket_server_on_connection_cb, u); - pa_socket_server_unref(s); +#endif + +#if defined(USE_PROTOCOL_NATIVE) +# if defined(USE_TCP_SOCKETS) + if (u->socket_server_ipv4) + if (pa_socket_server_get_address(u->socket_server_ipv4, t, sizeof(t))) + pa_native_protocol_add_server_string(u->native_protocol, t); + + if (u->socket_server_ipv6) + if (pa_socket_server_get_address(u->socket_server_ipv6, t, sizeof(t))) + pa_native_protocol_add_server_string(u->native_protocol, t); +# else + if (pa_socket_server_get_address(u->socket_server_unix, t, sizeof(t))) + pa_native_protocol_add_server_string(u->native_protocol, t); +# endif #endif m->userdata = u; - ret = 0; - -finish: if (ma) pa_modargs_free(ma); - return ret; + return 0; 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); - pa_xfree(u->socket_path); -#endif - pa_xfree(u); - } + if (ma) + pa_modargs_free(ma); -#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 + pa__done(m); - goto finish; + return -1; } void pa__done(pa_module*m) { @@ -343,22 +392,72 @@ void pa__done(pa_module*m) { u = m->userdata; +#if defined(USE_PROTOCOL_SIMPLE) + if (u->simple_protocol) { + pa_simple_protocol_disconnect(u->simple_protocol, u->module); + pa_simple_protocol_unref(u->simple_protocol); + } + if (u->simple_options) + pa_simple_options_unref(u->simple_options); +#elif defined(USE_PROTOCOL_CLI) + if (u->cli_protocol) { + pa_cli_protocol_disconnect(u->cli_protocol, u->module); + pa_cli_protocol_unref(u->cli_protocol); + } +#elif defined(USE_PROTOCOL_HTTP) + if (u->http_protocol) { + pa_http_protocol_disconnect(u->http_protocol, u->module); + pa_http_protocol_unref(u->http_protocol); + } +#elif defined(USE_PROTOCOL_NATIVE) + if (u->native_protocol) { + + char t[256]; + +# if defined(USE_TCP_SOCKETS) + if (u->socket_server_ipv4) + if (pa_socket_server_get_address(u->socket_server_ipv4, t, sizeof(t))) + pa_native_protocol_remove_server_string(u->native_protocol, t); + + if (u->socket_server_ipv6) + if (pa_socket_server_get_address(u->socket_server_ipv6, t, sizeof(t))) + pa_native_protocol_remove_server_string(u->native_protocol, t); +# else + if (u->socket_server_unix) + if (pa_socket_server_get_address(u->socket_server_unix, t, sizeof(t))) + pa_native_protocol_remove_server_string(u->native_protocol, t); +# endif + + pa_native_protocol_disconnect(u->native_protocol, u->module); + pa_native_protocol_unref(u->native_protocol); + } + if (u->native_options) + pa_native_options_unref(u->native_options); +#else + if (u->esound_protocol) { + pa_esound_protocol_disconnect(u->esound_protocol, u->module); + pa_esound_protocol_unref(u->esound_protocol); + } + if (u->esound_options) + pa_esound_options_unref(u->esound_options); +#endif + #if defined(USE_TCP_SOCKETS) - if (u->protocol_ipv4) - protocol_free(u->protocol_ipv4); - if (u->protocol_ipv6) - protocol_free(u->protocol_ipv6); + if (u->socket_server_ipv4) + pa_socket_server_unref(u->socket_server_ipv4); + if (u->socket_server_ipv6) + pa_socket_server_unref(u->socket_server_ipv6); #else - if (u->protocol_unix) - protocol_free(u->protocol_unix); + if (u->socket_server_unix) + pa_socket_server_unref(u->socket_server_unix); -#if defined(USE_PROTOCOL_ESOUND) && !defined(USE_PER_USER_ESOUND_SOCKET) +# if defined(USE_PROTOCOL_ESOUND) && !defined(USE_PER_USER_ESOUND_SOCKET) if (u->socket_path) { char *p = pa_parent_dir(u->socket_path); rmdir(p); pa_xfree(p); } -#endif +# endif pa_xfree(u->socket_path); #endif diff --git a/src/modules/module-tunnel.c b/src/modules/module-tunnel.c index 21f2f842..af27ce74 100644 --- a/src/modules/module-tunnel.c +++ b/src/modules/module-tunnel.c @@ -45,16 +45,15 @@ #include #include #include -#include #include #include -#include #include #include #include #include #include #include +#include #ifdef TUNNEL_SINK #include "module-tunnel-sink-symdef.h" @@ -185,7 +184,7 @@ struct userdata { pa_source *source; #endif - uint8_t auth_cookie[PA_NATIVE_COOKIE_LENGTH]; + pa_auth_cookie *auth_cookie; uint32_t version; uint32_t ctag; @@ -204,8 +203,6 @@ struct userdata { pa_time_event *time_event; - pa_bool_t auth_cookie_in_property; - pa_smoother *smoother; char *device_description; @@ -1588,7 +1585,8 @@ static void on_connection(pa_socket_client *sc, pa_iochannel *io, void *userdata pa_tagstruct_putu32(t, PA_COMMAND_AUTH); pa_tagstruct_putu32(t, tag = u->ctag++); pa_tagstruct_putu32(t, PA_PROTOCOL_VERSION); - pa_tagstruct_put_arbitrary(t, u->auth_cookie, sizeof(u->auth_cookie)); + + pa_tagstruct_put_arbitrary(t, pa_auth_cookie_read(u->auth_cookie, PA_NATIVE_COOKIE_LENGTH), PA_NATIVE_COOKIE_LENGTH); #ifdef HAVE_CREDS { @@ -1658,33 +1656,6 @@ static int sink_set_mute(pa_sink *sink) { #endif -/* Called from main context */ -static int load_key(struct userdata *u, const char*fn) { - pa_assert(u); - - u->auth_cookie_in_property = FALSE; - - if (!fn && pa_authkey_prop_get(u->core, PA_NATIVE_COOKIE_PROPERTY_NAME, u->auth_cookie, sizeof(u->auth_cookie)) >= 0) { - pa_log_debug("Using already loaded auth cookie."); - pa_authkey_prop_ref(u->core, PA_NATIVE_COOKIE_PROPERTY_NAME); - u->auth_cookie_in_property = 1; - return 0; - } - - if (!fn) - fn = PA_NATIVE_COOKIE_FILE; - - if (pa_authkey_load_auto(fn, u->auth_cookie, sizeof(u->auth_cookie)) < 0) - return -1; - - pa_log_debug("Loading cookie from disk."); - - if (pa_authkey_prop_put(u->core, PA_NATIVE_COOKIE_PROPERTY_NAME, u->auth_cookie, sizeof(u->auth_cookie)) >= 0) - u->auth_cookie_in_property = TRUE; - - return 0; -} - int pa__init(pa_module*m) { pa_modargs *ma = NULL; struct userdata *u = NULL; @@ -1722,7 +1693,6 @@ int pa__init(pa_module*m) { u->smoother = pa_smoother_new(PA_USEC_PER_SEC, PA_USEC_PER_SEC*2, TRUE, 10); u->ctag = 1; u->device_index = u->channel = PA_INVALID_INDEX; - u->auth_cookie_in_property = FALSE; u->time_event = NULL; u->ignore_latency_before = 0; u->transport_usec = 0; @@ -1733,7 +1703,7 @@ int pa__init(pa_module*m) { u->rtpoll = pa_rtpoll_new(); pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll); - if (load_key(u, pa_modargs_get_value(ma, "cookie", NULL)) < 0) + if (!(u->auth_cookie = pa_auth_cookie_get(u->core, pa_modargs_get_value(ma, "cookie", PA_NATIVE_COOKIE_FILE), PA_NATIVE_COOKIE_LENGTH))) goto fail; if (!(u->server_name = pa_xstrdup(pa_modargs_get_value(ma, "server", NULL)))) { @@ -1911,8 +1881,8 @@ void pa__done(pa_module*m) { if (u->client) pa_socket_client_unref(u->client); - if (u->auth_cookie_in_property) - pa_authkey_prop_unref(m->core, PA_NATIVE_COOKIE_PROPERTY_NAME); + if (u->auth_cookie) + pa_auth_cookie_unref(u->auth_cookie); if (u->smoother) pa_smoother_free(u->smoother); diff --git a/src/modules/module-x11-publish.c b/src/modules/module-x11-publish.c index 4ef4873a..c29535e6 100644 --- a/src/modules/module-x11-publish.c +++ b/src/modules/module-x11-publish.c @@ -43,11 +43,11 @@ #include #include #include -#include -#include +#include #include #include #include +#include #include "module-x11-publish-symdef.h" @@ -68,15 +68,48 @@ static const char* const valid_modargs[] = { struct userdata { pa_core *core; pa_module *module; + pa_native_protocol *protocol; char *id; - uint8_t auth_cookie[PA_NATIVE_COOKIE_LENGTH]; - pa_bool_t auth_cookie_in_property; + pa_auth_cookie *auth_cookie; pa_x11_wrapper *x11_wrapper; pa_x11_client *x11_client; + + pa_hook_slot *hook_slot; }; +static void publish_servers(struct userdata *u, pa_strlist *l) { + + if (l) { + char *s; + + l = pa_strlist_reverse(l); + s = pa_strlist_tostring(l); + l = pa_strlist_reverse(l); + + pa_x11_set_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "PULSE_SERVER", s); + pa_xfree(s); + } else + pa_x11_del_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "PULSE_SERVER"); +} + +static pa_hook_result_t servers_changed_cb(void *hook_data, void *call_data, void *slot_data) { + pa_strlist *servers = call_data; + struct userdata *u = slot_data; + char t[256]; + + pa_assert(u); + + if (!pa_x11_get_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "PULSE_ID", t, sizeof(t)) || strcmp(t, u->id)) { + pa_log_warn("PulseAudio information vanished from X11!"); + return PA_HOOK_OK; + } + + publish_servers(u, servers); + return PA_HOOK_OK; +} + static void x11_kill_cb(pa_x11_wrapper *w, void *userdata) { struct userdata *u = userdata; @@ -96,40 +129,12 @@ static void x11_kill_cb(pa_x11_wrapper *w, void *userdata) { pa_module_unload_request(u->module); } -static int load_key(struct userdata *u, const char*fn) { - pa_assert(u); - - u->auth_cookie_in_property = FALSE; - - if (!fn && pa_authkey_prop_get(u->core, PA_NATIVE_COOKIE_PROPERTY_NAME, u->auth_cookie, sizeof(u->auth_cookie)) >= 0) { - pa_log_debug("using already loaded auth cookie."); - pa_authkey_prop_ref(u->core, PA_NATIVE_COOKIE_PROPERTY_NAME); - u->auth_cookie_in_property = 1; - return 0; - } - - if (!fn) - fn = PA_NATIVE_COOKIE_FILE; - - if (pa_authkey_load_auto(fn, u->auth_cookie, sizeof(u->auth_cookie)) < 0) - return -1; - - pa_log_debug("Loading cookie from disk."); - - if (pa_authkey_prop_put(u->core, PA_NATIVE_COOKIE_PROPERTY_NAME, u->auth_cookie, sizeof(u->auth_cookie)) >= 0) - u->auth_cookie_in_property = TRUE; - - return 0; -} - int pa__init(pa_module*m) { struct userdata *u; pa_modargs *ma = NULL; char hn[256], un[128]; char hx[PA_NATIVE_COOKIE_LENGTH*2+1]; const char *t; - char *s; - pa_strlist *l; pa_assert(m); @@ -141,40 +146,36 @@ int pa__init(pa_module*m) { m->userdata = u = pa_xnew(struct userdata, 1); u->core = m->core; u->module = m; + u->protocol = pa_native_protocol_get(m->core); u->id = NULL; - u->auth_cookie_in_property = FALSE; + u->auth_cookie = NULL; u->x11_client = NULL; u->x11_wrapper = NULL; - if (load_key(u, pa_modargs_get_value(ma, "cookie", NULL)) < 0) - goto fail; + u->hook_slot = pa_hook_connect(pa_native_protocol_servers_changed(u->protocol), PA_HOOK_NORMAL, servers_changed_cb, u); - if (!(u->x11_wrapper = pa_x11_wrapper_get(m->core, pa_modargs_get_value(ma, "display", NULL)))) + if (!(u->auth_cookie = pa_auth_cookie_get(m->core, pa_modargs_get_value(ma, "cookie", PA_NATIVE_COOKIE_FILE), PA_NATIVE_COOKIE_LENGTH))) goto fail; - if (!(l = pa_shared_get(m->core, PA_NATIVE_SERVER_PROPERTY_NAME))) + if (!(u->x11_wrapper = pa_x11_wrapper_get(m->core, pa_modargs_get_value(ma, "display", NULL)))) goto fail; - l = pa_strlist_reverse(l); - s = pa_strlist_tostring(l); - l = pa_strlist_reverse(l); - - pa_x11_set_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "PULSE_SERVER", s); - pa_xfree(s); - if (!pa_get_fqdn(hn, sizeof(hn)) || !pa_get_user_name(un, sizeof(un))) goto fail; u->id = pa_sprintf_malloc("%s@%s/%u", un, hn, (unsigned) getpid()); pa_x11_set_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "PULSE_ID", u->id); + publish_servers(u, pa_native_protocol_servers(u->protocol)); + if ((t = pa_modargs_get_value(ma, "source", NULL))) pa_x11_set_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "PULSE_SOURCE", t); if ((t = pa_modargs_get_value(ma, "sink", NULL))) pa_x11_set_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "PULSE_SINK", t); - pa_x11_set_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "PULSE_COOKIE", pa_hexstr(u->auth_cookie, sizeof(u->auth_cookie), hx, sizeof(hx))); + pa_x11_set_prop(pa_x11_wrapper_get_display(u->x11_wrapper), "PULSE_COOKIE", + pa_hexstr(pa_auth_cookie_read(u->auth_cookie, PA_NATIVE_COOKIE_LENGTH), PA_NATIVE_COOKIE_LENGTH, hx, sizeof(hx))); u->x11_client = pa_x11_client_new(u->x11_wrapper, NULL, x11_kill_cb, u); @@ -220,8 +221,14 @@ void pa__done(pa_module*m) { pa_x11_wrapper_unref(u->x11_wrapper); } - if (u->auth_cookie_in_property) - pa_authkey_prop_unref(m->core, PA_NATIVE_COOKIE_PROPERTY_NAME); + if (u->auth_cookie) + pa_auth_cookie_unref(u->auth_cookie); + + if (u->hook_slot) + pa_hook_slot_free(u->hook_slot); + + if (u->protocol) + pa_native_protocol_unref(u->protocol); pa_xfree(u->id); pa_xfree(u); diff --git a/src/pulsecore/protocol-cli.c b/src/pulsecore/protocol-cli.c index 30cb475d..9247bb40 100644 --- a/src/pulsecore/protocol-cli.c +++ b/src/pulsecore/protocol-cli.c @@ -30,34 +30,41 @@ #include #include #include +#include #include "protocol-cli.h" /* Don't allow more than this many concurrent connections */ #define MAX_CONNECTIONS 25 -struct pa_protocol_cli { - pa_module *module; +struct pa_cli_protocol { + PA_REFCNT_DECLARE; + pa_core *core; - pa_socket_server*server; pa_idxset *connections; }; -static void cli_eof_cb(pa_cli*c, void*userdata) { - pa_protocol_cli *p = userdata; +static void cli_unlink(pa_cli_protocol *p, pa_cli *c) { pa_assert(p); + pa_assert(c); pa_idxset_remove_by_data(p->connections, c, NULL); pa_cli_free(c); } -static void on_connection(pa_socket_server*s, pa_iochannel *io, void *userdata) { - pa_protocol_cli *p = userdata; +static void cli_eof_cb(pa_cli*c, void*userdata) { + pa_cli_protocol *p = userdata; + pa_assert(p); + + cli_unlink(p, c); +} + +void pa_cli_protocol_connect(pa_cli_protocol *p, pa_iochannel *io, pa_module *m) { pa_cli *c; - pa_assert(s); - pa_assert(io); pa_assert(p); + pa_assert(io); + pa_assert(m); if (pa_idxset_size(p->connections)+1 > MAX_CONNECTIONS) { pa_log("Warning! Too many connections (%u), dropping incoming connection.", MAX_CONNECTIONS); @@ -65,39 +72,71 @@ static void on_connection(pa_socket_server*s, pa_iochannel *io, void *userdata) return; } - c = pa_cli_new(p->core, io, p->module); + c = pa_cli_new(p->core, io, m); pa_cli_set_eof_callback(c, cli_eof_cb, p); pa_idxset_put(p->connections, c, NULL); } -pa_protocol_cli* pa_protocol_cli_new(pa_core *core, pa_socket_server *server, pa_module *m, PA_GCC_UNUSED pa_modargs *ma) { - pa_protocol_cli* p; +void pa_cli_protocol_disconnect(pa_cli_protocol *p, pa_module *m) { + pa_cli *c; + void *state = NULL; + + pa_assert(p); + pa_assert(m); + + while ((c = pa_idxset_iterate(p->connections, &state, NULL))) + if (pa_cli_get_module(c) == m) + cli_unlink(p, c); +} - pa_core_assert_ref(core); - pa_assert(server); +static pa_cli_protocol* cli_protocol_new(pa_core *c) { + pa_cli_protocol *p; - p = pa_xnew(pa_protocol_cli, 1); - p->module = m; - p->core = core; - p->server = pa_socket_server_ref(server); + pa_assert(c); + + p = pa_xnew(pa_cli_protocol, 1); + PA_REFCNT_INIT(p); + p->core = c; p->connections = pa_idxset_new(NULL, NULL); - pa_socket_server_set_callback(p->server, on_connection, p); + pa_assert_se(pa_shared_set(c, "cli-protocol", p) >= 0); return p; } -static void free_connection(void *p, PA_GCC_UNUSED void *userdata) { +pa_cli_protocol* pa_cli_protocol_get(pa_core *c) { + pa_cli_protocol *p; + + if ((p = pa_shared_get(c, "cli-protocol"))) + return pa_cli_protocol_ref(p); + + return cli_protocol_new(c); +} + +pa_cli_protocol* pa_cli_protocol_ref(pa_cli_protocol *p) { pa_assert(p); + pa_assert(PA_REFCNT_VALUE(p) >= 1); + + PA_REFCNT_INC(p); - pa_cli_free(p); + return p; } -void pa_protocol_cli_free(pa_protocol_cli *p) { +void pa_cli_protocol_unref(pa_cli_protocol *p) { + pa_cli *c; pa_assert(p); + pa_assert(PA_REFCNT_VALUE(p) >= 1); + + if (PA_REFCNT_DEC(p) > 0) + return; + + while ((c = pa_idxset_first(p->connections, NULL))) + cli_unlink(p, c); + + pa_idxset_free(p->connections, NULL, NULL); + + pa_assert_se(pa_shared_remove(p->core, "cli-protocol") >= 0); - pa_idxset_free(p->connections, free_connection, NULL); - pa_socket_server_unref(p->server); pa_xfree(p); } diff --git a/src/pulsecore/protocol-cli.h b/src/pulsecore/protocol-cli.h index 8922ac62..9e26dcd9 100644 --- a/src/pulsecore/protocol-cli.h +++ b/src/pulsecore/protocol-cli.h @@ -27,9 +27,12 @@ #include #include -typedef struct pa_protocol_cli pa_protocol_cli; +typedef struct pa_cli_protocol pa_cli_protocol; -pa_protocol_cli* pa_protocol_cli_new(pa_core *core, pa_socket_server *server, pa_module *m, pa_modargs *ma); -void pa_protocol_cli_free(pa_protocol_cli *n); +pa_cli_protocol* pa_cli_protocol_get(pa_core *core); +pa_cli_protocol* pa_cli_protocol_ref(pa_cli_protocol *p); +void pa_cli_protocol_unref(pa_cli_protocol *p); +void pa_cli_protocol_connect(pa_cli_protocol *p, pa_iochannel *io, pa_module *m); +void pa_cli_protocol_disconnect(pa_cli_protocol *o, pa_module *m); #endif diff --git a/src/pulsecore/protocol-esound.c b/src/pulsecore/protocol-esound.c index db1b4305..4f121a3a 100644 --- a/src/pulsecore/protocol-esound.c +++ b/src/pulsecore/protocol-esound.c @@ -52,6 +52,7 @@ #include #include #include +#include #include "endianmacros.h" @@ -83,7 +84,8 @@ typedef struct connection { uint32_t index; pa_bool_t dead; - pa_protocol_esound *protocol; + pa_esound_protocol *protocol; + pa_esound_options *options; pa_iochannel *io; pa_client *client; pa_bool_t authorized, swap_byte_order; @@ -120,17 +122,12 @@ PA_DECLARE_CLASS(connection); #define CONNECTION(o) (connection_cast(o)) static PA_DEFINE_CHECK_TYPE(connection, pa_msgobject); -struct pa_protocol_esound { - pa_module *module; +struct pa_esound_protocol { + PA_REFCNT_DECLARE; + pa_core *core; - pa_bool_t public; - pa_socket_server *server; pa_idxset *connections; - - char *sink_name, *source_name; unsigned n_player; - uint8_t esd_key[ESD_KEY_LEN]; - pa_ip_acl *auth_ip_acl; }; enum { @@ -213,6 +210,11 @@ static void connection_unlink(connection *c) { if (!c->protocol) return; + if (c->options) { + pa_esound_options_unref(c->options); + c->options = NULL; + } + if (c->sink_input) { pa_sink_input_unlink(c->sink_input); pa_sink_input_unref(c->sink_input); @@ -340,17 +342,22 @@ static int esd_proto_connect(connection *c, PA_GCC_UNUSED esd_proto_t request, c pa_assert(data); pa_assert(length == (ESD_KEY_LEN + sizeof(uint32_t))); + if (!c->authorized && c->options->auth_cookie) { + const uint8_t*key; + + if ((key = pa_auth_cookie_read(c->options->auth_cookie, ESD_KEY_LEN))) + if (memcmp(data, key, ESD_KEY_LEN) == 0) + c->authorized = TRUE; + } + if (!c->authorized) { - if (memcmp(data, c->protocol->esd_key, ESD_KEY_LEN) != 0) { - pa_log("kicked client with invalid authorization key."); - return -1; - } + pa_log("Kicked client with invalid authorization key."); + return -1; + } - c->authorized = TRUE; - if (c->auth_timeout_event) { - c->protocol->core->mainloop->time_free(c->auth_timeout_event); - c->auth_timeout_event = NULL; - } + if (c->auth_timeout_event) { + c->protocol->core->mainloop->time_free(c->auth_timeout_event); + c->auth_timeout_event = NULL; } data = (const char*)data + ESD_KEY_LEN; @@ -395,9 +402,9 @@ static int esd_proto_stream_play(connection *c, PA_GCC_UNUSED esd_proto_t reques CHECK_VALIDITY(pa_sample_spec_valid(&ss), "Invalid sample specification"); - if (c->protocol->sink_name) { - sink = pa_namereg_get(c->protocol->core, c->protocol->sink_name, PA_NAMEREG_SINK, 1); - CHECK_VALIDITY(sink, "No such sink: %s", c->protocol->sink_name); + if (c->options->default_sink) { + sink = pa_namereg_get(c->protocol->core, c->options->default_sink, PA_NAMEREG_SINK, 1); + CHECK_VALIDITY(sink, "No such sink: %s", c->options->default_sink); } pa_strlcpy(name, data, sizeof(name)); @@ -412,7 +419,7 @@ static int esd_proto_stream_play(connection *c, PA_GCC_UNUSED esd_proto_t reques pa_sink_input_new_data_init(&sdata); sdata.driver = __FILE__; - sdata.module = c->protocol->module; + sdata.module = c->options->module; sdata.client = c->client; sdata.sink = sink; pa_proplist_update(sdata.proplist, PA_UPDATE_MERGE, c->client->proplist); @@ -483,7 +490,7 @@ static int esd_proto_stream_record(connection *c, esd_proto_t request, const voi if (request == ESD_PROTO_STREAM_MON) { pa_sink* sink; - if (!(sink = pa_namereg_get(c->protocol->core, c->protocol->sink_name, PA_NAMEREG_SINK, 1))) { + if (!(sink = pa_namereg_get(c->protocol->core, c->options->default_sink, PA_NAMEREG_SINK, 1))) { pa_log("no such sink."); return -1; } @@ -495,8 +502,8 @@ static int esd_proto_stream_record(connection *c, esd_proto_t request, const voi } else { pa_assert(request == ESD_PROTO_STREAM_REC); - if (c->protocol->source_name) { - if (!(source = pa_namereg_get(c->protocol->core, c->protocol->source_name, PA_NAMEREG_SOURCE, 1))) { + if (c->options->default_source) { + if (!(source = pa_namereg_get(c->protocol->core, c->options->default_source, PA_NAMEREG_SOURCE, 1))) { pa_log("no such source."); return -1; } @@ -515,7 +522,7 @@ static int esd_proto_stream_record(connection *c, esd_proto_t request, const voi pa_source_output_new_data_init(&sdata); sdata.driver = __FILE__; - sdata.module = c->protocol->module; + sdata.module = c->options->module; sdata.client = c->client; sdata.source = source; pa_proplist_update(sdata.proplist, PA_UPDATE_MERGE, c->client->proplist); @@ -562,7 +569,7 @@ static int esd_proto_get_latency(connection *c, PA_GCC_UNUSED esd_proto_t reques pa_assert(!data); pa_assert(length == 0); - if (!(sink = pa_namereg_get(c->protocol->core, c->protocol->sink_name, PA_NAMEREG_SINK, 1))) + if (!(sink = pa_namereg_get(c->protocol->core, c->options->default_sink, PA_NAMEREG_SINK, 1))) latency = 0; else { double usec = pa_sink_get_latency(sink); @@ -583,7 +590,7 @@ static int esd_proto_server_info(connection *c, PA_GCC_UNUSED esd_proto_t reques pa_assert(data); pa_assert(length == sizeof(int32_t)); - if ((sink = pa_namereg_get(c->protocol->core, c->protocol->sink_name, PA_NAMEREG_SINK, 1))) { + if ((sink = pa_namereg_get(c->protocol->core, c->options->default_sink, PA_NAMEREG_SINK, 1))) { rate = sink->sample_spec.rate; format = format_native2esd(&sink->sample_spec); } @@ -858,7 +865,7 @@ static int esd_proto_sample_free_or_play(connection *c, esd_proto_t request, con if (request == ESD_PROTO_SAMPLE_PLAY) { pa_sink *sink; - if ((sink = pa_namereg_get(c->protocol->core, c->protocol->sink_name, PA_NAMEREG_SINK, 1))) + if ((sink = pa_namereg_get(c->protocol->core, c->options->default_sink, PA_NAMEREG_SINK, 1))) if (pa_scache_play_item(c->protocol->core, name, sink, PA_VOLUME_NORM, c->client->proplist, NULL) >= 0) ok = idx + 1; } else { @@ -1350,7 +1357,7 @@ static pa_usec_t source_output_get_latency_cb(pa_source_output *o) { return pa_bytes_to_usec(pa_memblockq_get_length(c->output_memblockq), &c->source_output->sample_spec); } -/*** socket server callback ***/ +/*** entry points ***/ static void auth_timeout(pa_mainloop_api*m, pa_time_event *e, const struct timeval *tv, void *userdata) { connection *c = CONNECTION(userdata); @@ -1364,14 +1371,13 @@ static void auth_timeout(pa_mainloop_api*m, pa_time_event *e, const struct timev connection_unlink(c); } -static void on_connection(pa_socket_server*s, pa_iochannel *io, void *userdata) { +void pa_esound_protocol_connect(pa_esound_protocol *p, pa_iochannel *io, pa_esound_options *o) { connection *c; - pa_protocol_esound *p = userdata; char cname[256], pname[128]; - pa_assert(s); - pa_assert(io); pa_assert(p); + pa_assert(io); + pa_assert(o); if (pa_idxset_size(p->connections)+1 > MAX_CONNECTIONS) { pa_log("Warning! Too many connections (%u), dropping incoming connection.", MAX_CONNECTIONS); @@ -1390,11 +1396,12 @@ static void on_connection(pa_socket_server*s, pa_iochannel *io, void *userdata) pa_snprintf(cname, sizeof(cname), "EsounD client (%s)", pname); c->client = pa_client_new(p->core, __FILE__, cname); pa_proplist_sets(c->client->proplist, "esound-protocol.peer", pname); - c->client->module = p->module; + c->client->module = o->module; c->client->kill = client_kill_cb; c->client->userdata = c; - c->authorized = !!p->public; + c->options = pa_esound_options_ref(o); + c->authorized = FALSE; c->swap_byte_order = FALSE; c->dead = FALSE; @@ -1423,7 +1430,15 @@ static void on_connection(pa_socket_server*s, pa_iochannel *io, void *userdata) c->original_name = NULL; - if (!c->authorized && p->auth_ip_acl && pa_ip_acl_check(p->auth_ip_acl, pa_iochannel_get_recv_fd(io)) > 0) { + if (o->auth_anonymous) { + pa_log_info("Client authenticated anonymously."); + c->authorized = TRUE; + } + + if (!c->authorized && + o->auth_ip_acl && + pa_ip_acl_check(o->auth_ip_acl, pa_iochannel_get_recv_fd(io)) > 0) { + pa_log_info("Client authenticated by IP ACL."); c->authorized = TRUE; } @@ -1442,71 +1457,163 @@ static void on_connection(pa_socket_server*s, pa_iochannel *io, void *userdata) pa_idxset_put(p->connections, c, &c->index); } -/*** entry points ***/ - -pa_protocol_esound* pa_protocol_esound_new(pa_core*core, pa_socket_server *server, pa_module *m, pa_modargs *ma) { - pa_protocol_esound *p = NULL; - pa_bool_t public = FALSE; - const char *acl; +void pa_esound_protocol_disconnect(pa_esound_protocol *p, pa_module *m) { + connection *c; + void *state = NULL; - pa_assert(core); - pa_assert(server); + pa_assert(p); pa_assert(m); - pa_assert(ma); - - if (pa_modargs_get_value_boolean(ma, "auth-anonymous", &public) < 0) { - pa_log("auth-anonymous= expects a boolean argument."); - goto fail; - } - - p = pa_xnew(pa_protocol_esound, 1); - if (pa_authkey_load_auto(pa_modargs_get_value(ma, "cookie", DEFAULT_COOKIE_FILE), p->esd_key, sizeof(p->esd_key)) < 0) - goto fail; + while ((c = pa_idxset_iterate(p->connections, &state, NULL))) + if (c->options->module == m) + connection_unlink(c); +} - if ((acl = pa_modargs_get_value(ma, "auth-ip-acl", NULL))) { +static pa_esound_protocol* esound_protocol_new(pa_core *c) { + pa_esound_protocol *p; - if (!(p->auth_ip_acl = pa_ip_acl_new(acl))) { - pa_log("Failed to parse IP ACL '%s'", acl); - goto fail; - } - } else - p->auth_ip_acl = NULL; + pa_assert(c); - p->core = core; - p->module = m; - p->public = public; - p->server = pa_socket_server_ref(server); - pa_socket_server_set_callback(p->server, on_connection, p); + p = pa_xnew(pa_esound_protocol, 1); + PA_REFCNT_INIT(p); + p->core = c; p->connections = pa_idxset_new(NULL, NULL); - - p->sink_name = pa_xstrdup(pa_modargs_get_value(ma, "sink", NULL)); - p->source_name = pa_xstrdup(pa_modargs_get_value(ma, "source", NULL)); p->n_player = 0; + pa_assert_se(pa_shared_set(c, "esound-protocol", p) >= 0); + return p; +} -fail: - pa_xfree(p); - return NULL; +pa_esound_protocol* pa_esound_protocol_get(pa_core *c) { + pa_esound_protocol *p; + + if ((p = pa_shared_get(c, "esound-protocol"))) + return pa_esound_protocol_ref(p); + + return esound_protocol_new(c); } -void pa_protocol_esound_free(pa_protocol_esound *p) { +pa_esound_protocol* pa_esound_protocol_ref(pa_esound_protocol *p) { + pa_assert(p); + pa_assert(PA_REFCNT_VALUE(p) >= 1); + + PA_REFCNT_INC(p); + + return p; +} + +void pa_esound_protocol_unref(pa_esound_protocol *p) { connection *c; pa_assert(p); + pa_assert(PA_REFCNT_VALUE(p) >= 1); + + if (PA_REFCNT_DEC(p) > 0) + return; while ((c = pa_idxset_first(p->connections, NULL))) connection_unlink(c); + pa_idxset_free(p->connections, NULL, NULL); - if (p->server) - pa_socket_server_unref(p->server); + pa_assert_se(pa_shared_remove(p->core, "esound-protocol") >= 0); + + pa_xfree(p); +} + +pa_esound_options* pa_esound_options_new(void) { + pa_esound_options *o; - if (p->auth_ip_acl) - pa_ip_acl_free(p->auth_ip_acl); + o = pa_xnew0(pa_esound_options, 1); + PA_REFCNT_INIT(o); - pa_xfree(p->sink_name); - pa_xfree(p->source_name); + return o; +} - pa_xfree(p); +pa_esound_options* pa_esound_options_ref(pa_esound_options *o) { + pa_assert(o); + pa_assert(PA_REFCNT_VALUE(o) >= 1); + + PA_REFCNT_INC(o); + + return o; +} + +void pa_esound_options_unref(pa_esound_options *o) { + pa_assert(o); + pa_assert(PA_REFCNT_VALUE(o) >= 1); + + if (PA_REFCNT_DEC(o) > 0) + return; + + if (o->auth_ip_acl) + pa_ip_acl_free(o->auth_ip_acl); + + if (o->auth_cookie) + pa_auth_cookie_unref(o->auth_cookie); + + pa_xfree(o->default_sink); + pa_xfree(o->default_source); + + pa_xfree(o); +} + +int pa_esound_options_parse(pa_esound_options *o, pa_core *c, pa_modargs *ma) { + pa_bool_t enabled; + const char *acl; + + pa_assert(o); + pa_assert(PA_REFCNT_VALUE(o) >= 1); + pa_assert(ma); + + if (pa_modargs_get_value_boolean(ma, "auth-anonymous", &o->auth_anonymous) < 0) { + pa_log("auth-anonymous= expects a boolean argument."); + return -1; + } + + if ((acl = pa_modargs_get_value(ma, "auth-ip-acl", NULL))) { + pa_ip_acl *ipa; + + if (!(o->auth_ip_acl = pa_ip_acl_new(acl))) { + pa_log("Failed to parse IP ACL '%s'", acl); + return -1; + } + + if (o->auth_ip_acl) + pa_ip_acl_free(o->auth_ip_acl); + + o->auth_ip_acl = ipa; + } + + enabled = TRUE; + if (pa_modargs_get_value_boolean(ma, "auth-cookie-enabled", &enabled) < 0) { + pa_log("auth-cookie-enabled= expects a boolean argument."); + return -1; + } + + if (o->auth_cookie) + pa_auth_cookie_unref(o->auth_cookie); + + if (enabled) { + const char *cn; + + /* The new name for this is 'auth-cookie', for compat reasons + * we check the old name too */ + if (!(cn = pa_modargs_get_value(ma, "auth-cookie", NULL))) + if (!(cn = pa_modargs_get_value(ma, "cookie", NULL))) + cn = DEFAULT_COOKIE_FILE; + + if (!(o->auth_cookie = pa_auth_cookie_get(c, cn, ESD_KEY_LEN))) + return -1; + + } else + o->auth_cookie = NULL; + + pa_xfree(o->default_sink); + o->default_sink = pa_xstrdup(pa_modargs_get_value(ma, "sink", NULL)); + + pa_xfree(o->default_source); + o->default_source = pa_xstrdup(pa_modargs_get_value(ma, "source", NULL)); + + return 0; } diff --git a/src/pulsecore/protocol-esound.h b/src/pulsecore/protocol-esound.h index 0c9447d3..232df660 100644 --- a/src/pulsecore/protocol-esound.h +++ b/src/pulsecore/protocol-esound.h @@ -24,13 +24,35 @@ ***/ #include -#include +#include +#include +#include #include #include -typedef struct pa_protocol_esound pa_protocol_esound; +typedef struct pa_esound_protocol pa_esound_protocol; -pa_protocol_esound* pa_protocol_esound_new(pa_core*core, pa_socket_server *server, pa_module *m, pa_modargs *ma); -void pa_protocol_esound_free(pa_protocol_esound *p); +typedef struct pa_esound_options { + PA_REFCNT_DECLARE; + + pa_module *module; + + pa_bool_t auth_anonymous; + pa_ip_acl *auth_ip_acl; + pa_auth_cookie *auth_cookie; + + char *default_sink, *default_source; +} pa_esound_options; + +pa_esound_protocol* pa_esound_protocol_get(pa_core*core); +pa_esound_protocol* pa_esound_protocol_ref(pa_esound_protocol *p); +void pa_esound_protocol_unref(pa_esound_protocol *p); +void pa_esound_protocol_connect(pa_esound_protocol *p, pa_iochannel *io, pa_esound_options *o); +void pa_esound_protocol_disconnect(pa_esound_protocol *p, pa_module *m); + +pa_esound_options* pa_esound_options_new(void); +pa_esound_options* pa_esound_options_ref(pa_esound_options *o); +void pa_esound_options_unref(pa_esound_options *o); +int pa_esound_options_parse(pa_esound_options *o, pa_core *c, pa_modargs *ma); #endif diff --git a/src/pulsecore/protocol-http.c b/src/pulsecore/protocol-http.c index 03990435..c89d48b6 100644 --- a/src/pulsecore/protocol-http.c +++ b/src/pulsecore/protocol-http.c @@ -35,6 +35,7 @@ #include #include #include +#include #include "protocol-http.h" @@ -48,16 +49,21 @@ #define URL_STATUS "/status" struct connection { - pa_protocol_http *protocol; + pa_http_protocol *protocol; pa_ioline *line; - enum { REQUEST_LINE, MIME_HEADER, DATA } state; + enum { + REQUEST_LINE, + MIME_HEADER, + DATA + } state; char *url; + pa_module *module; }; -struct pa_protocol_http { - pa_module *module; +struct pa_http_protocol { + PA_REFCNT_DECLARE; + pa_core *core; - pa_socket_server*server; pa_idxset *connections; }; @@ -101,14 +107,13 @@ static void http_message(struct connection *c, int code, const char *msg, const } -static void connection_free(struct connection *c, int del) { +static void connection_unlink(struct connection *c) { pa_assert(c); if (c->url) pa_xfree(c->url); - if (del) - pa_idxset_remove_by_data(c->protocol->connections, c, NULL); + pa_idxset_remove_by_data(c->protocol->connections, c, NULL); pa_ioline_unref(c->line); pa_xfree(c); @@ -121,7 +126,7 @@ static void line_callback(pa_ioline *line, const char *s, void *userdata) { if (!s) { /* EOF */ - connection_free(c, 1); + connection_unlink(c); return; } @@ -220,16 +225,15 @@ fail: internal_server_error(c); } -static void on_connection(pa_socket_server*s, pa_iochannel *io, void *userdata) { - pa_protocol_http *p = userdata; +void pa_http_protocol_connect(pa_http_protocol *p, pa_iochannel *io, pa_module *m) { struct connection *c; - pa_assert(s); - pa_assert(io); pa_assert(p); + pa_assert(io); + pa_assert(m); if (pa_idxset_size(p->connections)+1 > MAX_CONNECTIONS) { - pa_log_warn("Warning! Too many connections (%u), dropping incoming connection.", MAX_CONNECTIONS); + pa_log("Warning! Too many connections (%u), dropping incoming connection.", MAX_CONNECTIONS); pa_iochannel_free(io); return; } @@ -239,37 +243,73 @@ static void on_connection(pa_socket_server*s, pa_iochannel *io, void *userdata) c->line = pa_ioline_new(io); c->state = REQUEST_LINE; c->url = NULL; + c->module = m; pa_ioline_set_callback(c->line, line_callback, c); + pa_idxset_put(p->connections, c, NULL); } -pa_protocol_http* pa_protocol_http_new(pa_core *core, pa_socket_server *server, pa_module *m, PA_GCC_UNUSED pa_modargs *ma) { - pa_protocol_http* p; +void pa_http_protocol_disconnect(pa_http_protocol *p, pa_module *m) { + struct connection *c; + void *state = NULL; + + pa_assert(p); + pa_assert(m); + + while ((c = pa_idxset_iterate(p->connections, &state, NULL))) + if (c->module == m) + connection_unlink(c); +} + +static pa_http_protocol* http_protocol_new(pa_core *c) { + pa_http_protocol *p; - pa_core_assert_ref(core); - pa_assert(server); + pa_assert(c); - p = pa_xnew(pa_protocol_http, 1); - p->module = m; - p->core = core; - p->server = pa_socket_server_ref(server); + p = pa_xnew(pa_http_protocol, 1); + PA_REFCNT_INIT(p); + p->core = c; p->connections = pa_idxset_new(NULL, NULL); - pa_socket_server_set_callback(p->server, on_connection, p); + pa_assert_se(pa_shared_set(c, "http-protocol", p) >= 0); return p; } -static void free_connection(void *p, PA_GCC_UNUSED void *userdata) { +pa_http_protocol* pa_http_protocol_get(pa_core *c) { + pa_http_protocol *p; + + if ((p = pa_shared_get(c, "http-protocol"))) + return pa_http_protocol_ref(p); + + return http_protocol_new(c); +} + +pa_http_protocol* pa_http_protocol_ref(pa_http_protocol *p) { pa_assert(p); - connection_free(p, 0); + pa_assert(PA_REFCNT_VALUE(p) >= 1); + + PA_REFCNT_INC(p); + + return p; } -void pa_protocol_http_free(pa_protocol_http *p) { +void pa_http_protocol_unref(pa_http_protocol *p) { + struct connection *c; + pa_assert(p); + pa_assert(PA_REFCNT_VALUE(p) >= 1); + + if (PA_REFCNT_DEC(p) > 0) + return; + + while ((c = pa_idxset_first(p->connections, NULL))) + connection_unlink(c); + + pa_idxset_free(p->connections, NULL, NULL); + + pa_assert_se(pa_shared_remove(p->core, "http-protocol") >= 0); - pa_idxset_free(p->connections, free_connection, NULL); - pa_socket_server_unref(p->server); pa_xfree(p); } diff --git a/src/pulsecore/protocol-http.h b/src/pulsecore/protocol-http.h index e3372335..7e8f9760 100644 --- a/src/pulsecore/protocol-http.h +++ b/src/pulsecore/protocol-http.h @@ -23,13 +23,17 @@ ***/ #include -#include #include #include +#include -typedef struct pa_protocol_http pa_protocol_http; -pa_protocol_http* pa_protocol_http_new(pa_core *core, pa_socket_server *server, pa_module *m, pa_modargs *ma); -void pa_protocol_http_free(pa_protocol_http *n); +typedef struct pa_http_protocol pa_http_protocol; + +pa_http_protocol* pa_http_protocol_get(pa_core *core); +pa_http_protocol* pa_http_protocol_ref(pa_http_protocol *p); +void pa_http_protocol_unref(pa_http_protocol *p); +void pa_http_protocol_connect(pa_http_protocol *p, pa_iochannel *io, pa_module *m); +void pa_http_protocol_disconnect(pa_http_protocol *p, pa_module *m); #endif diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c index 853f2447..39a258f9 100644 --- a/src/pulsecore/protocol-native.c +++ b/src/pulsecore/protocol-native.c @@ -74,7 +74,7 @@ #define DEFAULT_FRAGSIZE_MSEC DEFAULT_TLENGTH_MSEC typedef struct connection connection; -struct pa_protocol_native; +struct pa_native_protocol; typedef struct record_stream { pa_msgobject parent; @@ -88,10 +88,18 @@ typedef struct record_stream { pa_usec_t source_latency; } record_stream; +PA_DECLARE_CLASS(record_stream); +#define RECORD_STREAM(o) (record_stream_cast(o)) +static PA_DEFINE_CHECK_TYPE(record_stream, pa_msgobject); + typedef struct output_stream { pa_msgobject parent; } output_stream; +PA_DECLARE_CLASS(output_stream); +#define OUTPUT_STREAM(o) (output_stream_cast(o)) +static PA_DEFINE_CHECK_TYPE(output_stream, pa_msgobject); + typedef struct playback_stream { output_stream parent; @@ -114,6 +122,10 @@ typedef struct playback_stream { size_t render_memblockq_length; } playback_stream; +PA_DECLARE_CLASS(playback_stream); +#define PLAYBACK_STREAM(o) (playback_stream_cast(o)) +static PA_DEFINE_CHECK_TYPE(playback_stream, output_stream); + typedef struct upload_stream { output_stream parent; @@ -128,13 +140,17 @@ typedef struct upload_stream { pa_proplist *proplist; } upload_stream; +PA_DECLARE_CLASS(upload_stream); +#define UPLOAD_STREAM(o) (upload_stream_cast(o)) +static PA_DEFINE_CHECK_TYPE(upload_stream, output_stream); + struct connection { pa_msgobject parent; - + pa_native_protocol *protocol; + pa_native_options *options; pa_bool_t authorized:1; pa_bool_t is_local:1; uint32_t version; - pa_protocol_native *protocol; pa_client *client; pa_pstream *pstream; pa_pdispatch *pdispatch; @@ -144,38 +160,21 @@ struct connection { pa_time_event *auth_timeout_event; }; -PA_DECLARE_CLASS(record_stream); -#define RECORD_STREAM(o) (record_stream_cast(o)) -static PA_DEFINE_CHECK_TYPE(record_stream, pa_msgobject); - -PA_DECLARE_CLASS(output_stream); -#define OUTPUT_STREAM(o) (output_stream_cast(o)) -static PA_DEFINE_CHECK_TYPE(output_stream, pa_msgobject); - -PA_DECLARE_CLASS(playback_stream); -#define PLAYBACK_STREAM(o) (playback_stream_cast(o)) -static PA_DEFINE_CHECK_TYPE(playback_stream, output_stream); - -PA_DECLARE_CLASS(upload_stream); -#define UPLOAD_STREAM(o) (upload_stream_cast(o)) -static PA_DEFINE_CHECK_TYPE(upload_stream, output_stream); - PA_DECLARE_CLASS(connection); #define CONNECTION(o) (connection_cast(o)) static PA_DEFINE_CHECK_TYPE(connection, pa_msgobject); -struct pa_protocol_native { - pa_module *module; +struct pa_native_protocol { + PA_REFCNT_DECLARE; + pa_core *core; - pa_bool_t public; - pa_socket_server *server; pa_idxset *connections; - uint8_t auth_cookie[PA_NATIVE_COOKIE_LENGTH]; - pa_bool_t auth_cookie_in_property; -#ifdef HAVE_CREDS - char *auth_group; -#endif - pa_ip_acl *auth_ip_acl; + + pa_strlist *servers; + pa_hook servers_changed; + + /* pa_hashmap *extensions; */ + }; enum { @@ -556,7 +555,7 @@ static record_stream* record_stream_new( pa_proplist_update(data.proplist, PA_UPDATE_REPLACE, p); pa_proplist_update(data.proplist, PA_UPDATE_MERGE, c->client->proplist); data.driver = __FILE__; - data.module = c->protocol->module; + data.module = c->options->module; data.client = c->client; data.source = source; data.direct_on_input = direct_on_input; @@ -901,7 +900,7 @@ static playback_stream* playback_stream_new( pa_proplist_update(data.proplist, PA_UPDATE_REPLACE, p); pa_proplist_update(data.proplist, PA_UPDATE_MERGE, c->client->proplist); data.driver = __FILE__; - data.module = c->protocol->module; + data.module = c->options->module; data.client = c->client; data.sink = sink; pa_sink_input_new_data_set_sample_spec(&data, ss); @@ -1002,6 +1001,9 @@ static void connection_unlink(connection *c) { if (!c->protocol) return; + if (c->options) + pa_native_options_unref(c->options); + while ((r = pa_idxset_first(c->record_streams, NULL))) record_stream_unlink(r); @@ -2007,17 +2009,17 @@ static void command_auth(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uint32_t if ((creds = pa_pdispatch_creds(pd))) { if (creds->uid == getuid()) success = TRUE; - else if (c->protocol->auth_group) { + else if (c->options->auth_group) { int r; gid_t gid; - if ((gid = pa_get_gid_of_group(c->protocol->auth_group)) == (gid_t) -1) - pa_log_warn("Failed to get GID of group '%s'", c->protocol->auth_group); + if ((gid = pa_get_gid_of_group(c->options->auth_group)) == (gid_t) -1) + pa_log_warn("Failed to get GID of group '%s'", c->options->auth_group); else if (gid == creds->gid) success = TRUE; if (!success) { - if ((r = pa_uid_in_group(creds->uid, c->protocol->auth_group)) < 0) + if ((r = pa_uid_in_group(creds->uid, c->options->auth_group)) < 0) pa_log_warn("Failed to check group membership."); else if (r > 0) success = TRUE; @@ -2031,8 +2033,13 @@ static void command_auth(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uint32_t } #endif - if (!success && memcmp(c->protocol->auth_cookie, cookie, PA_NATIVE_COOKIE_LENGTH) == 0) - success = TRUE; + if (!success && c->options->auth_cookie) { + const uint8_t *ac; + + if ((ac = pa_auth_cookie_read(c->options->auth_cookie, PA_NATIVE_COOKIE_LENGTH))) + if (memcmp(ac, cookie, PA_NATIVE_COOKIE_LENGTH) == 0) + success = TRUE; + } if (!success) { pa_log_warn("Denied access to client with invalid authorization data."); @@ -3951,7 +3958,7 @@ static void client_kill_cb(pa_client *c) { connection_unlink(CONNECTION(c->userdata)); } -/*** socket server callbacks ***/ +/*** module entry points ***/ static void auth_timeout(pa_mainloop_api*m, pa_time_event *e, const struct timeval *tv, void *userdata) { connection *c = CONNECTION(userdata); @@ -3965,13 +3972,13 @@ static void auth_timeout(pa_mainloop_api*m, pa_time_event *e, const struct timev connection_unlink(c); } -static void on_connection(PA_GCC_UNUSED pa_socket_server*s, pa_iochannel *io, void *userdata) { - pa_protocol_native *p = userdata; +void pa_native_protocol_connect(pa_native_protocol *p, pa_iochannel *io, pa_native_options *o) { connection *c; char cname[256], pname[128]; - pa_assert(io); pa_assert(p); + pa_assert(io); + pa_assert(o); if (pa_idxset_size(p->connections)+1 > MAX_CONNECTIONS) { pa_log_warn("Warning! Too many connections (%u), dropping incoming connection.", MAX_CONNECTIONS); @@ -3982,10 +3989,19 @@ static void on_connection(PA_GCC_UNUSED pa_socket_server*s, pa_iochannel *io, vo c = pa_msgobject_new(connection); c->parent.parent.free = connection_free; c->parent.process_msg = connection_process_msg; + c->protocol = p; + c->options = pa_native_options_ref(o); + c->authorized = FALSE; + + if (o->auth_anonymous) { + pa_log_info("Client authenticated anonymously."); + c->authorized = TRUE; + } - c->authorized = p->public; + if (!c->authorized && + o->auth_ip_acl && + pa_ip_acl_check(o->auth_ip_acl, pa_iochannel_get_recv_fd(io)) > 0) { - if (!c->authorized && p->auth_ip_acl && pa_ip_acl_check(p->auth_ip_acl, pa_iochannel_get_recv_fd(io)) > 0) { pa_log_info("Client authenticated by IP ACL."); c->authorized = TRUE; } @@ -4000,17 +4016,16 @@ static void on_connection(PA_GCC_UNUSED pa_socket_server*s, pa_iochannel *io, vo c->is_local = pa_iochannel_socket_is_local(io); c->version = 8; - c->protocol = p; + pa_iochannel_socket_peer_to_string(io, pname, sizeof(pname)); pa_snprintf(cname, sizeof(cname), "Native client (%s)", pname); c->client = pa_client_new(p->core, __FILE__, cname); pa_proplist_sets(c->client->proplist, "native-protocol.peer", pname); c->client->kill = client_kill_cb; c->client->userdata = c; - c->client->module = p->module; + c->client->module = o->module; c->pstream = pa_pstream_new(p->core->mainloop, io, p->core->mempool); - pa_pstream_set_recieve_packet_callback(c->pstream, pstream_packet_callback, c); pa_pstream_set_recieve_memblock_callback(c->pstream, pstream_memblock_callback, c); pa_pstream_set_die_callback(c->pstream, pstream_die_callback, c); @@ -4034,163 +4049,225 @@ static void on_connection(PA_GCC_UNUSED pa_socket_server*s, pa_iochannel *io, vo #endif } -/*** module entry points ***/ +void pa_native_protocol_disconnect(pa_native_protocol *p, pa_module *m) { + connection *c; + void *state = NULL; -static int load_key(pa_protocol_native*p, const char*fn) { pa_assert(p); + pa_assert(m); - p->auth_cookie_in_property = FALSE; + while ((c = pa_idxset_iterate(p->connections, &state, NULL))) + if (c->options->module == m) + connection_unlink(c); +} - if (!fn && pa_authkey_prop_get(p->core, PA_NATIVE_COOKIE_PROPERTY_NAME, p->auth_cookie, sizeof(p->auth_cookie)) >= 0) { - pa_log_info("using already loaded auth cookie."); - pa_authkey_prop_ref(p->core, PA_NATIVE_COOKIE_PROPERTY_NAME); - p->auth_cookie_in_property = TRUE; - return 0; - } +static pa_native_protocol* native_protocol_new(pa_core *c) { + pa_native_protocol *p; - if (!fn) - fn = PA_NATIVE_COOKIE_FILE; + pa_assert(c); - if (pa_authkey_load_auto(fn, p->auth_cookie, sizeof(p->auth_cookie)) < 0) - return -1; + p = pa_xnew(pa_native_protocol, 1); + PA_REFCNT_INIT(p); + p->core = c; + p->connections = pa_idxset_new(NULL, NULL); - pa_log_info("loading cookie from disk."); + p->servers = NULL; + pa_hook_init(&p->servers_changed, p); - if (pa_authkey_prop_put(p->core, PA_NATIVE_COOKIE_PROPERTY_NAME, p->auth_cookie, sizeof(p->auth_cookie)) >= 0) - p->auth_cookie_in_property = TRUE; + pa_assert_se(pa_shared_set(c, "native-protocol", p) >= 0); - return 0; + return p; } -static pa_protocol_native* protocol_new_internal(pa_core *c, pa_module *m, pa_modargs *ma) { - pa_protocol_native *p; - pa_bool_t public = FALSE; - const char *acl; +pa_native_protocol* pa_native_protocol_get(pa_core *c) { + pa_native_protocol *p; - pa_assert(c); - pa_assert(ma); + if ((p = pa_shared_get(c, "native-protocol"))) + return pa_native_protocol_ref(p); - if (pa_modargs_get_value_boolean(ma, "auth-anonymous", &public) < 0) { - pa_log("auth-anonymous= expects a boolean argument."); - return NULL; - } + return native_protocol_new(c); +} - p = pa_xnew(pa_protocol_native, 1); - p->core = c; - p->module = m; - p->public = public; - p->server = NULL; - p->auth_ip_acl = NULL; +pa_native_protocol* pa_native_protocol_ref(pa_native_protocol *p) { + pa_assert(p); + pa_assert(PA_REFCNT_VALUE(p) >= 1); -#ifdef HAVE_CREDS - { - pa_bool_t a = TRUE; - if (pa_modargs_get_value_boolean(ma, "auth-group-enabled", &a) < 0) { - pa_log("auth-group-enabled= expects a boolean argument."); - return NULL; - } - p->auth_group = a ? pa_xstrdup(pa_modargs_get_value(ma, "auth-group", pa_in_system_mode() ? PA_ACCESS_GROUP : NULL)) : NULL; + PA_REFCNT_INC(p); - if (p->auth_group) - pa_log_info("Allowing access to group '%s'.", p->auth_group); - } -#endif + return p; +} +void pa_native_protocol_unref(pa_native_protocol *p) { + connection *c; + pa_assert(p); + pa_assert(PA_REFCNT_VALUE(p) >= 1); - if ((acl = pa_modargs_get_value(ma, "auth-ip-acl", NULL))) { + if (PA_REFCNT_DEC(p) > 0) + return; - if (!(p->auth_ip_acl = pa_ip_acl_new(acl))) { - pa_log("Failed to parse IP ACL '%s'", acl); - goto fail; - } - } + while ((c = pa_idxset_first(p->connections, NULL))) + connection_unlink(c); - if (load_key(p, pa_modargs_get_value(ma, "cookie", NULL)) < 0) - goto fail; + pa_idxset_free(p->connections, NULL, NULL); - p->connections = pa_idxset_new(NULL, NULL); + pa_strlist_free(p->servers); + pa_hook_done(&p->servers_changed); - return p; + pa_assert_se(pa_shared_remove(p->core, "native-protocol") >= 0); -fail: -#ifdef HAVE_CREDS - pa_xfree(p->auth_group); -#endif - if (p->auth_ip_acl) - pa_ip_acl_free(p->auth_ip_acl); pa_xfree(p); - return NULL; } -pa_protocol_native* pa_protocol_native_new(pa_core *core, pa_socket_server *server, pa_module *m, pa_modargs *ma) { - char t[256]; - pa_protocol_native *p; +void pa_native_protocol_add_server_string(pa_native_protocol *p, const char *name) { + pa_assert(p); + pa_assert(PA_REFCNT_VALUE(p) >= 1); + pa_assert(name); - if (!(p = protocol_new_internal(core, m, ma))) - return NULL; + p->servers = pa_strlist_prepend(p->servers, name); - p->server = pa_socket_server_ref(server); - pa_socket_server_set_callback(p->server, on_connection, p); + pa_hook_fire(&p->servers_changed, p->servers); +} - if (pa_socket_server_get_address(p->server, t, sizeof(t))) { - pa_strlist *l; - l = pa_shared_get(core, PA_NATIVE_SERVER_PROPERTY_NAME); - l = pa_strlist_prepend(l, t); - pa_shared_replace(core, PA_NATIVE_SERVER_PROPERTY_NAME, l); - } +void pa_native_protocol_remove_server_string(pa_native_protocol *p, const char *name) { + pa_assert(p); + pa_assert(PA_REFCNT_VALUE(p) >= 1); + pa_assert(name); - return p; + p->servers = pa_strlist_remove(p->servers, name); + + pa_hook_fire(&p->servers_changed, p->servers); } -void pa_protocol_native_free(pa_protocol_native *p) { - connection *c; +pa_hook *pa_native_protocol_servers_changed(pa_native_protocol *p) { pa_assert(p); + pa_assert(PA_REFCNT_VALUE(p) >= 1); - while ((c = pa_idxset_first(p->connections, NULL))) - connection_unlink(c); - pa_idxset_free(p->connections, NULL, NULL); + return &p->servers_changed; +} + +pa_strlist *pa_native_protocol_servers(pa_native_protocol *p) { + pa_assert(p); + pa_assert(PA_REFCNT_VALUE(p) >= 1); - if (p->server) { - char t[256]; + return p->servers; +} - if (pa_socket_server_get_address(p->server, t, sizeof(t))) { - pa_strlist *l; - l = pa_shared_get(p->core, PA_NATIVE_SERVER_PROPERTY_NAME); - l = pa_strlist_remove(l, t); +/* int pa_native_protocol_install_extension(pa_native_protocol *p, pa_module *m, pa_native_protocol_extension_cb_t cb) { */ +/* pa_assert(p); */ +/* pa_assert(PA_REFCNT_VALUE(p) >= 1); */ +/* pa_assert(m); */ +/* pa_assert(cb); */ - if (l) - pa_shared_replace(p->core, PA_NATIVE_SERVER_PROPERTY_NAME, l); - else - pa_shared_remove(p->core, PA_NATIVE_SERVER_PROPERTY_NAME); - } - pa_socket_server_unref(p->server); +/* } */ + +/* void pa_native_protocol_remove_extension(pa_native_protocol *p, pa_module *m) { */ +/* pa_assert(p); */ +/* pa_assert(PA_REFCNT_VALUE(p) >= 1); */ +/* pa_assert(m); */ + +/* } */ + +pa_native_options* pa_native_options_new(void) { + pa_native_options *o; + + o = pa_xnew0(pa_native_options, 1); + PA_REFCNT_INIT(o); + + return o; +} + +pa_native_options* pa_native_options_ref(pa_native_options *o) { + pa_assert(o); + pa_assert(PA_REFCNT_VALUE(o) >= 1); + + PA_REFCNT_INC(o); + + return o; +} + +void pa_native_options_unref(pa_native_options *o) { + pa_assert(o); + pa_assert(PA_REFCNT_VALUE(o) >= 1); + + if (PA_REFCNT_DEC(o) > 0) + return; + + pa_xfree(o->auth_group); + + if (o->auth_ip_acl) + pa_ip_acl_free(o->auth_ip_acl); + + if (o->auth_cookie) + pa_auth_cookie_unref(o->auth_cookie); + + pa_xfree(o); +} + +int pa_native_options_parse(pa_native_options *o, pa_core *c, pa_modargs *ma) { + pa_bool_t enabled; + const char *acl; + + pa_assert(o); + pa_assert(PA_REFCNT_VALUE(o) >= 1); + pa_assert(ma); + + if (pa_modargs_get_value_boolean(ma, "auth-anonymous", &o->auth_anonymous) < 0) { + pa_log("auth-anonymous= expects a boolean argument."); + return -1; } - if (p->auth_cookie_in_property) - pa_authkey_prop_unref(p->core, PA_NATIVE_COOKIE_PROPERTY_NAME); + enabled = TRUE; + if (pa_modargs_get_value_boolean(ma, "auth-group-enabled", &enabled) < 0) { + pa_log("auth-group-enabled= expects a boolean argument."); + return -1; + } - if (p->auth_ip_acl) - pa_ip_acl_free(p->auth_ip_acl); + pa_xfree(o->auth_group); + o->auth_group = enabled ? pa_xstrdup(pa_modargs_get_value(ma, "auth-group", pa_in_system_mode() ? PA_ACCESS_GROUP : NULL)) : NULL; -#ifdef HAVE_CREDS - pa_xfree(p->auth_group); +#ifndef HAVE_CREDS + if (o->auth_group) + pa_log_warn("Authentication group configured, but not available on local system. Ignoring."); #endif - pa_xfree(p); -} -pa_protocol_native* pa_protocol_native_new_iochannel( - pa_core*core, - pa_iochannel *io, - pa_module *m, - pa_modargs *ma) { + if ((acl = pa_modargs_get_value(ma, "auth-ip-acl", NULL))) { + pa_ip_acl *ipa; - pa_protocol_native *p; + if (!(o->auth_ip_acl = pa_ip_acl_new(acl))) { + pa_log("Failed to parse IP ACL '%s'", acl); + return -1; + } - if (!(p = protocol_new_internal(core, m, ma))) - return NULL; + if (o->auth_ip_acl) + pa_ip_acl_free(o->auth_ip_acl); - on_connection(NULL, io, p); + o->auth_ip_acl = ipa; + } - return p; + enabled = TRUE; + if (pa_modargs_get_value_boolean(ma, "auth-cookie-enabled", &enabled) < 0) { + pa_log("auth-cookie-enabled= expects a boolean argument."); + return -1; + } + + if (o->auth_cookie) + pa_auth_cookie_unref(o->auth_cookie); + + if (enabled) { + const char *cn; + + /* The new name for this is 'auth-cookie', for compat reasons + * we check the old name too */ + if (!(cn = pa_modargs_get_value(ma, "auth-cookie", NULL))) + if (!(cn = pa_modargs_get_value(ma, "cookie", NULL))) + cn = PA_NATIVE_COOKIE_FILE; + + if (!(o->auth_cookie = pa_auth_cookie_get(c, cn, PA_NATIVE_COOKIE_LENGTH))) + return -1; + + } else + o->auth_cookie = NULL; + + return 0; } diff --git a/src/pulsecore/protocol-native.h b/src/pulsecore/protocol-native.h index a52fa8cf..7f0ef258 100644 --- a/src/pulsecore/protocol-native.h +++ b/src/pulsecore/protocol-native.h @@ -24,15 +24,47 @@ ***/ #include -#include +#include +#include +#include #include #include +#include +#include -typedef struct pa_protocol_native pa_protocol_native; +typedef struct pa_native_protocol pa_native_protocol; -pa_protocol_native* pa_protocol_native_new(pa_core*core, pa_socket_server *server, pa_module *m, pa_modargs *ma); -void pa_protocol_native_free(pa_protocol_native *n); +typedef struct pa_native_options { + PA_REFCNT_DECLARE; -pa_protocol_native* pa_protocol_native_new_iochannel(pa_core*core, pa_iochannel *io, pa_module *m, pa_modargs *ma); + pa_module *module; + + pa_bool_t auth_anonymous; + char *auth_group; + pa_ip_acl *auth_ip_acl; + pa_auth_cookie *auth_cookie; + +} pa_native_options; + +pa_native_protocol* pa_native_protocol_get(pa_core *core); +pa_native_protocol* pa_native_protocol_ref(pa_native_protocol *p); +void pa_native_protocol_unref(pa_native_protocol *p); +void pa_native_protocol_connect(pa_native_protocol *p, pa_iochannel *io, pa_native_options *a); +void pa_native_protocol_disconnect(pa_native_protocol *p, pa_module *m); + +void pa_native_protocol_add_server_string(pa_native_protocol *p, const char *name); +void pa_native_protocol_remove_server_string(pa_native_protocol *p, const char *name); + +pa_hook *pa_native_protocol_servers_changed(pa_native_protocol *p); +pa_strlist *pa_native_protocol_servers(pa_native_protocol *p); + +/* typedef void (*pa_native_protocol_extension_cb_t)(pa_native_protocol *p, pa_module *m, pa_pstream *p, uint32_t tag, pa_tagstruct *t); */ +/* int pa_native_protocol_install_extension(pa_native_protocol *p, pa_module *m, pa_native_protocol_extension_cb_t cb); */ +/* void pa_native_protocol_remove_extension(pa_native_protocol *p, pa_module *m); */ + +pa_native_options* pa_native_options_new(void); +pa_native_options* pa_native_options_ref(pa_native_options *o); +void pa_native_options_unref(pa_native_options *o); +int pa_native_options_parse(pa_native_options *o, pa_core *c, pa_modargs *ma); #endif diff --git a/src/pulsecore/protocol-simple.c b/src/pulsecore/protocol-simple.c index 020a281d..78874bb9 100644 --- a/src/pulsecore/protocol-simple.c +++ b/src/pulsecore/protocol-simple.c @@ -42,6 +42,7 @@ #include #include #include +#include #include "protocol-simple.h" @@ -50,7 +51,8 @@ typedef struct connection { pa_msgobject parent; - pa_protocol_simple *protocol; + pa_simple_protocol *protocol; + pa_simple_options *options; pa_iochannel *io; pa_sink_input *sink_input; pa_source_output *source_output; @@ -71,20 +73,11 @@ PA_DECLARE_CLASS(connection); #define CONNECTION(o) (connection_cast(o)) static PA_DEFINE_CHECK_TYPE(connection, pa_msgobject); -struct pa_protocol_simple { - pa_module *module; +struct pa_simple_protocol { + PA_REFCNT_DECLARE; + pa_core *core; - pa_socket_server*server; pa_idxset *connections; - - enum { - RECORD = 1, - PLAYBACK = 2, - DUPLEX = 3 - } mode; - - pa_sample_spec sample_spec; - char *source_name, *sink_name; }; enum { @@ -98,7 +91,6 @@ enum { CONNECTION_MESSAGE_UNLINK_CONNECTION /* Please drop a aconnection now */ }; - #define PLAYBACK_BUFFER_SECONDS (.5) #define PLAYBACK_BUFFER_FRAGMENTS (10) #define RECORD_BUFFER_SECONDS (5) @@ -111,6 +103,11 @@ static void connection_unlink(connection *c) { if (!c->protocol) return; + if (c->options) { + pa_simple_options_unref(c->options); + c->options = NULL; + } + if (c->sink_input) { pa_sink_input_unlink(c->sink_input); pa_sink_input_unref(c->sink_input); @@ -477,14 +474,13 @@ static void io_callback(pa_iochannel*io, void *userdata) { /*** socket_server callbacks ***/ -static void on_connection(pa_socket_server*s, pa_iochannel *io, void *userdata) { - pa_protocol_simple *p = userdata; +void pa_simple_protocol_connect(pa_simple_protocol *p, pa_iochannel *io, pa_simple_options *o) { connection *c = NULL; char cname[256], pname[128]; - pa_assert(s); - pa_assert(io); pa_assert(p); + pa_assert(io); + pa_assert(o); if (pa_idxset_size(p->connections)+1 > MAX_CONNECTIONS) { pa_log("Warning! Too many connections (%u), dropping incoming connection.", MAX_CONNECTIONS); @@ -500,6 +496,7 @@ static void on_connection(pa_socket_server*s, pa_iochannel *io, void *userdata) c->source_output = NULL; c->input_memblockq = c->output_memblockq = NULL; c->protocol = p; + c->options = pa_simple_options_ref(o); c->playback.current_memblock = NULL; c->playback.memblock_index = 0; c->dead = FALSE; @@ -510,27 +507,27 @@ static void on_connection(pa_socket_server*s, pa_iochannel *io, void *userdata) pa_snprintf(cname, sizeof(cname), "Simple client (%s)", pname); pa_assert_se(c->client = pa_client_new(p->core, __FILE__, cname)); pa_proplist_sets(c->client->proplist, "simple-protocol.peer", pname); - c->client->module = p->module; + c->client->module = o->module; c->client->kill = client_kill_cb; c->client->userdata = c; - if (p->mode & PLAYBACK) { + if (o->playback) { pa_sink_input_new_data data; size_t l; pa_sink *sink; - if (!(sink = pa_namereg_get(c->protocol->core, c->protocol->sink_name, PA_NAMEREG_SINK, TRUE))) { + if (!(sink = pa_namereg_get(c->protocol->core, o->default_sink, PA_NAMEREG_SINK, TRUE))) { pa_log("Failed to get sink."); goto fail; } pa_sink_input_new_data_init(&data); data.driver = __FILE__; - data.module = p->module; + data.module = o->module; data.client = c->client; data.sink = sink; pa_proplist_update(data.proplist, PA_UPDATE_MERGE, c->client->proplist); - pa_sink_input_new_data_set_sample_spec(&data, &p->sample_spec); + pa_sink_input_new_data_set_sample_spec(&data, &o->sample_spec); c->sink_input = pa_sink_input_new(p->core, &data, 0); pa_sink_input_new_data_done(&data); @@ -549,12 +546,12 @@ static void on_connection(pa_socket_server*s, pa_iochannel *io, void *userdata) pa_sink_input_set_requested_latency(c->sink_input, DEFAULT_SINK_LATENCY); - l = (size_t) (pa_bytes_per_second(&p->sample_spec)*PLAYBACK_BUFFER_SECONDS); + l = (size_t) (pa_bytes_per_second(&o->sample_spec)*PLAYBACK_BUFFER_SECONDS); c->input_memblockq = pa_memblockq_new( 0, l, l, - pa_frame_size(&p->sample_spec), + pa_frame_size(&o->sample_spec), (size_t) -1, l/PLAYBACK_BUFFER_FRAGMENTS, 0, @@ -566,23 +563,23 @@ static void on_connection(pa_socket_server*s, pa_iochannel *io, void *userdata) pa_sink_input_put(c->sink_input); } - if (p->mode & RECORD) { + if (o->record) { pa_source_output_new_data data; size_t l; pa_source *source; - if (!(source = pa_namereg_get(c->protocol->core, c->protocol->source_name, PA_NAMEREG_SOURCE, TRUE))) { + if (!(source = pa_namereg_get(c->protocol->core, o->default_source, PA_NAMEREG_SOURCE, TRUE))) { pa_log("Failed to get source."); goto fail; } pa_source_output_new_data_init(&data); data.driver = __FILE__; - data.module = p->module; + data.module = o->module; data.client = c->client; data.source = source; pa_proplist_update(data.proplist, PA_UPDATE_MERGE, c->client->proplist); - pa_source_output_new_data_set_sample_spec(&data, &p->sample_spec); + pa_source_output_new_data_set_sample_spec(&data, &o->sample_spec); c->source_output = pa_source_output_new(p->core, &data, 0); pa_source_output_new_data_done(&data); @@ -598,12 +595,12 @@ static void on_connection(pa_socket_server*s, pa_iochannel *io, void *userdata) pa_source_output_set_requested_latency(c->source_output, DEFAULT_SOURCE_LATENCY); - l = (size_t) (pa_bytes_per_second(&p->sample_spec)*RECORD_BUFFER_SECONDS); + l = (size_t) (pa_bytes_per_second(&o->sample_spec)*RECORD_BUFFER_SECONDS); c->output_memblockq = pa_memblockq_new( 0, l, 0, - pa_frame_size(&p->sample_spec), + pa_frame_size(&o->sample_spec), 1, 0, 0, @@ -623,74 +620,137 @@ fail: connection_unlink(c); } -pa_protocol_simple* pa_protocol_simple_new(pa_core *core, pa_socket_server *server, pa_module *m, pa_modargs *ma) { - pa_protocol_simple* p = NULL; - pa_bool_t enable; +void pa_simple_protocol_disconnect(pa_simple_protocol *p, pa_module *m) { + connection *c; + void *state = NULL; - pa_assert(core); - pa_assert(server); + pa_assert(p); pa_assert(m); - pa_assert(ma); - p = pa_xnew0(pa_protocol_simple, 1); - p->module = m; - p->core = core; - p->server = pa_socket_server_ref(server); + while ((c = pa_idxset_iterate(p->connections, &state, NULL))) + if (c->options->module == m) + connection_unlink(c); +} + +static pa_simple_protocol* simple_protocol_new(pa_core *c) { + pa_simple_protocol *p; + + pa_assert(c); + + p = pa_xnew(pa_simple_protocol, 1); + PA_REFCNT_INIT(p); + p->core = c; p->connections = pa_idxset_new(NULL, NULL); - p->sample_spec = core->default_sample_spec; - if (pa_modargs_get_sample_spec(ma, &p->sample_spec) < 0) { - pa_log("Failed to parse sample type specification."); - goto fail; - } + pa_assert_se(pa_shared_set(c, "simple-protocol", p) >= 0); - p->source_name = pa_xstrdup(pa_modargs_get_value(ma, "source", NULL)); - p->sink_name = pa_xstrdup(pa_modargs_get_value(ma, "sink", NULL)); + return p; +} - enable = FALSE; - if (pa_modargs_get_value_boolean(ma, "record", &enable) < 0) { - pa_log("record= expects a numeric argument."); - goto fail; - } - p->mode = enable ? RECORD : 0; +pa_simple_protocol* pa_simple_protocol_get(pa_core *c) { + pa_simple_protocol *p; - enable = TRUE; - if (pa_modargs_get_value_boolean(ma, "playback", &enable) < 0) { - pa_log("playback= expects a numeric argument."); - goto fail; - } - p->mode |= enable ? PLAYBACK : 0; + if ((p = pa_shared_get(c, "simple-protocol"))) + return pa_simple_protocol_ref(p); - if ((p->mode & (RECORD|PLAYBACK)) == 0) { - pa_log("neither playback nor recording enabled for protocol."); - goto fail; - } + return simple_protocol_new(c); +} + +pa_simple_protocol* pa_simple_protocol_ref(pa_simple_protocol *p) { + pa_assert(p); + pa_assert(PA_REFCNT_VALUE(p) >= 1); - pa_socket_server_set_callback(p->server, on_connection, p); + PA_REFCNT_INC(p); return p; +} -fail: - if (p) - pa_protocol_simple_free(p); +void pa_simple_protocol_unref(pa_simple_protocol *p) { + connection *c; + pa_assert(p); + pa_assert(PA_REFCNT_VALUE(p) >= 1); + + if (PA_REFCNT_DEC(p) > 0) + return; - return NULL; + while ((c = pa_idxset_first(p->connections, NULL))) + connection_unlink(c); + + pa_idxset_free(p->connections, NULL, NULL); + + pa_assert_se(pa_shared_remove(p->core, "simple-protocol") >= 0); + + pa_xfree(p); } +pa_simple_options* pa_simple_options_new(void) { + pa_simple_options *o; -void pa_protocol_simple_free(pa_protocol_simple *p) { - connection *c; - pa_assert(p); + o = pa_xnew0(pa_simple_options, 1); + PA_REFCNT_INIT(o); - if (p->connections) { - while((c = pa_idxset_first(p->connections, NULL))) - connection_unlink(c); + return o; +} + +pa_simple_options* pa_simple_options_ref(pa_simple_options *o) { + pa_assert(o); + pa_assert(PA_REFCNT_VALUE(o) >= 1); + + PA_REFCNT_INC(o); + + return o; +} + +void pa_simple_options_unref(pa_simple_options *o) { + pa_assert(o); + pa_assert(PA_REFCNT_VALUE(o) >= 1); + + if (PA_REFCNT_DEC(o) > 0) + return; + + pa_xfree(o->default_sink); + pa_xfree(o->default_source); + + pa_xfree(o); +} - pa_idxset_free(p->connections, NULL, NULL); +int pa_simple_options_parse(pa_simple_options *o, pa_core *c, pa_modargs *ma) { + pa_bool_t enabled; + + pa_assert(o); + pa_assert(PA_REFCNT_VALUE(o) >= 1); + pa_assert(ma); + + o->sample_spec = c->default_sample_spec; + if (pa_modargs_get_sample_spec_and_channel_map(ma, &o->sample_spec, &o->channel_map, PA_CHANNEL_MAP_DEFAULT) < 0) { + pa_log("Failed to parse sample type specification."); + return -1; } - if (p->server) - pa_socket_server_unref(p->server); + pa_xfree(o->default_source); + o->default_source = pa_xstrdup(pa_modargs_get_value(ma, "source", NULL)); - pa_xfree(p); + pa_xfree(o->default_sink); + o->default_sink = pa_xstrdup(pa_modargs_get_value(ma, "sink", NULL)); + + enabled = FALSE; + if (pa_modargs_get_value_boolean(ma, "record", &enabled) < 0) { + pa_log("record= expects a boolean argument."); + return -1; + } + o->record = enabled; + + enabled = TRUE; + if (pa_modargs_get_value_boolean(ma, "playback", &enabled) < 0) { + pa_log("playback= expects a boolean argument."); + return -1; + } + o->playback = enabled; + + if (!o->playback && !o->record) { + pa_log("neither playback nor recording enabled for protocol."); + return -1; + } + + return 0; } diff --git a/src/pulsecore/protocol-simple.h b/src/pulsecore/protocol-simple.h index e1b3143b..c10eabe7 100644 --- a/src/pulsecore/protocol-simple.h +++ b/src/pulsecore/protocol-simple.h @@ -27,9 +27,31 @@ #include #include -typedef struct pa_protocol_simple pa_protocol_simple; +typedef struct pa_simple_protocol pa_simple_protocol; -pa_protocol_simple* pa_protocol_simple_new(pa_core *core, pa_socket_server *server, pa_module *m, pa_modargs *ma); -void pa_protocol_simple_free(pa_protocol_simple *n); +typedef struct pa_simple_options { + PA_REFCNT_DECLARE; + + pa_module *module; + + char *default_sink, *default_source; + + pa_sample_spec sample_spec; + pa_channel_map channel_map; + + pa_bool_t record:1; + pa_bool_t playback:1; +} pa_simple_options; + +pa_simple_protocol* pa_simple_protocol_get(pa_core*core); +pa_simple_protocol* pa_simple_protocol_ref(pa_simple_protocol *p); +void pa_simple_protocol_unref(pa_simple_protocol *p); +void pa_simple_protocol_connect(pa_simple_protocol *p, pa_iochannel *io, pa_simple_options *o); +void pa_simple_protocol_disconnect(pa_simple_protocol *p, pa_module *m); + +pa_simple_options* pa_simple_options_new(void); +pa_simple_options* pa_simple_options_ref(pa_simple_options *o); +void pa_simple_options_unref(pa_simple_options *o); +int pa_simple_options_parse(pa_simple_options *o, pa_core *c, pa_modargs *ma); #endif -- cgit From 98fbd24d62bfe1fbbf8aaf7adb367e44da66fcd8 Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Sun, 3 Aug 2008 12:45:35 +0100 Subject: fix iteration over random devices Actually iterate over the various random devices. Fixes a infinite loop on startup when /dev/urandom isn't readable. Patch by Matt Kraai on Debian bug 491270, closes #333 Signed-off-by: Lennart Poettering --- src/pulsecore/random.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pulsecore/random.c b/src/pulsecore/random.c index 5deac37b..da381065 100644 --- a/src/pulsecore/random.c +++ b/src/pulsecore/random.c @@ -77,6 +77,8 @@ static int random_proper(void *ret_data, size_t length) { if (ret == 0) break; + + device++; } return ret; -- cgit From f417bb42cf68920c5679a39296fca1c48864d7cb Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 3 Aug 2008 17:00:52 +0200 Subject: some pa_bool_t'ization --- src/pulsecore/random.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/pulsecore/random.c b/src/pulsecore/random.c index da381065..518c281a 100644 --- a/src/pulsecore/random.c +++ b/src/pulsecore/random.c @@ -37,7 +37,7 @@ #include "random.h" -static int has_whined = 0; +static pa_bool_t has_whined = TRUE; static const char * const devices[] = { "/dev/urandom", "/dev/random", NULL }; @@ -89,9 +89,11 @@ void pa_random_seed(void) { unsigned int seed; if (random_proper(&seed, sizeof(unsigned int)) < 0) { - if (!has_whined) + + if (!has_whined) { pa_log_warn("Failed to get proper entropy. Falling back to seeding with current time."); - has_whined = 1; + has_whined = TRUE; + } seed = (unsigned int) time(NULL); } @@ -109,9 +111,10 @@ void pa_random(void *ret_data, size_t length) { if (random_proper(ret_data, length) >= 0) return; - if (!has_whined) + if (!has_whined) { pa_log_warn("Failed to get proper entropy. Falling back to unsecure pseudo RNG."); - has_whined = 1; + has_whined = TRUE; + } for (p = ret_data, l = length; l > 0; p++, l--) *p = (uint8_t) rand(); -- cgit From 23bde22b1002b8900bb712fe30ffc30ec2deff93 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 3 Aug 2008 18:53:43 +0200 Subject: start idle timer even when no module is ever loaded --- src/pulsecore/core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pulsecore/core.c b/src/pulsecore/core.c index 1907fcaf..aa8de8df 100644 --- a/src/pulsecore/core.c +++ b/src/pulsecore/core.c @@ -149,6 +149,8 @@ pa_core* pa_core_new(pa_mainloop_api *m, int shared) { pa_check_signal_is_blocked(SIGPIPE); #endif + pa_core_check_quit(c); + return c; } -- cgit From 114f290be73889a92e8f0a248a3fde1fd09c2dc9 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 3 Aug 2008 18:54:55 +0200 Subject: add a new error code PA_ERR_NOEXTENSION --- src/pulse/def.h | 1 + src/pulse/error.c | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pulse/def.h b/src/pulse/def.h index 95071978..aa07d1c9 100644 --- a/src/pulse/def.h +++ b/src/pulse/def.h @@ -352,6 +352,7 @@ enum { PA_ERR_TOOLARGE, /**< Data too large */ PA_ERR_NOTSUPPORTED, /**< Operation not supported \since 0.9.5 */ PA_ERR_UNKNOWN, /**< The error code was unknown to the client */ + PA_ERR_NOEXTENSION, /**< Extension does not exist. \since 0.9.12 */ PA_ERR_MAX /**< Not really an error but the first invalid error code */ }; diff --git a/src/pulse/error.c b/src/pulse/error.c index 29690c89..50bbf703 100644 --- a/src/pulse/error.c +++ b/src/pulse/error.c @@ -57,7 +57,10 @@ const char*pa_strerror(int error) { [PA_ERR_BADSTATE] = "Bad state", [PA_ERR_NODATA] = "No data", [PA_ERR_VERSION] = "Incompatible protocol version", - [PA_ERR_TOOLARGE] = "Too large" + [PA_ERR_TOOLARGE] = "Too large", + [PA_ERR_NOTSUPPORTED] = "Not supported", + [PA_ERR_UNKNOWN] = "Unknown error code", + [PA_ERR_NOEXTENSION] = "No such extension" }; if (error < 0 || error >= PA_ERR_MAX) -- cgit From 9bfd67f70f31b5b84dea5e16e7b43ab939d94f6b Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 3 Aug 2008 18:55:42 +0200 Subject: store load_once flag for module --- src/pulsecore/module.c | 5 ++++- src/pulsecore/module.h | 8 +++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/pulsecore/module.c b/src/pulsecore/module.c index e003dd7c..edd0b0a7 100644 --- a/src/pulsecore/module.c +++ b/src/pulsecore/module.c @@ -76,6 +76,7 @@ pa_module* pa_module_load(pa_core *c, const char *name, const char *argument) { m = pa_xnew(pa_module, 1); m->name = pa_xstrdup(name); m->argument = pa_xstrdup(argument); + m->load_once = FALSE; if (!(m->dl = lt_dlopenext(name))) { pa_log("Failed to open module \"%s\": %s", name, lt_dlerror()); @@ -84,7 +85,9 @@ pa_module* pa_module_load(pa_core *c, const char *name, const char *argument) { if ((load_once = (pa_bool_t (*)(void)) pa_load_sym(m->dl, name, PA_SYMBOL_LOAD_ONCE))) { - if (load_once() && c->modules) { + m->load_once = load_once(); + + if (m->load_once && c->modules) { pa_module *i; uint32_t idx; /* OK, the module only wants to be loaded once, let's make sure it is */ diff --git a/src/pulsecore/module.h b/src/pulsecore/module.h index ec582f25..bb3a3f57 100644 --- a/src/pulsecore/module.h +++ b/src/pulsecore/module.h @@ -43,10 +43,12 @@ struct pa_module { void *userdata; int n_used; - pa_bool_t auto_unload; - time_t last_used_time; - pa_bool_t unload_requested; + pa_bool_t auto_unload:1; + pa_bool_t load_once:1; + pa_bool_t unload_requested:1; + + time_t last_used_time; }; pa_module* pa_module_load(pa_core *c, const char *name, const char*argument); -- cgit From 04ffac57a67eee9640f248b6fab33ee8367b0eab Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 3 Aug 2008 18:56:10 +0200 Subject: add extension system for native protocol --- PROTOCOL | 8 ++++- configure.ac | 2 +- src/pulsecore/native-common.h | 6 ++-- src/pulsecore/protocol-native.c | 69 +++++++++++++++++++++++++++++++++-------- src/pulsecore/protocol-native.h | 8 +++-- 5 files changed, 73 insertions(+), 20 deletions(-) diff --git a/PROTOCOL b/PROTOCOL index 4439c713..4885b3d1 100644 --- a/PROTOCOL +++ b/PROTOCOL @@ -79,7 +79,7 @@ New opcodes for notifications: PA_COMMAND_PLAYBACK_STREAM_MOVED PA_COMMAND_CAPTURE_STREAM_MOVED -### v13, implemented by >= 0.9.11 +### v13, implemented by >= 0.9.11 New fields for PA_COMMAND_CREATE_PLAYBACK_STREAM, PA_COMMAND_CREATE_RECORD_STREAM request at the end: @@ -134,3 +134,9 @@ PA_COMMAND_SET_RECORD_STREAM_BUFFER_ATTR at the end: new message: PA_COMMAND_STARTED + +### v14, implemented by >= 0.9.12 + +new message: + + PA_COMMAND_EXTENSION diff --git a/configure.ac b/configure.ac index 2ea4d893..ac3090c3 100644 --- a/configure.ac +++ b/configure.ac @@ -35,7 +35,7 @@ AC_SUBST(PA_MAJORMINOR, "PA_MAJOR.PA_MINOR") AC_SUBST(PACKAGE_URL, [http://pulseaudio.org/]) AC_SUBST(PA_API_VERSION, 12) -AC_SUBST(PA_PROTOCOL_VERSION, 13) +AC_SUBST(PA_PROTOCOL_VERSION, 14) # The stable ABI for client applications, for the version info x:y:z # always will hold y=z diff --git a/src/pulsecore/native-common.h b/src/pulsecore/native-common.h index 809d6c75..8138b7a4 100644 --- a/src/pulsecore/native-common.h +++ b/src/pulsecore/native-common.h @@ -137,7 +137,7 @@ enum { PA_COMMAND_PLAYBACK_STREAM_MOVED, PA_COMMAND_RECORD_STREAM_MOVED, - /* Supported since protocol v13 (0.9.10) */ + /* Supported since protocol v13 (0.9.11) */ PA_COMMAND_UPDATE_RECORD_STREAM_PROPLIST, PA_COMMAND_UPDATE_PLAYBACK_STREAM_PROPLIST, PA_COMMAND_UPDATE_CLIENT_PROPLIST, @@ -148,6 +148,9 @@ enum { /* SERVER->CLIENT */ PA_COMMAND_STARTED, + /* Supported since protocol v14 (0.9.12) */ + PA_COMMAND_EXTENSION, + PA_COMMAND_MAX }; @@ -161,7 +164,6 @@ enum { #define PA_NATIVE_DEFAULT_UNIX_SOCKET "native" - PA_C_DECL_END #endif diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c index 39a258f9..ef56a6f4 100644 --- a/src/pulsecore/protocol-native.c +++ b/src/pulsecore/protocol-native.c @@ -173,7 +173,7 @@ struct pa_native_protocol { pa_strlist *servers; pa_hook servers_changed; - /* pa_hashmap *extensions; */ + pa_hashmap *extensions; }; @@ -263,6 +263,7 @@ static void command_set_stream_buffer_attr(pa_pdispatch *pd, uint32_t command, u static void command_update_stream_sample_rate(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata); static void command_update_proplist(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata); static void command_remove_proplist(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata); +static void command_extension(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata); static const pa_pdispatch_cb_t command_table[PA_COMMAND_MAX] = { [PA_COMMAND_ERROR] = NULL, @@ -353,6 +354,8 @@ static const pa_pdispatch_cb_t command_table[PA_COMMAND_MAX] = { [PA_COMMAND_REMOVE_RECORD_STREAM_PROPLIST] = command_remove_proplist, [PA_COMMAND_REMOVE_PLAYBACK_STREAM_PROPLIST] = command_remove_proplist, [PA_COMMAND_REMOVE_CLIENT_PROPLIST] = command_remove_proplist, + + [PA_COMMAND_EXTENSION] = command_extension }; /* structure management */ @@ -3837,6 +3840,43 @@ static void command_suspend(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa pa_pstream_send_simple_ack(c->pstream, tag); } +static void command_extension(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) { + connection *c = CONNECTION(userdata); + uint32_t idx = PA_INVALID_INDEX; + const char *name = NULL; + pa_module *m; + pa_native_protocol_ext_cb_t cb; + + connection_assert_ref(c); + pa_assert(t); + + if (pa_tagstruct_getu32(t, &idx) < 0 || + pa_tagstruct_gets(t, &name) < 0) { + protocol_error(c); + return; + } + + CHECK_VALIDITY(c->pstream, c->authorized, tag, PA_ERR_ACCESS); + CHECK_VALIDITY(c->pstream, idx != PA_INVALID_INDEX || !name || !*name || pa_utf8_valid(name), tag, PA_ERR_INVALID); + + if (idx != PA_INVALID_INDEX) + m = pa_idxset_get_by_index(c->protocol->core->modules, idx); + else { + for (m = pa_idxset_first(c->protocol->core->modules, &idx); m; m = pa_idxset_next(c->protocol->core->modules, &idx)) + if (strcmp(name, m->name) == 0) + break; + } + + CHECK_VALIDITY(c->pstream, m, tag, PA_ERR_NOEXTENSION); + CHECK_VALIDITY(c->pstream, m->load_once || idx != PA_INVALID_INDEX, tag, PA_ERR_INVALID); + + cb = (pa_native_protocol_ext_cb_t) pa_hashmap_get(c->protocol->extensions, m); + CHECK_VALIDITY(c->pstream, m, tag, PA_ERR_NOEXTENSION); + + cb(c->protocol, m, c->pstream, tag, t); +} + + /*** pstream callbacks ***/ static void pstream_packet_callback(pa_pstream *p, pa_packet *packet, const pa_creds *creds, void *userdata) { @@ -4152,21 +4192,24 @@ pa_strlist *pa_native_protocol_servers(pa_native_protocol *p) { return p->servers; } -/* int pa_native_protocol_install_extension(pa_native_protocol *p, pa_module *m, pa_native_protocol_extension_cb_t cb) { */ -/* pa_assert(p); */ -/* pa_assert(PA_REFCNT_VALUE(p) >= 1); */ -/* pa_assert(m); */ -/* pa_assert(cb); */ - +int pa_native_protocol_install_ext(pa_native_protocol *p, pa_module *m, pa_native_protocol_ext_cb_t cb) { + pa_assert(p); + pa_assert(PA_REFCNT_VALUE(p) >= 1); + pa_assert(m); + pa_assert(cb); + pa_assert(!pa_hashmap_get(p->extensions, m)); -/* } */ + pa_assert_se(pa_hashmap_put(p->extensions, m, (void*) cb) == 0); + return 0; +} -/* void pa_native_protocol_remove_extension(pa_native_protocol *p, pa_module *m) { */ -/* pa_assert(p); */ -/* pa_assert(PA_REFCNT_VALUE(p) >= 1); */ -/* pa_assert(m); */ +void pa_native_protocol_remove_ext(pa_native_protocol *p, pa_module *m) { + pa_assert(p); + pa_assert(PA_REFCNT_VALUE(p) >= 1); + pa_assert(m); -/* } */ + pa_assert_se(pa_hashmap_remove(p->extensions, m)); +} pa_native_options* pa_native_options_new(void) { pa_native_options *o; diff --git a/src/pulsecore/protocol-native.h b/src/pulsecore/protocol-native.h index 7f0ef258..b3db305c 100644 --- a/src/pulsecore/protocol-native.h +++ b/src/pulsecore/protocol-native.h @@ -31,6 +31,8 @@ #include #include #include +#include +#include typedef struct pa_native_protocol pa_native_protocol; @@ -58,9 +60,9 @@ void pa_native_protocol_remove_server_string(pa_native_protocol *p, const char * pa_hook *pa_native_protocol_servers_changed(pa_native_protocol *p); pa_strlist *pa_native_protocol_servers(pa_native_protocol *p); -/* typedef void (*pa_native_protocol_extension_cb_t)(pa_native_protocol *p, pa_module *m, pa_pstream *p, uint32_t tag, pa_tagstruct *t); */ -/* int pa_native_protocol_install_extension(pa_native_protocol *p, pa_module *m, pa_native_protocol_extension_cb_t cb); */ -/* void pa_native_protocol_remove_extension(pa_native_protocol *p, pa_module *m); */ +typedef void (*pa_native_protocol_ext_cb_t)(pa_native_protocol *p, pa_module *m, pa_pstream *ps, uint32_t tag, pa_tagstruct *t); +int pa_native_protocol_install_ext(pa_native_protocol *p, pa_module *m, pa_native_protocol_ext_cb_t cb); +void pa_native_protocol_remove_ext(pa_native_protocol *p, pa_module *m); pa_native_options* pa_native_options_new(void); pa_native_options* pa_native_options_ref(pa_native_options *o); -- cgit