* 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

4 files changed, 197 insertions, 19 deletions

diff --git a/avahi-daemon/Makefile.am b/avahi-daemon/Makefile.am
index 3b90852..4c943e4 100644
--- a/avahi-daemon/Makefile.am
+++ b/avahi-daemon/Makefile.am
@@ -27,6 +27,7 @@ AM_CFLAGS= \
 	-DAVAHI_SERVICE_DIRECTORY=\"$(servicedir)\" \
 	-DAVAHI_CONFIG_FILE=\"$(pkgsysconfdir)/avahi.conf\" \
 	-DAVAHI_RUNTIME_DIR=\"$(localstatedir)/run/avahi\"
+
 AM_LDADD=-lexpat
 
 # GLIB 2.0
@@ -37,7 +38,6 @@ AM_LDADD+=$(GLIB20_LIBS)
 AM_CFLAGS+=$(LIBDAEMON_CFLAGS)
 AM_LDADD+=$(LIBDAEMON_LIBS)
 
-
 if ENABLE_DBUS
 # DBUS
 AM_CFLAGS+=$(DBUS_CFLAGS)
diff --git a/avahi-daemon/avahi.conf b/avahi-daemon/avahi.conf
index 900d04b..82f5326 100644
--- a/avahi-daemon/avahi.conf
+++ b/avahi-daemon/avahi.conf
@@ -12,6 +12,8 @@ publish-addresses=yes
 publish-hinfo=yes
 publish-workstation=yes
 publish-domain=yes
+#publish-dns-servers=192.168.50.1,192.168.50.2
+#publish-resolv-conf-dns-servers=yes
 
 [reflector]
 enable-reflector=no
diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c
index ce3400a..40e140c 100644
--- a/avahi-daemon/main.c
+++ b/avahi-daemon/main.c
@@ -63,19 +63,136 @@ typedef struct {
     gchar *config_file;
     gboolean enable_dbus;
     gboolean drop_root;
+    gboolean publish_resolv_conf;
+    gchar ** publish_dns_servers;
 } DaemonConfig;
 
