mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-31 22:25:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

zeroconf-discover: Specify the interface when connecting to a link-local IPv6 address

Browse source 
BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=40785
This commit is contained in:
Héctor Martín 2014-01-15 12:20:27 +02:00 • committed by Tanu Kaskinen
parent a0f73b74eb
commit 4e5051db72
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/modules/module-zeroconf-discover.c
View file

@ -149,6 +149,7 @@ static void resolver_cb(
else { else {
char *device = NULL, *dname, *module_name, *args; char *device = NULL, *dname, *module_name, *args;
const char *t; const char *t;
char *if_suffix = NULL;
char at[AVAHI_ADDRESS_STR_MAX], cmt[PA_CHANNEL_MAP_SNPRINT_MAX]; char at[AVAHI_ADDRESS_STR_MAX], cmt[PA_CHANNEL_MAP_SNPRINT_MAX];
pa_sample_spec ss; pa_sample_spec ss;
pa_channel_map cm; pa_channel_map cm;
@ -210,16 +211,21 @@ static void resolver_cb(
} }
t = strstr(type, "sink") ? "sink" : "source"; 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); 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 " "%s=%s "
"format=%s " "format=%s "
"channels=%u " "channels=%u "
"rate=%u " "rate=%u "
"%s_name=%s " "%s_name=%s "
"channel_map=%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, t, device,
pa_sample_format_to_string(ss.format), pa_sample_format_to_string(ss.format),
ss.channels, ss.channels,
@ -238,6 +244,7 @@ static void resolver_cb(
pa_xfree(module_name); pa_xfree(module_name);
pa_xfree(dname); pa_xfree(dname);
pa_xfree(args); pa_xfree(args);
pa_xfree(if_suffix);
avahi_free(device); avahi_free(device);
} }