MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-26 23:25:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

[mdns] Fix OwnTone not updating speaker addresses on ip change

Browse Source 
The fix is to use proto instead of addr->proto when creating the record browser
in browse_resolve_callback(). The rest of the commit is just minor
beautification.

Resolves #1760. The issue seems to be a regression from commit
e7a73551ab.
This commit is contained in:
ejurgensen 2024-06-04 17:11:45 +02:00
parent 9439bcc60c
commit e7459e0576
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/mdns_avahi.c
View File

@ -414,37 +414,36 @@ is_v6ll(const AvahiIPv6Address *addr)
} }
static int static int
avahi_address_make(AvahiAddress *addr, AvahiProtocol proto, const void *rdata, size_t size) avahi_address_from_record(AvahiAddress *addr, uint16_t record_type, const void *record_data, size_t record_size)
{ {
memset(addr, 0, sizeof(AvahiAddress)); memset(addr, 0, sizeof(AvahiAddress));
addr->proto = proto; if (record_type == AVAHI_DNS_TYPE_A)
if (proto == AVAHI_PROTO_INET)
{ {
if (size != sizeof(AvahiIPv4Address)) if (record_size != sizeof(AvahiIPv4Address))
{ {
DPRINTF(E_LOG, L_MDNS, "Got RR type A size %zu (should be %zu)\n", size, sizeof(AvahiIPv4Address)); printf("Got RR type A size %zu (should be %zu)\n", record_size, sizeof(AvahiIPv4Address));
return -1; return -1;
} }
memcpy(&addr->data.ipv4.address, rdata, size); addr->proto = AVAHI_PROTO_INET;
memcpy(&addr->data.ipv4.address, record_data, record_size);
return 0; return 0;
} }
else if (record_type == AVAHI_DNS_TYPE_AAAA)
if (proto == AVAHI_PROTO_INET6)
{ {
if (size != sizeof(AvahiIPv6Address)) if (record_size != sizeof(AvahiIPv6Address))
{ {
DPRINTF(E_LOG, L_MDNS, "Got RR type AAAA size %zu (should be %zu)\n", size, sizeof(AvahiIPv6Address)); printf("Got RR type AAAA size %zu (should be %zu)\n", record_size, sizeof(AvahiIPv6Address));
return -1; return -1;
} }
memcpy(&addr->data.ipv6.address, rdata, size); addr->proto = AVAHI_PROTO_INET6;
memcpy(&addr->data.ipv6.address, record_data, record_size);
return 0; return 0;
} }
DPRINTF(E_LOG, L_MDNS, "Error: Unknown protocol\n"); printf("Error: Unknown record type\n");
return -1; return -1;
} }
@ -726,8 +725,8 @@ address_check(const char *hostname, const AvahiAddress *addr, int port, enum mdn
static void static void
browse_record_callback(AvahiRecordBrowser *b, AvahiIfIndex intf, AvahiProtocol proto, browse_record_callback(AvahiRecordBrowser *b, AvahiIfIndex intf, AvahiProtocol proto,
AvahiBrowserEvent event, const char *hostname, uint16_t clazz, uint16_t type, AvahiBrowserEvent event, const char *hostname, uint16_t clazz, uint16_t rtype,
const void *rdata, size_t size, AvahiLookupResultFlags flags, void *userdata) const void *rdata, size_t rsize, AvahiLookupResultFlags flags, void *userdata)
{ {
struct mdns_record_browser *rb_data; struct mdns_record_browser *rb_data;
AvahiAddress addr; AvahiAddress addr;
@ -749,12 +748,10 @@ browse_record_callback(AvahiRecordBrowser *b, AvahiIfIndex intf, AvahiProtocol p
if (event != AVAHI_BROWSER_NEW) if (event != AVAHI_BROWSER_NEW)
goto out_free_record_browser; goto out_free_record_browser;
ret = avahi_address_make(&addr, proto, rdata, size); // Not an avahi function despite the name ret = avahi_address_from_record(&addr, rtype, rdata, rsize); // Not an avahi function despite the name
if (ret < 0) if (ret < 0)
return; return;
family = avahi_proto_to_af(proto);
CHECK_NULL(L_MDNS, avahi_address_snprint(address, sizeof(address), &addr)); CHECK_NULL(L_MDNS, avahi_address_snprint(address, sizeof(address), &addr));
DPRINTF(E_DBG, L_MDNS, "Avahi Record Browser (%s, proto %d): NEW record %s for service type '%s'\n", hostname, proto, address, rb_data->mb->type); DPRINTF(E_DBG, L_MDNS, "Avahi Record Browser (%s, proto %d): NEW record %s for service type '%s'\n", hostname, proto, address, rb_data->mb->type);
@ -764,6 +761,7 @@ browse_record_callback(AvahiRecordBrowser *b, AvahiIfIndex intf, AvahiProtocol p
return; return;
// Execute callback (mb->cb) with all the data // Execute callback (mb->cb) with all the data
family = avahi_proto_to_af(addr.proto);
rb_data->mb->cb(rb_data->name, rb_data->mb->type, rb_data->domain, hostname, family, address, rb_data->port, rb_data->txt_kv); rb_data->mb->cb(rb_data->name, rb_data->mb->type, rb_data->domain, hostname, family, address, rb_data->port, rb_data->txt_kv);
// Stop record browser, we found an address (or there was an error) // Stop record browser, we found an address (or there was an error)
@ -857,7 +855,11 @@ browse_resolve_callback(AvahiServiceResolver *r, AvahiIfIndex intf, AvahiProtoco
rb_data->port = port; rb_data->port = port;
rb_data->txt_kv = txt_kv; rb_data->txt_kv = txt_kv;
if (addr->proto == AVAHI_PROTO_INET6) // We test proto and not addr->proto here, because addr might be e.g. an
// ipv6 link-local that failed the check. The device might have a valid
// ipv4, so we don't want to limit the record browser to AAAA records just
// because addr was ipv6.
if (proto == AVAHI_PROTO_INET6)
dns_type = AVAHI_DNS_TYPE_AAAA; dns_type = AVAHI_DNS_TYPE_AAAA;
else else
dns_type = AVAHI_DNS_TYPE_A; dns_type = AVAHI_DNS_TYPE_A;