diff options
| author | Alexander Couzens <lynxis@fe80.eu> | 2013-09-16 14:08:14 +0200 |
|---|---|---|
| committer | Tanu Kaskinen <tanu.kaskinen@linux.intel.com> | 2013-11-15 10:16:29 +0200 |
| commit | abfca5cb58d12d5df18c2ec4d42f8d7540b2bd6a (patch) | |
| tree | e2da51db0b581cebd1c140ff67d680bff4a0e0a4 /src/modules/module-tunnel-sink-new.c | |
| parent | 49dd827373f2d2da52c8e002ad4c8a70a719fdca (diff) | |
| download | pulseaudio-abfca5cb58d12d5df18c2ec4d42f8d7540b2bd6a.tar.gz | |
tunnel-new: add cookie module argument
When connecting to a remote server your local generated authentication
cookie is used. If remote server's cookie is different from your local
one you aren't allowed to connect. You can use the cookie argument
or define a wider acl in remote server configuration for
module-native-protocol.
Diffstat (limited to 'src/modules/module-tunnel-sink-new.c')
| -rw-r--r-- | src/modules/module-tunnel-sink-new.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/modules/module-tunnel-sink-new.c b/src/modules/module-tunnel-sink-new.c index ee05d18f9..8d0409275 100644 --- a/src/modules/module-tunnel-sink-new.c +++ b/src/modules/module-tunnel-sink-new.c @@ -56,7 +56,8 @@ PA_MODULE_USAGE( "format=<sample format> " "channels=<number of channels> " "rate=<sample rate> " - "channel_map=<channel map>" + "channel_map=<channel map> " + "cookie=<cookie file path>" ); #define TUNNEL_THREAD_FAILED_MAINLOOP 1 @@ -82,6 +83,7 @@ struct userdata { bool connected; + char *cookie_file; char *remote_server; char *remote_sink_name; }; @@ -95,7 +97,7 @@ static const char* const valid_modargs[] = { "channels", "rate", "channel_map", - /* "cookie", unimplemented */ + "cookie", /* "reconnect", reconnect if server comes back again - unimplemented */ NULL, }; @@ -139,6 +141,11 @@ static void thread_func(void *userdata) { goto fail; } + if (u->cookie_file && pa_context_load_cookie_from_file(u->context, u->cookie_file) != 0) { + pa_log_error("Can not load cookie file!"); + goto fail; + } + pa_context_set_state_callback(u->context, context_state_cb, u); if (pa_context_connect(u->context, u->remote_server, @@ -450,7 +457,7 @@ int pa__init(pa_module *m) { goto fail; } u->thread_mainloop_api = pa_mainloop_get_api(u->thread_mainloop); - + u->cookie_file = pa_xstrdup(pa_modargs_get_value(ma, "cookie", NULL)); u->remote_sink_name = pa_xstrdup(pa_modargs_get_value(ma, "sink", NULL)); u->thread_mq = pa_xnew0(pa_thread_mq, 1); @@ -541,6 +548,9 @@ void pa__done(pa_module *m) { if (u->thread_mainloop) pa_mainloop_free(u->thread_mainloop); + if (u->cookie_file) + pa_xfree(u->cookie_file); + if (u->remote_sink_name) pa_xfree(u->remote_sink_name); |