* update todo list

* add avvahi-dnsconfd
* implement AvahiDNSServerBrowser
* Update special browse/register RRs to match current RFC
* add support to avahi-daemon to publish name server information
* add support to avahi-daemon to publish /etc/resolv.conf DNS server information
* add new simple protocol command: "BROWSE-DNS-SERVERS"
* cleanup final configure message


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

1 files changed, 194 insertions, 0 deletions

diff --git a/avahi-core/browse-dns-server.c b/avahi-core/browse-dns-server.c
new file mode 100644
index 0000000..9dd4798
--- /dev/null
+++ b/avahi-core/browse-dns-server.c
@@ -0,0 +1,194 @@
+/* $Id$ */
+
+/***
+  This file is part of avahi.
+ 
+  avahi is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License as
+  published by the Free Software Foundation; either version 2.1 of the
+  License, or (at your option) any later version.
+ 
+  avahi is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+  or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+  Public License for more details.
+ 
+  You should have received a copy of the GNU Lesser General Public
+  License along with avahi; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <string.h>
+
+#include "browse.h"
+#include "util.h"
+#include "log.h"
+#include "rr.h"
+
+typedef struct AvahiDNSServerInfo AvahiDNSServerInfo;
+
+struct AvahiDNSServerInfo {
+    AvahiDNSServerBrowser *browser;
+
+    gint interface;
+    guchar protocol;
+    AvahiRecord *srv_record;
+    AvahiHostNameResolver *host_name_resolver;
+    AvahiAddress address;
+    
+    AVAHI_LLIST_FIELDS(AvahiDNSServerInfo, info);
+};
+
+struct AvahiDNSServerBrowser {
+    AvahiServer *server;
+    gchar *domain_name;
+    
+    AvahiRecordBrowser *record_browser;
+    AvahiDNSServerBrowserCallback callback;
+    gpointer userdata;
+    guchar aprotocol;
+
+    guint n_info;
+    
+    AVAHI_LLIST_FIELDS(AvahiDNSServerBrowser, browser);
+    AVAHI_LLIST_HEAD(AvahiDNSServerInfo, info);
+};
+
+static AvahiDNSServerInfo* get_server_info(AvahiDNSServerBrowser *b, gint interface, guchar protocol, AvahiRecord *r) {
+    AvahiDNSServerInfo *i;
+    
+    g_assert(b);
+    g_assert(r);
+
+    for (i = b->info; i; i = i->info_next)
+        if (i->interface == interface &&
+            i->protocol == protocol &&
+            avahi_record_equal_no_ttl(r, i->srv_record))
+            return i;
+
+    return NULL;
+}
+
+static void server_info_free(AvahiDNSServerBrowser *b, AvahiDNSServerInfo *i) {
+    g_assert(b);
+    g_assert(i);
+
+    avahi_record_unref(i->srv_record);
+    if (i->host_name_resolver)
+        avahi_host_name_resolver_free(i->host_name_resolver);
+    
+    AVAHI_LLIST_REMOVE(AvahiDNSServerInfo, info, b->info, i);
+
+    g_assert(b->n_info >= 1);
+    b->n_info--;
+    
+    g_free(i);
+}
+
+static void host_name_resolver_callback(AvahiHostNameResolver *r, gint interface, guchar protocol, AvahiResolverEvent event, const gchar *host_name, const AvahiAddress *a, gpointer userdata) {
+    AvahiDNSServerInfo *i = userdata;
+    
+    g_assert(r);
+    g_assert(host_name);
+    g_assert(i);
+
+    if (event == AVAHI_RESOLVER_FOUND) {
+        i->address = *a;
+
+        i->browser->callback(i->browser, i->interface, i->protocol, AVAHI_BROWSER_NEW, i->srv_record->data.srv.name, &i->address, i->srv_record->data.srv.port, i->browser->userdata);
+    }
+
+    avahi_host_name_resolver_free(i->host_name_resolver);
+    i->host_name_resolver = NULL;
+}
+
+static void record_browser_callback(AvahiRecordBrowser*rr, gint interface, guchar protocol, AvahiBrowserEvent event, AvahiRecord *record, gpointer userdata) {
+    AvahiDNSServerBrowser *b = userdata;
+
+    g_assert(rr);
+    g_assert(record);
+    g_assert(b);
+
+    g_assert(record->key->type == AVAHI_DNS_TYPE_SRV);
+
+    if (event == AVAHI_BROWSER_NEW) {
+        AvahiDNSServerInfo *i;
+
+        if (get_server_info(b, interface, protocol, record))
+            return;
+
+        if (b->n_info >= 10)
+            return;
+        
+        i = g_new(AvahiDNSServerInfo, 1);
+        i->browser = b;
+        i->interface = interface;
+        i->protocol = protocol;
+        i->srv_record = avahi_record_ref(record);
+        i->host_name_resolver = avahi_host_name_resolver_new(b->server, interface, protocol, record->data.srv.name, b->aprotocol, host_name_resolver_callback, i);
+        
+        AVAHI_LLIST_PREPEND(AvahiDNSServerInfo, info, b->info, i);
+
+        b->n_info++;
+    } else if (event == AVAHI_BROWSER_REMOVE) {
+        AvahiDNSServerInfo *i;
+
+        if (!(i = get_server_info(b, interface, protocol, record)))
+            return;
+
+        if (!i->host_name_resolver)
+            b->callback(b, interface, protocol, event, i->srv_record->data.srv.name, &i->address, i->srv_record->data.srv.port, b->userdata);
+
+        server_info_free(b, i);
+    }
+}
+
+AvahiDNSServerBrowser *avahi_dns_server_browser_new(AvahiServer *server, gint interface, guchar protocol, const gchar *domain, AvahiDNSServerType type, guchar aprotocol, AvahiDNSServerBrowserCallback callback, gpointer userdata) {
+    AvahiDNSServerBrowser *b;
+    AvahiKey *k;
+    gchar *n = NULL;
+    
+    g_assert(server);
+    g_assert(callback);
+    g_assert(type == AVAHI_DNS_SERVER_RESOLVE || type == AVAHI_DNS_SERVER_UPDATE);
+
+    b = g_new(AvahiDNSServerBrowser, 1);
+    b->server = server;
+    b->domain_name = avahi_normalize_name(domain ? domain : "local.");
+    b->callback = callback;
+    b->userdata = userdata;
+    b->aprotocol = aprotocol;
+    b->n_info = 0;
+
+    AVAHI_LLIST_HEAD_INIT(AvahiDNSServerInfo, b->info);
+    
+    n = g_strdup_printf("%s.%s",type == AVAHI_DNS_SERVER_RESOLVE ? "_domain._udp" : "_dns-update._udp", b->domain_name);
+    k = avahi_key_new(n, AVAHI_DNS_CLASS_IN, AVAHI_DNS_TYPE_SRV);
+    g_free(n);
+    
+    b->record_browser = avahi_record_browser_new(server, interface, protocol, k, record_browser_callback, b);
+    avahi_key_unref(k);
+
+    AVAHI_LLIST_PREPEND(AvahiDNSServerBrowser, browser, server->dns_server_browsers, b);
+    
+    return b;
+}
+
+void avahi_dns_server_browser_free(AvahiDNSServerBrowser *b) {
+    g_assert(b);
+
+    while (b->info)
+        server_info_free(b, b->info);
+    
+    AVAHI_LLIST_REMOVE(AvahiDNSServerBrowser, browser, b->server->dns_server_browsers, b);
+
+    avahi_record_browser_free(b->record_browser);
+    g_free(b->domain_name);
+    g_free(b);
+}
+