#include <glib.h>
#include <expat.h>
-#include <avahi-core/llist.h>
+#include <avahi-common/llist.h>
#include <avahi-core/log.h>
#include "main.h"
+#include "static-services.h"
typedef struct StaticService StaticService;
typedef struct StaticServiceGroup StaticServiceGroup;
gchar *name, *chosen_name;
gboolean replace_wildcards;
- AvahiEntryGroup *entry_group;
+ AvahiSEntryGroup *entry_group;
AVAHI_LLIST_HEAD(StaticService, services);
AVAHI_LLIST_FIELDS(StaticServiceGroup, groups);
};
static void static_service_group_free(StaticServiceGroup *g) {
g_assert(g);
- remove_static_service_group_from_server(g);
+ if (g->entry_group)
+ avahi_s_entry_group_free(g->entry_group);
while (g->services)
static_service_free(g->services);
g_free(g);
}
-static void entry_group_callback(AvahiServer *s, AvahiEntryGroup *eg, AvahiEntryGroupState state, gpointer userdata) {
+static void entry_group_callback(AvahiServer *s, AvahiSEntryGroup *eg, AvahiEntryGroupState state, gpointer userdata) {
StaticServiceGroup *g = userdata;
g_assert(s);
g_assert(g);
- if (g->entry_group)
- return;
-
if (g->chosen_name)
g_free(g->chosen_name);
g->chosen_name = replacestr(g->name, "%h", avahi_server_get_host_name(avahi_server));
else
g->chosen_name = g_strdup(g->name);
-
- g->entry_group = avahi_entry_group_new(avahi_server, entry_group_callback, g);
+
+ if (!g->entry_group)
+ g->entry_group = avahi_s_entry_group_new(avahi_server, entry_group_callback, g);
+
+ g_assert(avahi_s_entry_group_is_empty(g->entry_group));
for (s = g->services; s; s = s->services_next) {
-1, AF_UNSPEC,
g->chosen_name, s->type,
s->domain_name, s->host_name, s->port,
- avahi_string_list_copy(s->txt_records)) < 0) {
- avahi_log_error("Failed to add service '%s' of type '%s', ignoring service group (%s)", g->chosen_name, s->type, g->filename);
+ s->txt_records) < 0) {
+ avahi_log_error("Failed to add service '%s' of type '%s', ignoring service group (%s): %s",
+ g->chosen_name, s->type, g->filename,
+ avahi_strerror(avahi_server_errno(avahi_server)));
remove_static_service_group_from_server(g);
return;
}
}
- avahi_entry_group_commit(g->entry_group);
+ avahi_s_entry_group_commit(g->entry_group);
}
static void remove_static_service_group_from_server(StaticServiceGroup *g) {
g_assert(g);
- if (g->entry_group) {
- avahi_entry_group_free(g->entry_group);
- g->entry_group = NULL;
- }
+ if (g->entry_group)
+ avahi_s_entry_group_reset(g->entry_group);
}
typedef enum {