X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-daemon%2Fsimple-protocol.c;h=fe3888a68000f7389fd71dc54503870d5e5a5aaa;hb=14e31e958eb9d280cfe544bc3379d19255badd21;hp=71dd63918fd3055c4fa7ddc781e16326855d4ea2;hpb=969d343114a3ad07e9f1617ec1df465ca501d222;p=catta

diff --git a/avahi-daemon/simple-protocol.c b/avahi-daemon/simple-protocol.c
index 71dd639..fe3888a 100644
--- a/avahi-daemon/simple-protocol.c
+++ b/avahi-daemon/simple-protocol.c
@@ -23,6 +23,7 @@
 #include <config.h>
 #endif
 
+#include <assert.h>
 #include <string.h>
 #include <sys/socket.h>
 #include <stdio.h>
@@ -31,83 +32,112 @@
 #include <errno.h>
 #include <fcntl.h>
 
-#include <glib.h>
-
-#include <avahi-core/llist.h>
+#include <avahi-common/llist.h>
+#include <avahi-common/malloc.h>
+#include <avahi-common/error.h>
+#include <avahi-core/log.h>
 
 #include "simple-protocol.h"
+#include "main.h"
 
-#define BUFFER_SIZE (10*1024)
-
-#define UNIX_SOCKET_PATH "/tmp/avahi"
-#define UNIX_SOCKET UNIX_SOCKET_PATH"/socket"
+#define BUFFER_SIZE (20*1024)
 
 #define CLIENTS_MAX 50
 
 typedef struct Client Client;
 typedef struct Server Server;
 
+typedef enum {
+    CLIENT_IDLE,
+    CLIENT_RESOLVE_HOSTNAME,
+    CLIENT_RESOLVE_ADDRESS,
+    CLIENT_BROWSE_DNS_SERVERS,
+    CLIENT_DEAD
+} ClientState;
+
 struct Client {
     Server *server;
+
+    ClientState state;
     
-    gint fd;
-    GPollFD poll_fd;
+    int fd;
+    AvahiWatch *watch;
 
-    gchar inbuf[BUFFER_SIZE], outbuf[BUFFER_SIZE];
-    guint inbuf_length, outbuf_length;
+    char inbuf[BUFFER_SIZE], outbuf[BUFFER_SIZE];
+    size_t inbuf_length, outbuf_length;
+
+    AvahiSHostNameResolver *host_name_resolver;
+    AvahiSAddressResolver *address_resolver;
+    AvahiSDNSServerBrowser *dns_server_browser;
+
+    AvahiProtocol afquery;
     
     AVAHI_LLIST_FIELDS(Client, clients);
 };
 
 struct Server {
-    GSource source;
-    GMainContext *context;
-    GPollFD poll_fd;
-    gint fd;
+    const AvahiPoll *poll_api;
+    int fd;
+    AvahiWatch *watch;
     AVAHI_LLIST_HEAD(Client, clients);
 
-    guint n_clients;
+    unsigned n_clients;
+    int bind_successful;
 };
 
 static Server *server = NULL;
 
+static void client_work(AvahiWatch *watch, int fd, AvahiWatchEvent events, void *userdata);
+
 static void client_free(Client *c) {
-    g_assert(c);
+    assert(c);
 
-    g_assert(c->server->n_clients >= 1);
+    assert(c->server->n_clients >= 1);
     c->server->n_clients--;
-    
-    g_source_remove_poll(&c->server->source, &c->poll_fd);
+
+    if (c->host_name_resolver)
+        avahi_s_host_name_resolver_free(c->host_name_resolver);
+
+    if (c->address_resolver)
+        avahi_s_address_resolver_free(c->address_resolver);
+
+    if (c->dns_server_browser)
+        avahi_s_dns_server_browser_free(c->dns_server_browser);
+
+    c->server->poll_api->watch_free(c->watch);
     close(c->fd);
+    
     AVAHI_LLIST_REMOVE(Client, clients, c->server->clients, c);
-    g_free(c);
+    avahi_free(c);
 }
 
 static void client_new(Server *s, int fd) {
     Client *c;
 
-    g_assert(fd >= 0);
+    assert(fd >= 0);
 
-    c = g_new(Client, 1);
+    c = avahi_new(Client, 1);
     c->server = s;
     c->fd = fd;
+    c->state = CLIENT_IDLE;
 
     c->inbuf_length = c->outbuf_length = 0;
 
-    memset(&c->poll_fd, 0, sizeof(GPollFD));
-    c->poll_fd.fd = fd;
-    c->poll_fd.events = G_IO_IN|G_IO_ERR|G_IO_HUP;
-    g_source_add_poll(&s->source, &c->poll_fd);
+    c->host_name_resolver = NULL;
+    c->address_resolver = NULL;
+    c->dns_server_browser = NULL;
+
+    c->watch = s->poll_api->watch_new(s->poll_api, fd, AVAHI_WATCH_IN, client_work, c);
 
     AVAHI_LLIST_PREPEND(Client, clients, s->clients, c);
     s->n_clients++;
 }
 
