* allow the user to specify a static browse domain list in the configuration file

* remove "drop-root" configuration variable
* move the configuration variable "add-service-cookie" from [server] to [publish]
* reorder AVAHI_DOMAIN_BROWSER_xx defs


git-svn-id: file:///home/lennart/svn/public/avahi/trunk@926 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

4 files changed, 98 insertions, 5 deletions

diff --git a/avahi-core/browse-domain.c b/avahi-core/browse-domain.c
index 5074469..4c78832 100644
--- a/avahi-core/browse-domain.c
+++ b/avahi-core/browse-domain.c
@@ -28,18 +28,33 @@
 #include <avahi-common/error.h>
 
 #include "browse.h"
+#include "log.h"
 
 struct AvahiSDomainBrowser {
+    int ref;
+    
     AvahiServer *server;
     
     AvahiSRecordBrowser *record_browser;
-    
+
+    AvahiDomainBrowserType type;
     AvahiSDomainBrowserCallback callback;
     void* userdata;
 
+    AvahiTimeEvent *defer_event;
+
+    int all_for_now_scheduled;
+    
     AVAHI_LLIST_FIELDS(AvahiSDomainBrowser, browser);
 };
 
+static void inc_ref(AvahiSDomainBrowser *b) {
+    assert(b);
+    assert(b->ref >= 1);
+
+    b->ref++;
+}
+
 static void record_browser_callback(
     AvahiSRecordBrowser*rr,
     AvahiIfIndex interface,
@@ -55,17 +70,69 @@ static void record_browser_callback(
     assert(rr);
     assert(b);
 
+    if (event == AVAHI_BROWSER_ALL_FOR_NOW &&
+        b->defer_event) {
+
+        b->all_for_now_scheduled = 1;
+        return;
+    }
+    
     /* Filter flags */
     flags &= AVAHI_LOOKUP_RESULT_CACHED | AVAHI_LOOKUP_RESULT_MULTICAST | AVAHI_LOOKUP_RESULT_WIDE_AREA;
-    
+
     if (record) {
         assert(record->key->type == AVAHI_DNS_TYPE_PTR);
         n = record->data.ptr.name;
+
+        if (b->type == AVAHI_DOMAIN_BROWSER_BROWSE) {
+            AvahiStringList *l;
+
+            /* Filter out entries defined statically */
+            
+            for (l = b->server->config.browse_domains; l; l = l->next)
+                if (avahi_domain_equal((char*) l->text, n))
+                    return;
+        }
+        
     }
         
     b->callback(b, interface, protocol, event, n, flags, b->userdata);
 }
 
+static void defer_callback(AvahiTimeEvent *e, void *userdata) {
+    AvahiSDomainBrowser *b = userdata;
+    AvahiStringList *l;
+    
+    assert(e);
+    assert(b);
+
+    avahi_time_event_free(b->defer_event);
+    b->defer_event = NULL;
+
+    /* Increase ref counter */
+    inc_ref(b);
+
+    for (l = b->server->config.browse_domains; l; l = l->next) {
+
+        /* Check whether this object still exists outside our own
+         * stack frame */
+        if (b->ref <= 1)
+            break;
+
+        b->callback(b, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, AVAHI_BROWSER_NEW, (char*) l->text, AVAHI_LOOKUP_RESULT_STATIC, b->userdata);
+    }
+
+    if (b->ref > 1) {
+        /* If the ALL_FOR_NOW event has already been scheduled, execute it now */
+        
+        if (b->all_for_now_scheduled) 
+            b->callback(b, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, AVAHI_BROWSER_ALL_FOR_NOW, NULL, 0, b->userdata);
+    }
+    
+    /* Decrease ref counter */
+    avahi_s_domain_browser_free(b);
+}
+
 AvahiSDomainBrowser *avahi_s_domain_browser_new(
     AvahiServer *server,
     AvahiIfIndex interface,
@@ -77,10 +144,10 @@ AvahiSDomainBrowser *avahi_s_domain_browser_new(
     void* userdata) {
 
     static const char * const type_table[AVAHI_DOMAIN_BROWSER_MAX] = {
-        "r",
-        "dr",
         "b",
         "db",
+        "r",
+        "dr",
         "lb"
     };
     
@@ -110,11 +177,14 @@ AvahiSDomainBrowser *avahi_s_domain_browser_new(
         avahi_server_set_errno(server, AVAHI_ERR_NO_MEMORY);
         return NULL;
     }
-    
+
+    b->ref = 1;
     b->server = server;
     b->callback = callback;
     b->userdata = userdata;
     b->record_browser = NULL;
+    b->type = type;
+    b->all_for_now_scheduled = 0;
 
     AVAHI_LLIST_PREPEND(AvahiSDomainBrowser, browser, server->domain_browsers, b);
 
@@ -127,6 +197,9 @@ AvahiSDomainBrowser *avahi_s_domain_browser_new(
         goto fail;
     
     avahi_key_unref(k);
+
+    b->defer_event = avahi_time_event_new(server->time_event_queue, NULL, defer_callback, b);
+    
     return b;
     
 fail:
@@ -142,10 +215,17 @@ fail:
 void avahi_s_domain_browser_free(AvahiSDomainBrowser *b) {
     assert(b);
 
+    assert(b->ref >= 1);
+    if (--b->ref > 0)
+        return;
+    
     AVAHI_LLIST_REMOVE(AvahiSDomainBrowser, browser, b->server->domain_browsers, b);
 
     if (b->record_browser)
         avahi_s_record_browser_free(b->record_browser);
+
+    if (b->defer_event)
+        avahi_time_event_free(b->defer_event);
     
     avahi_free(b);
 }
diff --git a/avahi-core/core.h b/avahi-core/core.h
index 78020ee..64db69c 100644
--- a/avahi-core/core.h
+++ b/avahi-core/core.h
@@ -60,6 +60,7 @@ typedef struct AvahiServerConfig {
     AvahiAddress wide_area_servers[AVAHI_WIDE_AREA_SERVERS_MAX]; /** Unicast DNS server to use for wide area lookup */
     unsigned n_wide_area_servers;     /**< Number of servers in wide_area_servers[] */
     int disallow_other_stacks;        /**< Make sure that only one mDNS responder is run at the same time on the local machine. If this is enable Avahi will not set SO_REUSADDR on its sockets, effectively preventing other stacks from running on the local machine */
+    AvahiStringList *browse_domains;  /**< Additional browsing domains */
 } AvahiServerConfig;
 
 /** Allocate a new mDNS responder object. */
diff --git a/avahi-core/internal.h b/avahi-core/internal.h
index 813eacd..e360889 100644
--- a/avahi-core/internal.h
+++ b/avahi-core/internal.h
@@ -157,6 +157,8 @@ struct AvahiServer {
 
     AvahiMulticastLookupEngine *multicast_lookup_engine;
     AvahiWideAreaLookupEngine *wide_area_lookup_engine;
+
+    AvahiStringList *static_browse_domains;
 };
 
 void avahi_entry_free(AvahiServer*s, AvahiEntry *e);
diff --git a/avahi-core/server.c b/avahi-core/server.c
index 3d53154..d92afac 100644
--- a/avahi-core/server.c
+++ b/avahi-core/server.c
@@ -1528,6 +1528,7 @@ AvahiServerConfig* avahi_server_config_init(AvahiServerConfig *c) {
     c->enable_wide_area = 0;
     c->n_wide_area_servers = 0;
     c->disallow_other_stacks = 0;
+    c->browse_domains = NULL;
     
     return c;
 }
@@ -1537,10 +1538,12 @@ void avahi_server_config_free(AvahiServerConfig *c) {
 
     avahi_free(c->host_name);
     avahi_free(c->domain_name);
+    avahi_string_list_free(c->browse_domains);
 }
 
 AvahiServerConfig* avahi_server_config_copy(AvahiServerConfig *ret, const AvahiServerConfig *c) {
     char *d = NULL, *h = NULL;
+    AvahiStringList *l = NULL;
     assert(ret);
     assert(c);
 
@@ -1553,10 +1556,17 @@ AvahiServerConfig* avahi_server_config_copy(AvahiServerConfig *ret, const AvahiS
             avahi_free(h);
             return NULL;
         }
+
+    if (!(l = avahi_string_list_copy(c->browse_domains)) && c->browse_domains) {
+        avahi_free(h);
+        avahi_free(d);
+        return NULL;
+    }
     
     *ret = *c;
     ret->host_name = h;
     ret->domain_name = d;
+    ret->browse_domains = l;
 
     return ret;
 }