add man page for avahi-daemon.conf

[catta] / avahi-core / browse.c

diff --git a/avahi-core/browse.c b/avahi-core/browse.c
index 10d71cbc514f9a9ba66c825989ec1ebedeae5a5d..5885cb4fb2152161969e8f7ddab5724abda1c012 100644 (file)
--- a/avahi-core/browse.c
+++ b/avahi-core/browse.c
@@ -25,15 +25,15 @@
 
 #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;
@@ -49,17 +49,19 @@ struct AvahiRecordBrowser {
 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);
@@ -103,7 +105,7 @@ static void scan_interface_callback(AvahiInterfaceMonitor *m, AvahiInterface *i,
     avahi_cache_walk(i->cache, s->key, scan_cache_callback, &cbdata);
 }
 
-gboolean scan_idle_callback(gpointer data) {
+static gboolean scan_idle_callback(gpointer data) {
     AvahiRecordBrowser *b = data;
     g_assert(b);
 
@@ -114,7 +116,7 @@ gboolean scan_idle_callback(gpointer data) {
     return FALSE;
 }
 
-AvahiRecordBrowser *avahi_record_browser_new(AvahiServer *server, gint interface, guchar protocol, AvahiKey *key, AvahiRecordBrowserCallback callback, gpointer userdata) {
+AvahiRecordBrowser *avahi_record_browser_new(AvahiServer *server, AvahiIfIndex interface, AvahiProtocol protocol, AvahiKey *key, AvahiRecordBrowserCallback callback, gpointer userdata) {
     AvahiRecordBrowser *b, *t;
     GTimeVal tv;
 
@@ -122,7 +124,15 @@ AvahiRecordBrowser *avahi_record_browser_new(AvahiServer *server, gint interface
     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;
@@ -132,7 +142,6 @@ AvahiRecordBrowser *avahi_record_browser_new(AvahiServer *server, gint interface
     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);