oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

lib/avahi/Publisher: reuse the AvahiEntryGroup 

The libavahi-client documentation recommends reusing AvahiEntryGroup
instances instead of freeing them and creating new ones.
This commit is contained in:
Max Kellermann 2024-01-17 11:57:07 +01:00 committed by Max Kellermann
parent b68c3b7f55
commit 05d0e9b8bb
1 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/lib/avahi/Publisher.cxx
View File

@ -126,32 +126,23 @@ AddServices(AvahiEntryGroup &group,
AddService(group, i, name); AddService(group, i, name);
} }
static EntryGroupPtr
MakeEntryGroup(AvahiClient &c,
const std::forward_list<Service> &services, const char *name,
AvahiEntryGroupCallback callback, void *userdata)
{
EntryGroupPtr group(avahi_entry_group_new(&c, callback, userdata));
if (!group)
throw MakeError(c, "Failed to create Avahi service group");
AddServices(*group, services, name);
int error = avahi_entry_group_commit(group.get());
if (error != AVAHI_OK)
throw MakeError(error, "Failed to commit Avahi service group");
return group;
}
void void
Publisher::RegisterServices(AvahiClient *c) noexcept Publisher::RegisterServices(AvahiClient *c) noexcept
{ {
assert(visible); assert(visible);
try { try {
group = MakeEntryGroup(*c, services, name.c_str(), if (!group) {
GroupCallback, this); group.reset(avahi_entry_group_new(c, GroupCallback, this));
if (!group)
throw MakeError(*c, "Failed to create Avahi service group");
}
AddServices(*group, services, name.c_str());
if (int error = avahi_entry_group_commit(group.get());
error != AVAHI_OK)
throw MakeError(error, "Failed to commit Avahi service group");
} catch (...) { } catch (...) {
error_handler.OnAvahiError(std::current_exception()); error_handler.OnAvahiError(std::current_exception());
} }
@ -164,7 +155,9 @@ Publisher::HideServices() noexcept
return; return;
visible = false; visible = false;
group.reset();
if (group)
avahi_entry_group_reset(group.get());
} }
void void
@ -183,7 +176,7 @@ Publisher::ShowServices() noexcept
void void
Publisher::OnAvahiConnect(AvahiClient *c) noexcept Publisher::OnAvahiConnect(AvahiClient *c) noexcept
{ {
if (group == nullptr && visible) if (visible)
RegisterServices(c); RegisterServices(c);
} }