MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-28 15:06:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

[mdns] Ignore ipv6 link-local mdns announcements

Browse Source
This commit is contained in:
ejurgensen 2016-10-23 23:27:34 +02:00
parent ef4be65551
commit bc1fb4b385
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/mdns_avahi.c
View File

@ -354,6 +354,15 @@ struct mdns_group_entry
static struct mdns_browser *browser_list; static struct mdns_browser *browser_list;
static struct mdns_group_entry *group_entries; static struct mdns_group_entry *group_entries;
#define IPV6LL_NETWORK 0xFE80
#define IPV6LL_NETMASK 0xFFC0
static int
is_v6ll(const AvahiIPv6Address *addr)
{
return ((((addr->address[0] << 8) | addr->address[1]) & IPV6LL_NETMASK) == IPV6LL_NETWORK);
}
// Note: This will only return the first DNS record. Should be enough, but // Note: This will only return the first DNS record. Should be enough, but
// should more be needed, then a record browser needs to be added. // should more be needed, then a record browser needs to be added.
static void static void
@ -380,7 +389,18 @@ browse_resolve_callback(AvahiServiceResolver *r, AvahiIfIndex intf, AvahiProtoco
goto out_free_resolver; goto out_free_resolver;
} }
DPRINTF(E_DBG, L_MDNS, "Avahi Resolver: resolved service '%s' type '%s' proto %d\n", name, type, proto); DPRINTF(E_DBG, L_MDNS, "Avahi Resolver: resolved service '%s' type '%s' proto %d, host %s\n", name, type, proto, hostname);
// For some reason, the proto returned by the callback will not always be the
// protocol of the address - so we use addr->proto instead
family = avahi_proto_to_af(addr->proto);
avahi_address_snprint(address, sizeof(address), addr);
if (family == AF_INET6 && is_v6ll(&addr->data.ipv6))
{
DPRINTF(E_DBG, L_MDNS, "Ignoring announcement from %s, address %s is link-local\n", hostname, address);
goto out_free_resolver;
}
memset(&txt_kv, 0, sizeof(struct keyval)); memset(&txt_kv, 0, sizeof(struct keyval));
@ -401,12 +421,6 @@ browse_resolve_callback(AvahiServiceResolver *r, AvahiIfIndex intf, AvahiProtoco
avahi_free(key); avahi_free(key);
} }
avahi_address_snprint(address, sizeof(address), addr);
// For some reason, the proto returned by the callback will not always be the
// protocol of the address - so we use addr->proto instead
family = avahi_proto_to_af(addr->proto);
mb = (struct mdns_browser *)userdata; mb = (struct mdns_browser *)userdata;
if (family != AF_UNSPEC) if (family != AF_UNSPEC)