MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-27 14:43:21 -05:00
Code Issues Packages Projects Releases Wiki Activity

[mdns] Also ignore ipv4 link-local announcements

Browse Source
This commit is contained in:
ejurgensen 2016-10-30 20:04:08 +01:00
parent 79d21a5370
commit be6580d23e
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/mdns_avahi.c
View File

@ -354,15 +354,24 @@ 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 IPV4LL_NETWORK 0xA9FE0000
#define IPV4LL_NETMASK 0xFFFF0000
#define IPV6LL_NETWORK 0xFE80 #define IPV6LL_NETWORK 0xFE80
#define IPV6LL_NETMASK 0xFFC0 #define IPV6LL_NETMASK 0xFFC0
static int
is_v4ll(const AvahiIPv4Address *addr)
{
return ((ntohl(addr->address) & IPV4LL_NETMASK) == IPV4LL_NETWORK);
}
static int static int
is_v6ll(const AvahiIPv6Address *addr) is_v6ll(const AvahiIPv6Address *addr)
{ {
return ((((addr->address[0] << 8) | addr->address[1]) & IPV6LL_NETMASK) == IPV6LL_NETWORK); 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
@ -396,9 +405,12 @@ browse_resolve_callback(AvahiServiceResolver *r, AvahiIfIndex intf, AvahiProtoco
family = avahi_proto_to_af(addr->proto); family = avahi_proto_to_af(addr->proto);
avahi_address_snprint(address, sizeof(address), addr); avahi_address_snprint(address, sizeof(address), addr);
if (family == AF_INET6 && is_v6ll(&addr->data.ipv6)) // Avahi will sometimes give us link-local addresses in 169.254.0.0/16 or
// fe80::/10, which (most of the time) are useless
// - see also https://lists.freedesktop.org/archives/avahi/2012-September/002183.html
if ( (family == AF_INET && is_v4ll(&addr->data.ipv4)) || (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); DPRINTF(E_INFO, L_MDNS, "Ignoring announcement from %s, address %s is link-local\n", hostname, address);
goto out_free_resolver; goto out_free_resolver;
} }