#include <glib.h>
#include <expat.h>
-#include <avahi-core/llist.h>
+#include <avahi-common/llist.h>
#include <avahi-core/log.h>
#include "main.h"
gchar *name, *chosen_name;
gboolean replace_wildcards;
- AvahiEntryGroup *entry_group;
+ AvahiSEntryGroup *entry_group;
AVAHI_LLIST_HEAD(StaticService, services);
AVAHI_LLIST_FIELDS(StaticServiceGroup, groups);
};
g_assert(g);
if (g->entry_group)
- avahi_entry_group_free(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->chosen_name = g_strdup(g->name);
if (!g->entry_group)
- g->entry_group = avahi_entry_group_new(avahi_server, entry_group_callback, g);
+ g->entry_group = avahi_s_entry_group_new(avahi_server, entry_group_callback, g);
- g_assert(avahi_entry_group_is_empty(g->entry_group));
+ g_assert(avahi_s_entry_group_is_empty(g->entry_group));
for (s = g->services; s; s = s->services_next) {
}
}
- 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_reset(g->entry_group);
+ avahi_s_entry_group_reset(g->entry_group);
}
typedef enum {
case XML_TAG_SERVICE:
- if (u->service->port == 0 || !u->service->type) {
+ if (!u->service->type) {
avahi_log_error("%s: parse failure: service incomplete.", u->group->filename);
u->failed = TRUE;
return;
p = u->buf ? atoi(u->buf) : 0;
- if (p <= 0 || p > 0xFFFF) {
+ if (p < 0 || p > 0xFFFF) {
avahi_log_error("%s: parse failure: invalid port specification \"%s\".", u->group->filename, u->buf);
u->failed = TRUE;
return;