#include "browse.h"
#include "util.h"
+#include "log.h"
struct AvahiRecordBrowser {
gboolean dead;
AvahiServer *server;
AvahiKey *key;
- gint interface;
- guchar protocol;
- gint n_query;
+ AvahiIfIndex interface;
+ AvahiProtocol protocol;
guint sec_delay;
AvahiTimeEvent *time_event;
AvahiRecordBrowserCallback callback;
gpointer userdata;
+ guint scan_idle_source;
AVAHI_LLIST_FIELDS(AvahiRecordBrowser, browser);
AVAHI_LLIST_FIELDS(AvahiRecordBrowser, by_key);
static void elapse(AvahiTimeEvent *e, void *userdata) {
AvahiRecordBrowser *s = userdata;
GTimeVal tv;
-/* gchar *t; */
+/* gchar *t; */
g_assert(s);
avahi_server_post_query(s->server, s->interface, s->protocol, s->key);
- if (s->n_query++ <= 8)
- s->sec_delay *= 2;
-
-/* avahi_log_debug("%i. Continuous querying for %s", s->n_query, t = avahi_key_to_string(s->key)); */
-/* g_free(t); */
+ s->sec_delay *= 2;
+
+ if (s->sec_delay >= 60*60) /* 1h */
+ s->sec_delay = 60*60;
+
+/* avahi_log_debug("Continuous querying for %s (%i)", t = avahi_key_to_string(s->key), s->sec_delay); */
+/* g_free(t); */
avahi_elapse_time(&tv, s->sec_delay*1000, 0);
avahi_time_event_queue_update(s->server->time_event_queue, s->time_event, &tv);
avahi_cache_walk(i->cache, s->key, scan_cache_callback, &cbdata);
}
-AvahiRecordBrowser *avahi_record_browser_new(AvahiServer *server, gint interface, guchar protocol, AvahiKey *key, AvahiRecordBrowserCallback callback, gpointer userdata) {
+static gboolean scan_idle_callback(gpointer data) {
+ AvahiRecordBrowser *b = data;
+ g_assert(b);
+
+ /* Scan the caches */
+ avahi_interface_monitor_walk(b->server->monitor, b->interface, b->protocol, scan_interface_callback, b);
+ b->scan_idle_source = (guint) -1;
+
+ return FALSE;
+}
+
+AvahiRecordBrowser *avahi_record_browser_new(AvahiServer *server, AvahiIfIndex interface, AvahiProtocol protocol, AvahiKey *key, AvahiRecordBrowserCallback callback, gpointer userdata) {
AvahiRecordBrowser *b, *t;
GTimeVal tv;
g_assert(key);
g_assert(callback);
- g_assert(!avahi_key_is_pattern(key));
+ if (avahi_key_is_pattern(key)) {
+ avahi_server_set_errno(server, AVAHI_ERR_IS_PATTERN);
+ return NULL;
+ }
+
+ if (!avahi_key_valid(key)) {
+ avahi_server_set_errno(server, AVAHI_ERR_INVALID_KEY);
+ return NULL;
+ }
b = g_new(AvahiRecordBrowser, 1);
b->dead = FALSE;
b->protocol = protocol;
b->callback = callback;
b->userdata = userdata;
- b->n_query = 1;
b->sec_delay = 1;
avahi_server_post_query(b->server, b->interface, b->protocol, b->key);
AVAHI_LLIST_PREPEND(AvahiRecordBrowser, by_key, t, b);
g_hash_table_replace(server->record_browser_hashtable, key, t);
- /* Scan the caches */
- avahi_interface_monitor_walk(b->server->monitor, b->interface, b->protocol, scan_interface_callback, b);
-
+ /* The currenlty cached entries are scanned a bit later */
+ b->scan_idle_source = g_idle_add_full(G_PRIORITY_HIGH, scan_idle_callback, b, NULL);
return b;
}
if (b->time_event) {
avahi_time_event_queue_remove(b->server->time_event_queue, b->time_event);
b->time_event = NULL;
+
+ if (b->scan_idle_source != (guint) -1) {
+ g_source_remove(b->scan_idle_source);
+ b->scan_idle_source = (guint) -1;
+ }
+
}
}
if (b->time_event)
avahi_time_event_queue_remove(b->server->time_event_queue, b->time_event);
avahi_key_unref(b->key);
+
+ if (b->scan_idle_source != (guint) -1)
+ g_source_remove(b->scan_idle_source);
g_free(b);
}