+#define RESOLV_CONF "/etc/resolv.conf"
+
+static AvahiEntryGroup *dns_servers_entry_group = NULL;
+static AvahiEntryGroup *resolv_conf_entry_group = NULL;
+
+static gchar **resolv_conf = NULL;
+
+static DaemonConfig config;
+
+#define MAX_NAME_SERVERS 10
+
+static gint load_resolv_conf(const DaemonConfig *config) {
+    gint ret = -1;
+    FILE *f;
+    gint i = 0;
+    
+    g_strfreev(resolv_conf);
+    resolv_conf = NULL;
+
+    if (!config->publish_resolv_conf)
+        return 0;
+
+    if (!(f = fopen(RESOLV_CONF, "r"))) {
+        avahi_log_warn("Failed to open "RESOLV_CONF".");
+        goto finish;
+    }
+
+    resolv_conf = g_new0(gchar*, MAX_NAME_SERVERS+1);
+
+    while (!feof(f) && i < MAX_NAME_SERVERS) {
+        char ln[128];
+        gchar *p;
+
+        if (!(fgets(ln, sizeof(ln), f)))
+            break;
+
+        ln[strcspn(ln, "\r\n#")] = 0;
+        p = ln + strspn(ln, "\t ");
+
+        if (g_str_has_prefix(p, "nameserver")) {
+            p += 10;
+            p += strspn(p, "\t ");
+            p[strcspn(p, "\t ")] = 0;
+            resolv_conf[i++] = strdup(p);
+        }
+    }
+
+    ret = 0;
+
+finish:
+
+    if (ret != 0) {
+        g_strfreev(resolv_conf);
+        resolv_conf = NULL;
+    }
+        
+    if (f)
+        fclose(f);
+
+    return ret;
+}
+
+static AvahiEntryGroup* add_dns_servers(AvahiServer *s, gchar **l) {
+    gchar **p;
+    AvahiEntryGroup *g;
+
+    g_assert(s);
+    g_assert(l);
+
+    g = avahi_entry_group_new(s, NULL, NULL);
+
+    for (p = l; *p; p++) {
+        AvahiAddress a;
+        
+        if (!avahi_address_parse(*p, AF_UNSPEC, &a))
+            avahi_log_warn("Failed to parse address '%s', ignoring.", *p);
+        else
+            if (avahi_server_add_dns_server_address(s, g, -1, AF_UNSPEC, NULL, AVAHI_DNS_SERVER_RESOLVE, &a, 53) < 0) {
+                avahi_entry_group_free(g);
+                return NULL;
+            }
+    }
+
+    avahi_entry_group_commit(g);
+
+    return g;
+    
+}
+
+static void remove_dns_server_entry_groups(void) {
+    if (resolv_conf_entry_group) {
+        avahi_entry_group_free(resolv_conf_entry_group);
+        resolv_conf_entry_group = NULL;
+    }
+    
+    if (dns_servers_entry_group) {
+        avahi_entry_group_free(dns_servers_entry_group);
+        dns_servers_entry_group = NULL;
+    }
+}
+
 static void server_callback(AvahiServer *s, AvahiServerState state, gpointer userdata) {
+    DaemonConfig *config = userdata;
+    
     g_assert(s);
+    g_assert(config);
 
     if (state == AVAHI_SERVER_RUNNING) {
         avahi_log_info("Server startup complete.  Host name is <%s>", avahi_server_get_host_name_fqdn(s));
         static_service_add_to_server();
+
+        remove_dns_server_entry_groups();
+
+        if (resolv_conf && resolv_conf[0])
+            resolv_conf_entry_group = add_dns_servers(s, resolv_conf);
+
+        if (config->publish_dns_servers && config->publish_dns_servers[0])
+            dns_servers_entry_group = add_dns_servers(s, config->publish_dns_servers);
+        
     } else if (state == AVAHI_SERVER_COLLISION) {
         gchar *n;
 
         static_service_remove_from_server();
-        
+
+        remove_dns_server_entry_groups();
+
         n = avahi_alternative_host_name(avahi_server_get_host_name(s));
         avahi_log_warn("Host name conflict, retrying with <%s>", n);
         avahi_server_set_host_name(s, n);
@@ -162,6 +279,7 @@ static gint load_config_file(DaemonConfig *config) {
     g_assert(config);
     
     f = g_key_file_new();
+    g_key_file_set_list_separator(f, ',');
     
     if (!g_key_file_load_from_file(f, config->config_file ? config->config_file : AVAHI_CONFIG_FILE, G_KEY_FILE_NONE, &err)) {
         fprintf(stderr, "Unable to read config file: %s\n", err->message);
@@ -229,7 +347,12 @@ static gint load_config_file(DaemonConfig *config) {
                     config->server_config.publish_workstation = is_yes(v);
                 else if (g_strcasecmp(*k, "publish-domain") == 0)
                     config->server_config.publish_domain = is_yes(v);
-                else {
+                else if (g_strcasecmp(*k, "publish-resolv-conf-dns-servers") == 0)
+                    config->publish_resolv_conf = is_yes(v);
+                else if (g_strcasecmp(*k, "publish-dns-servers") == 0) {
+                    g_strfreev(config->publish_dns_servers);
+                    config->publish_dns_servers = g_key_file_get_string_list(f, *g, *k, NULL, NULL);
+                } else {
                     fprintf(stderr, "Invalid configuration key \"%s\" in group \"%s\"\n", *k, *g);
                     goto finish;
                 }
@@ -307,7 +430,10 @@ static void log_function(AvahiLogLevel level, const gchar *txt) {
 
 static gboolean signal_callback(GIOChannel *source, GIOCondition condition, gpointer data) {
     gint sig;
+    GMainLoop *loop = data;
+    
     g_assert(source);
+    g_assert(loop);
 
     if ((sig = daemon_signal_next()) <= 0) {
         avahi_log_error("daemon_signal_next() failed");
@@ -322,13 +448,24 @@ static gboolean signal_callback(GIOChannel *source, GIOCondition condition, gpoi
                 "Got %s, quitting.",
                 sig == SIGINT ? "SIGINT" :
                 (sig == SIGQUIT ? "SIGQUIT" : "SIGTERM"));
-            g_main_loop_quit((GMainLoop*) data);
+            g_main_loop_quit(loop);
             break;
 
         case SIGHUP:
             avahi_log_info("Got SIGHUP, reloading.");
             static_service_load();
             static_service_add_to_server();
+
+            if (resolv_conf_entry_group) {
+                avahi_entry_group_free(resolv_conf_entry_group);
+                resolv_conf_entry_group = NULL;
+            }
+
+            load_resolv_conf(&config);
+            
+            if (resolv_conf && resolv_conf[0])
+                resolv_conf_entry_group = add_dns_servers(avahi_server, resolv_conf);
+
             break;
 
         default:
@@ -371,8 +508,10 @@ static gint run_server(DaemonConfig *config) {
             goto finish;
 #endif
     
-    if (!(avahi_server = avahi_server_new(NULL, &config->server_config, server_callback, NULL)))
+    if (!(avahi_server = avahi_server_new(NULL, &config->server_config, server_callback, config)))
         goto finish;
+
+    load_resolv_conf(config);
     
     static_service_load();
 
@@ -387,6 +526,7 @@ finish:
     
     static_service_remove_from_server();
     static_service_free_all();
+    remove_dns_server_entry_groups();
     
     simple_protocol_shutdown();
 
@@ -395,6 +535,7 @@ finish:
         dbus_protocol_shutdown();
 #endif
 
+
     if (avahi_server)
         avahi_server_free(avahi_server);
 
@@ -476,7 +617,7 @@ static gint drop_root(void) {
 }
 
 static const char* pid_file_proc(void) {
-    return AVAHI_RUNTIME_DIR"/pid";
+    return AVAHI_RUNTIME_DIR"/avahi-daemon.pid";
 }
 
 static gint make_runtime_dir(void) {
@@ -525,12 +666,9 @@ fail:
     return r;
 
 }
-    
-
 
 int main(int argc, char *argv[]) {
     gint r = 255;
-    DaemonConfig config;
     const gchar *argv0;
     gboolean wrote_pid_file = FALSE;
 
@@ -542,6 +680,8 @@ int main(int argc, char *argv[]) {
     config.config_file = NULL;
     config.enable_dbus = TRUE;
     config.drop_root = TRUE;
+    config.publish_dns_servers = NULL;
+    config.publish_resolv_conf = FALSE;
 
     if ((argv0 = strrchr(argv[0], '/')))
         argv0++;
@@ -549,7 +689,6 @@ int main(int argc, char *argv[]) {
         argv0 = argv[0];
 
     daemon_pid_file_ident = daemon_log_ident = (char *) argv0;
-
     daemon_pid_file_proc = pid_file_proc;
     
     if (parse_command_line(&config, argc, argv) < 0)
@@ -560,7 +699,7 @@ int main(int argc, char *argv[]) {
         r = 0;
     } else if (config.command == DAEMON_VERSION) {
         printf("%s "PACKAGE_VERSION"\n", argv0);
-
+        r = 0;
     } else if (config.command == DAEMON_KILL) {
         if (daemon_pid_file_kill_wait(SIGTERM, 5) < 0) {
             avahi_log_warn("Failed to kill daemon: %s", strerror(errno));
@@ -594,7 +733,6 @@ int main(int argc, char *argv[]) {
             goto finish;
         
         if (config.daemonize) {
-
             daemon_retval_init();
             
             if ((pid = daemon_fork()) < 0)
@@ -645,6 +783,8 @@ finish:
 
     avahi_server_config_free(&config.server_config);
     g_free(config.config_file);
+    g_strfreev(config.publish_dns_servers);
+    g_strfreev(resolv_conf);
 
     if (wrote_pid_file)
         daemon_pid_file_remove();
diff --git a/avahi-daemon/simple-protocol.c b/avahi-daemon/simple-protocol.c
index c41e07c..39580dd 100644
--- a/avahi-daemon/simple-protocol.c
+++ b/avahi-daemon/simple-protocol.c
@@ -39,7 +39,7 @@
 #include "simple-protocol.h"
 #include "main.h"
 
-#define BUFFER_SIZE (10*1024)
+#define BUFFER_SIZE (20*1024)
 
 #define UNIX_SOCKET AVAHI_RUNTIME_DIR "/socket"
 
@@ -52,6 +52,7 @@ typedef enum {
     CLIENT_IDLE,
     CLIENT_RESOLVE_HOSTNAME,
     CLIENT_RESOLVE_ADDRESS,
+    CLIENT_BROWSE_DNS_SERVERS,
     CLIENT_DEAD
 } ClientState;
 
@@ -68,6 +69,7 @@ struct Client {
 
     AvahiHostNameResolver *host_name_resolver;
     AvahiAddressResolver *address_resolver;
+    AvahiDNSServerBrowser *dns_server_browser;
     
     AVAHI_LLIST_FIELDS(Client, clients);
 };
@@ -96,6 +98,9 @@ static void client_free(Client *c) {
 
     if (c->address_resolver)
         avahi_address_resolver_free(c->address_resolver);
+
+    if (c->dns_server_browser)
+        avahi_dns_server_browser_free(c->dns_server_browser);
     
     g_source_remove_poll(&c->server->source, &c->poll_fd);
     close(c->fd);
@@ -117,6 +122,7 @@ static void client_new(Server *s, int fd) {
 
     c->host_name_resolver = NULL;
     c->address_resolver = NULL;
+    c->dns_server_browser = NULL;
 
     memset(&c->poll_fd, 0, sizeof(GPollFD));
     c->poll_fd.fd = fd;
@@ -146,14 +152,15 @@ static void client_output(Client *c, const guint8*data, guint size) {
 }
 
 static void client_output_printf(Client *c, gchar *format, ...) {
-    gchar txt[256];
+    gchar *t;
     va_list ap;
     
     va_start(ap, format);
-    vsnprintf(txt, sizeof(txt), format, ap);
+    t = g_strdup_vprintf(format, ap);
     va_end(ap);
 
-    client_output(c, (guint8*) txt, strlen(txt));
+    client_output(c, (guint8*) t, strlen(t));
+    g_free(t);
 }
 
 static void host_name_resolver_callback(AvahiHostNameResolver *r, gint iface, guchar protocol, AvahiBrowserEvent event, const gchar *hostname, const AvahiAddress *a, gpointer userdata) {
@@ -167,7 +174,7 @@ static void host_name_resolver_callback(AvahiHostNameResolver *r, gint iface, gu
     else {
         gchar t[64];
         avahi_address_snprint(t, sizeof(t), a);
-        client_output_printf(c, "+ %s\n", t);
+        client_output_printf(c, "+ %i %u %s %s\n", iface, protocol, hostname, t);
     }
 
     c->state = CLIENT_DEAD;
@@ -176,16 +183,30 @@ static void host_name_resolver_callback(AvahiHostNameResolver *r, gint iface, gu
 static void address_resolver_callback(AvahiAddressResolver *r, gint iface, guchar protocol, AvahiBrowserEvent event, const AvahiAddress *a, const gchar *hostname, gpointer userdata) {
     Client *c = userdata;
     
+    
     g_assert(c);
 
     if (event == AVAHI_RESOLVER_TIMEOUT)
         client_output_printf(c, "- Query timed out\n");
     else 
-        client_output_printf(c, "+ %s\n", hostname);
+        client_output_printf(c, "+ %i %u %s\n", iface, protocol, hostname);
 
     c->state = CLIENT_DEAD;
 }
 
+static void dns_server_browser_callback(AvahiDNSServerBrowser *b, gint interface, guchar protocol, AvahiBrowserEvent event, const gchar *host_name, const AvahiAddress *a, guint16 port, gpointer userdata) {
+    Client *c = userdata;
+    gchar t[64];
+    
+    g_assert(c);
+
+    if (!a)
+        return;
+
+    avahi_address_snprint(t, sizeof(t), a);
+    client_output_printf(c, "%c %i %u %s %u\n", event == AVAHI_BROWSER_NEW ? '>' : '<',  interface, protocol, t, port);
+}
+
 static void handle_line(Client *c, const gchar *s) {
     gchar cmd[64], arg[64];
     gint n_args;
@@ -208,7 +229,10 @@ static void handle_line(Client *c, const gchar *s) {
                              "+      RESOLVE-HOSTNAME <hostname>\n"
                              "+      RESOLVE-HOSTNAME-IPV6 <hostname>\n"
                              "+      RESOLVE-HOSTNAME-IPV4 <hostname>\n"
-                             "+      RESOLVE-ADDRESS <address>\n");
+                             "+      RESOLVE-ADDRESS <address>\n"
+                             "+      BROWSE-DNS-SERVERS\n"
+                             "+      BROWSE-DNS-SERVERS-IPV4\n"
+                             "+      BROWSE-DNS-SERVERS-IPV6\n");
         c->state = CLIENT_DEAD; }
     else if (strcmp(cmd, "FUCK") == 0 && n_args == 1) {
         client_output_printf(c, "FUCK: Go fuck yourself!\n");
@@ -232,6 +256,18 @@ static void handle_line(Client *c, const gchar *s) {
             c->state = CLIENT_RESOLVE_ADDRESS;
             c->address_resolver = avahi_address_resolver_new(avahi_server, -1, AF_UNSPEC, &addr, address_resolver_callback, c);
         }
+    } else if (strcmp(cmd, "BROWSE-DNS-SERVERS-IPV4") == 0 && n_args == 1) {
+        c->state = CLIENT_BROWSE_DNS_SERVERS;
+        c->dns_server_browser = avahi_dns_server_browser_new(avahi_server, -1, AF_UNSPEC, NULL, AVAHI_DNS_SERVER_RESOLVE, AF_INET, dns_server_browser_callback, c);
+        client_output_printf(c, "+ Browsing ...\n");
+    } else if (strcmp(cmd, "BROWSE-DNS-SERVERS-IPV6") == 0 && n_args == 1) {
+        c->state = CLIENT_BROWSE_DNS_SERVERS;
+        c->dns_server_browser = avahi_dns_server_browser_new(avahi_server, -1, AF_UNSPEC, NULL, AVAHI_DNS_SERVER_RESOLVE, AF_INET6, dns_server_browser_callback, c);
+        client_output_printf(c, "+ Browsing ...\n");
+    } else if (strcmp(cmd, "BROWSE-DNS-SERVERS") == 0 && n_args == 1) {
+        c->state = CLIENT_BROWSE_DNS_SERVERS;
+        c->dns_server_browser = avahi_dns_server_browser_new(avahi_server, -1, AF_UNSPEC, NULL, AVAHI_DNS_SERVER_RESOLVE, AF_UNSPEC, dns_server_browser_callback, c);
+        client_output_printf(c, "+ Browsing ...\n");
     } else {
         client_output_printf(c, "- Invalid command \"%s\", try \"HELP\".\n", cmd);
         c->state = CLIENT_DEAD;