#include "socket.h"
#include "browse.h"
-#define AVAHI_HOST_RR_HOLDOFF_MSEC 1000
+#define AVAHI_HOST_RR_HOLDOFF_MSEC 2000
static void free_entry(AvahiServer*s, AvahiEntry *e) {
AvahiEntry *t;
gint cmp;
n = e->by_key_next;
- if (e->dead || !avahi_entry_probing(s, e, i))
+ if (e->dead)
continue;
if ((cmp = avahi_record_lexicographical_compare(e->record, record)) == 0) {
ours = TRUE;
break;
- } else if (cmp > 0)
- won = TRUE;
- else /* cmp < 0 */
- lost = TRUE;
+ } else {
+
+ if (avahi_entry_probing(s, e, i)) {
+ if (cmp > 0)
+ won = TRUE;
+ else /* cmp < 0 */
+ lost = TRUE;
+ }
+ }
}
t = avahi_record_to_string(record);
if (!ours) {
if (won)
- g_message("Recieved conflicting probe [%s]. Local host won.", t);
+ g_message("xxx Recieved conflicting probe [%s]. Local host won.", t);
else if (lost) {
- g_message("Recieved conflicting probe [%s]. Local host lost. Withdrawing.", t);
+ g_message("yyy Recieved conflicting probe [%s]. Local host lost. Withdrawing.", t);
withdraw_rrset(s, record->key);
}
}
/* Either our entry or the other is intended to be unique, so let's check */
- if (avahi_entry_registered(s, e, i)) {
-
- if (avahi_record_equal_no_ttl(e->record, record)) {
- ours = TRUE; /* We have an identical record, so this is no conflict */
+ if (avahi_record_equal_no_ttl(e->record, record)) {
+ ours = TRUE; /* We have an identical record, so this is no conflict */
+
+ /* Check wheter there is a TTL conflict */
+ if (record->ttl <= e->record->ttl/2 &&
+ avahi_entry_registered(s, e, i)) {
+ gchar *t;
+ /* Refresh */
+ t = avahi_record_to_string(record);
- /* Check wheter there is a TTL conflict */
- if (record->ttl <= e->record->ttl/2) {
- gchar *t;
- /* Refresh */
- t = avahi_record_to_string(record);
-
- g_message("Recieved record with bad TTL [%s]. Refreshing.", t);
- avahi_server_prepare_matching_responses(s, i, e->record->key, FALSE);
- valid = FALSE;
-
- g_free(t);
- }
+ g_message("Recieved record with bad TTL [%s]. Refreshing.", t);
+ avahi_server_prepare_matching_responses(s, i, e->record->key, FALSE);
+ valid = FALSE;
+
+ g_free(t);
+ }
+
+ /* There's no need to check the other entries of this RRset */
+ break;
+
+ } else {
+
+ if (avahi_entry_registered(s, e, i)) {
- /* There's no need to check the other entries of this RRset */
- break;
- } else {
/* A conflict => we have to return to probe mode */
conflict = TRUE;
conflicting_entry = e;
- }
- } else if (avahi_entry_probing(s, e, i)) {
+ } else if (avahi_entry_probing(s, e, i)) {
- if (!avahi_record_equal_no_ttl(record, e->record)) {
-
/* We are currently registering a matching record, but
* someone else already claimed it, so let's
* withdraw */
s->register_time_event = avahi_time_event_queue_add(s->time_event_queue, &tv, register_time_event_callback, s);
}
-void avahi_server_set_host_name(AvahiServer *s, const gchar *host_name) {
+gint avahi_server_set_host_name(AvahiServer *s, const gchar *host_name) {
g_assert(s);
g_assert(host_name);
update_fqdn(s);
delayed_register_stuff(s);
+ return 0;
}
-void avahi_server_set_domain_name(AvahiServer *s, const gchar *domain_name) {
+gint avahi_server_set_domain_name(AvahiServer *s, const gchar *domain_name) {
g_assert(s);
g_assert(domain_name);
update_fqdn(s);
delayed_register_stuff(s);
+ return 0;
}
g_free(s);
}
-void avahi_server_add(
+gint avahi_server_add(
AvahiServer *s,
AvahiEntryGroup *g,
gint interface,
AVAHI_LLIST_PREPEND(AvahiEntry, by_group, g->entries, e);
avahi_announce_entry(s, e);
+
+ return 0;
}
+
const AvahiRecord *avahi_server_iterate(AvahiServer *s, AvahiEntryGroup *g, void **state) {
AvahiEntry **e = (AvahiEntry**) state;
g_assert(s);
avahi_dump_caches(s->monitor, f);
}
-void avahi_server_add_ptr(
+gint avahi_server_add_ptr(
AvahiServer *s,
AvahiEntryGroup *g,
gint interface,
r->data.ptr.name = avahi_normalize_name(dest);
avahi_server_add(s, g, interface, protocol, flags, r);
avahi_record_unref(r);
+ return 0;
}
-void avahi_server_add_address(
+gint avahi_server_add_address(
AvahiServer *s,
AvahiEntryGroup *g,
gint interface,
}
g_free(n);
+
+ return 0;
}
-void avahi_server_add_text_strlst(
+gint avahi_server_add_text_strlst(
AvahiServer *s,
AvahiEntryGroup *g,
gint interface,
r->data.txt.string_list = strlst;
avahi_server_add(s, g, interface, protocol, flags, r);
avahi_record_unref(r);
+
+ return 0;
}
-void avahi_server_add_text_va(
+gint avahi_server_add_text_va(
AvahiServer *s,
AvahiEntryGroup *g,
gint interface,
g_assert(s);
avahi_server_add_text_strlst(s, g, interface, protocol, flags, name, avahi_string_list_new_va(va));
+ return 0;
}
-void avahi_server_add_text(
+gint avahi_server_add_text(
AvahiServer *s,
AvahiEntryGroup *g,
gint interface,
va_start(va, name);
avahi_server_add_text_va(s, g, interface, protocol, flags, name, va);
va_end(va);
+
+ return 0;
}
static void escape_service_name(gchar *d, guint size, const gchar *s) {
*(d++) = 0;
}
-void avahi_server_add_service_strlst(
+gint avahi_server_add_service_strlst(
AvahiServer *s,
AvahiEntryGroup *g,
gint interface,
snprintf(enum_ptr, sizeof(enum_ptr), "_services._dns-sd._udp.%s", domain);
avahi_server_add_ptr(s, g, interface, protocol, AVAHI_ENTRY_NULL, enum_ptr, ptr_name);
+
+ return 0;
}
-void avahi_server_add_service_va(
+gint avahi_server_add_service_va(
AvahiServer *s,
AvahiEntryGroup *g,
gint interface,
g_assert(name);
avahi_server_add_service_strlst(s, g, interface, protocol, type, name, domain, host, port, avahi_string_list_new_va(va));
+ return 0;
}
-void avahi_server_add_service(
+gint avahi_server_add_service(
AvahiServer *s,
AvahiEntryGroup *g,
gint interface,
va_start(va, port);
avahi_server_add_service_va(s, g, interface, protocol, type, name, domain, host, port, va);
va_end(va);
+ return 0;
}
static void post_query_callback(AvahiInterfaceMonitor *m, AvahiInterface *i, gpointer userdata) {
g->server->need_entry_cleanup = TRUE;
}
-void avahi_entry_group_commit(AvahiEntryGroup *g) {
+gint avahi_entry_group_commit(AvahiEntryGroup *g) {
g_assert(g);
g_assert(!g->dead);
if (g->state != AVAHI_ENTRY_GROUP_UNCOMMITED)
- return;
+ return -1;
avahi_entry_group_change_state(g, AVAHI_ENTRY_GROUP_REGISTERING);
avahi_announce_group(g->server, g);
avahi_entry_group_check_probed(g, FALSE);
+
+ return 0;
}
gboolean avahi_entry_commited(AvahiEntry *e) {
projects / catta / blobdiff