AVAHI_LLIST_REMOVE(StaticHost, hosts, hosts, s);
- avahi_s_entry_group_free (s->group);
+ if (s->group)
+ avahi_s_entry_group_free (s->group);
avahi_free(s->host);
avahi_free(s->ip);
static void add_static_host_to_server(StaticHost *h)
{
AvahiAddress a;
+ AvahiProtocol p;
int err;
+ const AvahiServerConfig *config;
if (!h->group)
- h->group = avahi_s_entry_group_new (avahi_server, entry_group_callback, h);
+ if (!(h->group = avahi_s_entry_group_new (avahi_server, entry_group_callback, h))) {
+ avahi_log_error("avahi_s_entry_group_new() failed: %s", avahi_strerror(avahi_server_errno(avahi_server)));
+ return;
+ }
if (!avahi_address_parse (h->ip, AVAHI_PROTO_UNSPEC, &a)) {
avahi_log_error("Static host name %s: avahi_address_parse failed", h->host);
return;
}
- if ((err = avahi_server_add_address(avahi_server, h->group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, h->host, &a))) {
+ config = avahi_server_get_config(avahi_server);
+
+ p = (a.proto == AVAHI_PROTO_INET && config->publish_a_on_ipv6) ||
+ (a.proto == AVAHI_PROTO_INET6 && config->publish_aaaa_on_ipv4) ? AVAHI_PROTO_UNSPEC : a.proto;
+
+ if ((err = avahi_server_add_address(avahi_server, h->group, AVAHI_IF_UNSPEC, p, 0, h->host, &a)) < 0) {
avahi_log_error ("Static host name %s: avahi_server_add_address failure: %s", h->host, avahi_strerror(err));
return;
}
static void remove_static_host_from_server(StaticHost *h)
{
- avahi_s_entry_group_reset (h->group);
+ if (h->group)
+ avahi_s_entry_group_reset (h->group);
}
void static_hosts_add_to_server(void) {