Attachment 63872 Details for Bug 40785 – Proposed patch

[patch] Proposed patch

linklocal.patch (text/plain), 1.75 KB, created by Héctor Martín on 2012-07-05 17:58:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Héctor Martín

Created: 2012-07-05 17:58:45 UTC

Size: 1.75 KB

patch

obsolete

>--- pulseaudio-2.0/src/modules/module-zeroconf-discover.c.old	2012-07-06 01:11:43.817567827 +0100
>+++ pulseaudio-2.0/src/modules/module-zeroconf-discover.c	2012-07-06 01:35:49.158128225 +0100
>@@ -149,6 +149,7 @@
>     else {
>         char *device = NULL, *dname, *module_name, *args;
>         const char *t;
>+        char *if_suffix = NULL;
>         char at[AVAHI_ADDRESS_STR_MAX], cmt[PA_CHANNEL_MAP_SNPRINT_MAX];
>         pa_sample_spec ss;
>         pa_channel_map cm;
>@@ -210,16 +211,21 @@
>         }
> 
>         t = strstr(type, "sink") ? "sink" : "source";
>+        if (a->proto == AVAHI_PROTO_INET6 &&
>+            a->data.ipv6.address[0] == 0xfe &&
>+            (a->data.ipv6.address[1] & 0xc0) == 0x80)
>+            if_suffix = pa_sprintf_malloc("%%%d", interface);
> 
>         module_name = pa_sprintf_malloc("module-tunnel-%s", t);
>-        args = pa_sprintf_malloc("server=[%s]:%u "
>+        args = pa_sprintf_malloc("server=[%s%s]:%u "
>                                  "%s=%s "
>                                  "format=%s "
>                                  "channels=%u "
>                                  "rate=%u "
>                                  "%s_name=%s "
>                                  "channel_map=%s",
>-                                 avahi_address_snprint(at, sizeof(at), a), port,
>+                                 avahi_address_snprint(at, sizeof(at), a),
>+                                 if_suffix ? if_suffix : "", port,
>                                  t, device,
>                                  pa_sample_format_to_string(ss.format),
>                                  ss.channels,
>@@ -238,6 +244,7 @@
>         pa_xfree(module_name);
>         pa_xfree(dname);
>         pa_xfree(args);
>+        pa_xfree(if_suffix);
>         avahi_free(device);
>     }
>

Actions: View | Splinter Review

Attachments on bug 40785: 63872

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.