-static void client_output(Client *c, const guint8*data, guint size) {
-    guint k, m;
+static void client_output(Client *c, const uint8_t*data, size_t size) {
+    size_t k, m;
     
-    g_assert(c);
-    g_assert(data);
+    assert(c);
+    assert(data);
 
     if (!size)
         return;
@@ -117,29 +147,201 @@ static void client_output(Client *c, const guint8*data, guint size) {
 
     memcpy(c->outbuf + c->outbuf_length, data, m);
     c->outbuf_length += m;
+
+    server->poll_api->watch_update(c->watch, AVAHI_WATCH_OUT);
 }
 
-static void handle_line(Client *c, const gchar *s) {
-    gchar t[256];
+static void client_output_printf(Client *c, const char *format, ...) {
+    char *t;
+    va_list ap;
+    
+    va_start(ap, format);
+    t = avahi_strdup_vprintf(format, ap);
+    va_end(ap);
 
-    g_assert(c);
-    g_assert(s);
+    client_output(c, (uint8_t*) t, strlen(t));
+    avahi_free(t);
+}
 
-    snprintf(t, sizeof(t), "you said <%s>\n", s);
-    client_output(c, (guint8*) t, strlen(t));
+
+static void host_name_resolver_callback(
+    AvahiSHostNameResolver *r,
+    AvahiIfIndex iface,
+    AvahiProtocol protocol,
+    AvahiResolverEvent event,
+    const char *hostname,
+    const AvahiAddress *a,
+    void* userdata) {
+
+    Client *c = userdata;
+    
+    assert(c);
+
+    if (event == AVAHI_RESOLVER_TIMEOUT)
+        client_output_printf(c, "%+i Query timed out\n", AVAHI_ERR_TIMEOUT);
+    else {
+        char t[64];
+        avahi_address_snprint(t, sizeof(t), a);
+        client_output_printf(c, "+ %i %u %s %s\n", iface, protocol, hostname, t);
+    }
+
+    c->state = CLIENT_DEAD;
+}
+
+static void address_resolver_callback(
+    AvahiSAddressResolver *r,
+    AvahiIfIndex iface,
+    AvahiProtocol protocol,
+    AvahiResolverEvent event,
+    const AvahiAddress *a,
+    const char *hostname,
+    void* userdata) {
+    
+    Client *c = userdata;
+    
+    assert(c);
+
+    if (event == AVAHI_RESOLVER_TIMEOUT)
+        client_output_printf(c, "%+i Query timed out\n", AVAHI_ERR_TIMEOUT);
+    else 
+        client_output_printf(c, "+ %i %u %s\n", iface, protocol, hostname);
+
+    c->state = CLIENT_DEAD;
+}
+
+static void dns_server_browser_callback(
+    AvahiSDNSServerBrowser *b,
+    AvahiIfIndex interface,
+    AvahiProtocol protocol,
+    AvahiBrowserEvent event,
+    const char *host_name,
+    const AvahiAddress *a,
+    uint16_t port,
+    void* userdata) {
+    
+    Client *c = userdata;
+    char t[64];
+    
+    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 char *s) {
+    char cmd[64], arg[64];
+    int n_args;
+
+    assert(c);
+    assert(s);
+
+    if (c->state != CLIENT_IDLE)
+        return;
+
+    if ((n_args = sscanf(s, "%63s %63s", cmd, arg)) < 1 ) {
+        client_output_printf(c, "%+i Failed to parse command, try \"HELP\".\n", AVAHI_ERR_INVALID_OPERATION);
+        c->state = CLIENT_DEAD;
+        return;
+    }
+
+    if (strcmp(cmd, "HELP") == 0) {
+        client_output_printf(c,
+                             "+ Available commands are:\n"
+                             "+      RESOLVE-HOSTNAME <hostname>\n"
+                             "+      RESOLVE-HOSTNAME-IPV6 <hostname>\n"
+                             "+      RESOLVE-HOSTNAME-IPV4 <hostname>\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");
+        c->state = CLIENT_DEAD;
+    } else if (strcmp(cmd, "RESOLVE-HOSTNAME-IPV4") == 0 && n_args == 2) {
+        c->state = CLIENT_RESOLVE_HOSTNAME;
+        if (!(c->host_name_resolver = avahi_s_host_name_resolver_new(avahi_server, -1, AF_UNSPEC, arg, c->afquery = AF_INET, host_name_resolver_callback, c)))
+            goto fail;
+
+        avahi_log_debug(__FILE__": Got %s request for '%s'.", cmd, arg);
+    } else if (strcmp(cmd, "RESOLVE-HOSTNAME-IPV6") == 0 && n_args == 2) {
+        c->state = CLIENT_RESOLVE_HOSTNAME;
+        if (!(c->host_name_resolver = avahi_s_host_name_resolver_new(avahi_server, -1, AF_UNSPEC, arg, c->afquery = AF_INET6, host_name_resolver_callback, c)))
+            goto fail;
+
+        avahi_log_debug(__FILE__": Got %s request for '%s'.", cmd, arg);
+    } else if (strcmp(cmd, "RESOLVE-HOSTNAME") == 0 && n_args == 2) {
+        c->state = CLIENT_RESOLVE_HOSTNAME;
+        if (!(c->host_name_resolver = avahi_s_host_name_resolver_new(avahi_server, -1, AF_UNSPEC, arg, c->afquery = AF_UNSPEC, host_name_resolver_callback, c)))
+            goto fail;
+
+        avahi_log_debug(__FILE__": Got %s request for '%s'.", cmd, arg);
+    } else if (strcmp(cmd, "RESOLVE-ADDRESS") == 0 && n_args == 2) {
+        AvahiAddress addr;
+        
+        if (!(avahi_address_parse(arg, AF_UNSPEC, &addr))) {
+            client_output_printf(c, "%+i Failed to parse address \"%s\".\n", AVAHI_ERR_INVALID_ADDRESS, arg);
+            c->state = CLIENT_DEAD;
+        } else {
+            c->state = CLIENT_RESOLVE_ADDRESS;
+            if (!(c->address_resolver = avahi_s_address_resolver_new(avahi_server, -1, AF_UNSPEC, &addr, address_resolver_callback, c)))
+                goto fail;
+        }
+
+        avahi_log_debug(__FILE__": Got %s request for '%s'.", cmd, arg);
+
+    } else if (strcmp(cmd, "BROWSE-DNS-SERVERS-IPV4") == 0 && n_args == 1) {
+        c->state = CLIENT_BROWSE_DNS_SERVERS;
+        if (!(c->dns_server_browser = avahi_s_dns_server_browser_new(avahi_server, -1, AF_UNSPEC, NULL, AVAHI_DNS_SERVER_RESOLVE, c->afquery = AF_INET, dns_server_browser_callback, c)))
+            goto fail;
+        client_output_printf(c, "+ Browsing ...\n");
+
+        avahi_log_debug(__FILE__": Got %s request for '%s'.", cmd, arg);
+
+    } else if (strcmp(cmd, "BROWSE-DNS-SERVERS-IPV6") == 0 && n_args == 1) {
+        c->state = CLIENT_BROWSE_DNS_SERVERS;
+        if (!(c->dns_server_browser = avahi_s_dns_server_browser_new(avahi_server, -1, AF_UNSPEC, NULL, AVAHI_DNS_SERVER_RESOLVE, c->afquery = AF_INET6, dns_server_browser_callback, c)))
+            goto fail;
+        client_output_printf(c, "+ Browsing ...\n");
+
+        avahi_log_debug(__FILE__": Got %s request for '%s'.", cmd, arg);
+
+    } else if (strcmp(cmd, "BROWSE-DNS-SERVERS") == 0 && n_args == 1) {
+        c->state = CLIENT_BROWSE_DNS_SERVERS;
+        if (!(c->dns_server_browser = avahi_s_dns_server_browser_new(avahi_server, -1, AF_UNSPEC, NULL, AVAHI_DNS_SERVER_RESOLVE, c->afquery = AF_UNSPEC, dns_server_browser_callback, c)))
+            goto fail;
+        client_output_printf(c, "+ Browsing ...\n");
+
+        avahi_log_debug(__FILE__": Got %s request for '%s'.", cmd, arg);
+
+    } else {
+        client_output_printf(c, "%+i Invalid command \"%s\", try \"HELP\".\n", AVAHI_ERR_INVALID_OPERATION, cmd);
+        c->state = CLIENT_DEAD;
+
+        avahi_log_debug(__FILE__": Got invalid request '%s'.", cmd);
+    }
+
+    return;
+
+fail:
+    client_output_printf(c, "%+i %s\n", avahi_server_errno(avahi_server), avahi_strerror(avahi_server_errno(avahi_server)));
+    c->state = CLIENT_DEAD;
 }
 
 static void handle_input(Client *c) {
-    g_assert(c);
+    assert(c);
 
     for (;;) {
-        gchar *e;
-        guint k;
+        char *e;
+        size_t k;
 
         if (!(e = memchr(c->inbuf, '\n', c->inbuf_length)))
             break;
 
-        k = e - (gchar*) c->inbuf;
+        k = e - (char*) c->inbuf;
         *e = 0;
         
         handle_line(c, c->inbuf);
@@ -148,155 +350,116 @@ static void handle_input(Client *c) {
     }
 }
 
-static void client_work(Client *c) {
-    g_assert(c);
+static void client_work(AvahiWatch *watch, int fd, AvahiWatchEvent events, void *userdata) {
+    Client *c = userdata;
+
+    assert(c);
 
-    if ((c->poll_fd.revents & G_IO_IN) && c->inbuf_length < sizeof(c->inbuf)) {
+    if ((events & AVAHI_WATCH_IN) && c->inbuf_length < sizeof(c->inbuf)) {
         ssize_t r;
         
         if ((r = read(c->fd, c->inbuf + c->inbuf_length, sizeof(c->inbuf) - c->inbuf_length)) <= 0) {
             if (r < 0)
-                g_warning("read(): %s", strerror(errno));
+                avahi_log_warn("read(): %s", strerror(errno));
             client_free(c);
             return;
         }
 
         c->inbuf_length += r;
-        g_assert(c->inbuf_length <= sizeof(c->inbuf));
+        assert(c->inbuf_length <= sizeof(c->inbuf));
 
         handle_input(c);
     }
 
-    if ((c->poll_fd.revents & G_IO_OUT) && c->outbuf_length > 0) {
+    if ((events & AVAHI_WATCH_OUT) && c->outbuf_length > 0) {
         ssize_t r;
 
         if ((r = write(c->fd, c->outbuf, c->outbuf_length)) < 0) {
-            g_warning("write(): %s", strerror(errno));
+            avahi_log_warn("write(): %s", strerror(errno));
             client_free(c);
             return;
         }
 
-        g_assert((guint) r <= c->outbuf_length);
+        assert((size_t) r <= c->outbuf_length);
         c->outbuf_length -= r;
         
         if (c->outbuf_length)
             memmove(c->outbuf, c->outbuf + r, c->outbuf_length - r);
-    }
 
-    c->poll_fd.events =
-        G_IO_ERR |
-        G_IO_HUP |
-        (c->outbuf_length > 0 ? G_IO_OUT : 0) |
-        (c->inbuf_length < sizeof(c->inbuf) ? G_IO_IN : 0);
-}
+        if (c->outbuf_length == 0 && c->state == CLIENT_DEAD) {
+            client_free(c);
+            return;
+        }
+    }
 
-static gboolean prepare_func(GSource *source, gint *timeout) {
-    g_assert(source);
-    g_assert(timeout);
-    
-    *timeout = -1;
-    return FALSE;
+    c->server->poll_api->watch_update(
+        watch, 
+        (c->outbuf_length > 0 ? AVAHI_WATCH_OUT : 0) |
+        (c->inbuf_length < sizeof(c->inbuf) ? AVAHI_WATCH_IN : 0));
 }
 
-static gboolean check_func(GSource *source) {
-    Server *s = (Server*) source;
-    Client *c;
-    
-    g_assert(s);
-
-    if (s->poll_fd.revents)
-        return TRUE;
-    
-    for (c = s->clients; c; c = c->clients_next)
-        if (c->poll_fd.revents)
-            return TRUE;
-
-    return FALSE;
-}
+static void server_work(AvahiWatch *watch, int fd, AvahiWatchEvent events, void *userdata) {
+    Server *s = userdata;
 
-static gboolean dispatch_func(GSource *source, GSourceFunc callback, gpointer user_data) {
-    Server *s = (Server*) source;
-    Client *c, *n;
-    
-    g_assert(s);
+    assert(s);
 
-    if (s->poll_fd.revents & G_IO_IN) {
-        gint fd;
+    if (events & AVAHI_WATCH_IN) {
+        int cfd;
 
-        if ((fd = accept(s->fd, NULL, NULL)) < 0)
-            g_warning("accept(): %s", strerror(errno));
+        if ((cfd = accept(fd, NULL, NULL)) < 0)
+            avahi_log_error("accept(): %s", strerror(errno));
         else
-            client_new(s, fd);
-    } else if (s->poll_fd.revents)
-        g_error("Invalid revents");
-
-    for (c = s->clients; c; c = n) {
-        n = c->clients_next;
-        if (c->poll_fd.revents)
-            client_work(c);
+            client_new(s, cfd);
     }
-    
-    return TRUE;
 }
-
-int simple_protocol_setup(GMainContext *c) {
+    
+int simple_protocol_setup(const AvahiPoll *poll_api) {
     struct sockaddr_un sa;
     mode_t u;
 
-    static GSourceFuncs source_funcs = {
-        prepare_func,
-        check_func,
-        dispatch_func,
-        NULL,
-        NULL,
-        NULL
-    };
-    
-    g_assert(!server);
+    assert(!server);
 
-    server = (Server*) g_source_new(&source_funcs, sizeof(Server));
+    server = avahi_new(Server, 1);
+    server->poll_api = poll_api;
+    server->bind_successful = 0;
     server->fd = -1;
+    server->n_clients = 0;
     AVAHI_LLIST_HEAD_INIT(Client, server->clients);
-    if (c)
-        g_main_context_ref(server->context = c);
-    else
-        server->context = g_main_context_default();
-    server->clients = NULL;
-
+    server->watch = NULL;
+    
     u = umask(0000);
 
-    if (mkdir(UNIX_SOCKET_PATH, 0755) < 0 && errno != EEXIST) {
-        g_warning("mkdir(): %s", strerror(errno));
-        goto fail;
-    }
-    
     if ((server->fd = socket(PF_LOCAL, SOCK_STREAM, 0)) < 0) {
-        g_warning("socket(PF_LOCAL, SOCK_STREAM, 0): %s", strerror(errno));
+        avahi_log_warn("socket(PF_LOCAL, SOCK_STREAM, 0): %s", strerror(errno));
         goto fail;
     }
 
     memset(&sa, 0, sizeof(sa));
     sa.sun_family = AF_LOCAL;
-    strncpy(sa.sun_path, UNIX_SOCKET, sizeof(sa.sun_path)-1);
+    strncpy(sa.sun_path, AVAHI_SOCKET, sizeof(sa.sun_path)-1);
 
+    /* We simply remove existing UNIX sockets under this name. The
+       Avahi daemons makes sure that it runs only once on a host,
+       therefore sockets that already exist are stale and may be
+       removed without any ill effects */
+
+    unlink(AVAHI_SOCKET);
+    
     if (bind(server->fd, &sa, sizeof(sa)) < 0) {
-        g_warning("bind(): %s", strerror(errno));
+        avahi_log_warn("bind(): %s", strerror(errno));
         goto fail;
     }
+
+    server->bind_successful = 1;
     
     if (listen(server->fd, 2) < 0) {
-        g_warning("listen(): %s", strerror(errno));
+        avahi_log_warn("listen(): %s", strerror(errno));
         goto fail;
     }
 
     umask(u);
 
-    memset(&server->poll_fd, 0, sizeof(GPollFD));
-    server->poll_fd.fd = server->fd;
-    server->poll_fd.events = G_IO_IN|G_IO_ERR;
-    g_source_add_poll(&server->source, &server->poll_fd);
-
-    g_source_attach(&server->source, server->context);
+    server->watch = poll_api->watch_new(poll_api, server->fd, AVAHI_WATCH_IN, server_work, server);
     
     return 0;
 
@@ -312,18 +475,36 @@ void simple_protocol_shutdown(void) {
 
     if (server) {
 
+        if (server->bind_successful)
+            unlink(AVAHI_SOCKET);
+
         while (server->clients)
             client_free(server->clients);
+
+        if (server->watch)
+            server->poll_api->watch_free(server->watch);
         
-        if (server->fd >= 0) {
-            unlink(UNIX_SOCKET_PATH);
+        if (server->fd >= 0)
             close(server->fd);
-        }
-
-        g_main_context_unref(server->context);
-        g_source_destroy(&server->source);
-        g_source_unref(&server->source);
 
+        avahi_free(server);
+        
         server = NULL;
     }
 }
+
+void simple_protocol_restart_queries(void) {
+    Client *c;
+
+    /* Restart queries in case of local domain name changes */
+    
+    assert(server);
+
+    for (c = server->clients; c; c = c->clients_next)
+        if (c->state == CLIENT_BROWSE_DNS_SERVERS && c->dns_server_browser) {
+            avahi_s_dns_server_browser_free(c->dns_server_browser);
+            c->dns_server_browser = avahi_s_dns_server_browser_new(avahi_server, -1, AF_UNSPEC, NULL, AVAHI_DNS_SERVER_RESOLVE, c->afquery, dns_server_browser_callback, c);
+        }
+}
+
+