Attachment 67765 Details for Bug 55280 – pulse-servers.patch

[patch] pulse-servers.patch

pulse-servers.patch (text/plain), 3.01 KB, created by Pierre Ossman on 2012-09-27 11:14:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pierre Ossman

Created: 2012-09-27 11:14:13 UTC

Size: 3.01 KB

patch

obsolete

>Index: src/modules/module-tunnel.c
>===================================================================
>--- src/modules/module-tunnel.c	(revision 25919)
>+++ src/modules/module-tunnel.c	(working copy)
>@@ -58,7 +58,12 @@
> #include <pulsecore/proplist-util.h>
> #include <pulsecore/auth-cookie.h>
> #include <pulsecore/mcalign.h>
>+#include <pulsecore/strlist.h>
> 
>+#ifdef HAVE_X11
>+#include <pulsecore/x11prop.h>
>+#endif
>+
> #ifdef TUNNEL_SINK
> #include "module-tunnel-sink-symdef.h"
> #else
>@@ -1929,6 +1934,8 @@
> int pa__init(pa_module*m) {
>     pa_modargs *ma = NULL;
>     struct userdata *u = NULL;
>+    const char *server;
>+    pa_strlist *server_list = NULL;
>     pa_sample_spec ss;
>     pa_channel_map map;
>     char *dn = NULL;
>@@ -2027,24 +2034,29 @@
>     }
> 
>     /* Same thing for the server name */
>-    u->server_name = pa_xstrdup(pa_modargs_get_value(ma, "server", NULL));
>+    server = pa_modargs_get_value(ma, "server", NULL);
> 
>-    if (u->server_name == NULL)
>-        u->server_name = pa_xstrdup(getenv(ENV_DEFAULT_SERVER));
>+    if (server == NULL)
>+        server = getenv(ENV_DEFAULT_SERVER);
> 
> #ifdef HAVE_X11
>-    if ((u->server_name == NULL) && (xcb != NULL)) {
>+    if ((server == NULL) && (xcb != NULL)) {
>         char t[1024];
>         if (pa_x11_get_prop(xcb, 0, "PULSE_SERVER", t, sizeof(t)))
>-            u->server_name = pa_xstrdup(t);
>+            server = pa_xstrdup(t);
>     }
> #endif
> 
>-    if (u->server_name == NULL) {
>+    if (server == NULL) {
>         pa_log("No server specified.");
>         goto fail;
>     }
> 
>+    if (!(server_list = pa_strlist_parse(server))) {
>+        pa_log("Invalid server specified.");
>+        goto fail;
>+    }
>+
>     /* Also determine the default sink/source on the other server */
> #ifdef TUNNEL_SINK
>     u->sink_name = pa_xstrdup(pa_modargs_get_value(ma, "sink", NULL));;
>@@ -2081,9 +2093,23 @@
>         goto fail;
>     }
> 
>-    if (!(u->client = pa_socket_client_new_string(m->core->mainloop, TRUE, u->server_name, PA_NATIVE_DEFAULT_PORT))) {
>-        pa_log("Failed to connect to server '%s'", u->server_name);
>-        goto fail;
>+    for (;;) {
>+        server_list = pa_strlist_pop(server_list, &u->server_name);
>+
>+        if (u->server_name == NULL) {
>+            pa_log("Failed to connect to server '%s'", server);
>+            goto fail;
>+        }
>+
>+        pa_log_debug("Trying to connect to %s...", u->server_name);
>+
>+        if (!(u->client = pa_socket_client_new_string(m->core->mainloop, TRUE, u->server_name, PA_NATIVE_DEFAULT_PORT))) {
>+            pa_xfree(u->server_name);
>+            u->server_name = NULL;
>+            continue;
>+        }
>+
>+        break;
>     }
> 
>     pa_socket_client_set_callback(u->client, on_connection, u);
>@@ -2197,6 +2223,9 @@
>     pa_source_put(u->source);
> #endif
> 
>+    if (server_list)
>+        pa_strlist_free(server_list);
>+
> #ifdef HAVE_X11
>     if (xcb)
>         xcb_disconnect(xcb);
>@@ -2209,6 +2238,9 @@
> fail:
>     pa__done(m);
> 
>+    if (server_list)
>+        pa_strlist_free(server_list);
>+
> #ifdef HAVE_X11
>     if (xcb)
>         xcb_disconnect(xcb);

Actions: View | Splinter Review

Attachments on bug 55280: 67623 | 67765 | 82334 | 82484

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.