X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-daemon%2Fsimple-protocol.c;h=3e0ebb114444a665e046b9b0d9ada1c10d0c73c6;hb=7a5b2f69af7d36d6cd4153142f125fa011784e03;hp=87c9ee6ba68bd351b009d31b099caf2b52b3b94e;hpb=aab15b8d9a9d5d869659915c3d0995929ae4179b;p=catta diff --git a/avahi-daemon/simple-protocol.c b/avahi-daemon/simple-protocol.c index 87c9ee6..3e0ebb1 100644 --- a/avahi-daemon/simple-protocol.c +++ b/avahi-daemon/simple-protocol.c @@ -1,18 +1,16 @@ -/* $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 @@ -23,21 +21,39 @@ #include #endif +#include #include +#include #include #include #include #include #include #include +#include -#include +#include +#include +#include -#include #include +#include +#include #include "simple-protocol.h" #include "main.h" +#include "sd-daemon.h" + +#ifdef ENABLE_CHROOT +#include "chroot.h" +#endif + +#ifndef AF_LOCAL +#define AF_LOCAL AF_UNIX +#endif +#ifndef PF_LOCAL +#define PF_LOCAL PF_UNIX +#endif #define BUFFER_SIZE (20*1024) @@ -58,62 +74,64 @@ struct Client { Server *server; ClientState state; - - gint fd; - GPollFD poll_fd; - gchar inbuf[BUFFER_SIZE], outbuf[BUFFER_SIZE]; - guint inbuf_length, outbuf_length; + int fd; + AvahiWatch *watch; - AvahiHostNameResolver *host_name_resolver; - AvahiAddressResolver *address_resolver; - AvahiDNSServerBrowser *dns_server_browser; + 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; - gboolean bind_successful; + unsigned n_clients; + int remove_socket; }; 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--; if (c->host_name_resolver) - avahi_host_name_resolver_free(c->host_name_resolver); + avahi_s_host_name_resolver_free(c->host_name_resolver); if (c->address_resolver) - avahi_address_resolver_free(c->address_resolver); + avahi_s_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); + 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; @@ -124,20 +142,17 @@ static void client_new(Server *s, int fd) { c->address_resolver = NULL; c->dns_server_browser = NULL; - 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->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; - - g_assert(c); - g_assert(data); +static void client_output(Client *c, const uint8_t*data, size_t size) { + size_t k, m; + + assert(c); + assert(data); if (!size) return; @@ -148,32 +163,39 @@ static void client_output(Client *c, const guint8*data, guint size) { memcpy(c->outbuf + c->outbuf_length, data, m); c->outbuf_length += m; - c->poll_fd.events |= G_IO_OUT; + server->poll_api->watch_update(c->watch, AVAHI_WATCH_OUT); } -static void client_output_printf(Client *c, gchar *format, ...) { - gchar *t; +static void client_output_printf(Client *c, const char *format, ...) { + char *t; va_list ap; - + va_start(ap, format); - t = g_strdup_vprintf(format, ap); + t = avahi_strdup_vprintf(format, ap); va_end(ap); - client_output(c, (guint8*) t, strlen(t)); - g_free(t); + client_output(c, (uint8_t*) t, strlen(t)); + avahi_free(t); } +static void host_name_resolver_callback( + AVAHI_GCC_UNUSED AvahiSHostNameResolver *r, + AvahiIfIndex iface, + AvahiProtocol protocol, + AvahiResolverEvent event, + const char *hostname, + const AvahiAddress *a, + AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, + void* userdata) { -static void host_name_resolver_callback(AvahiHostNameResolver *r, gint iface, guchar protocol, AvahiBrowserEvent event, const gchar *hostname, const AvahiAddress *a, gpointer userdata) { Client *c = userdata; - - g_assert(c); + assert(c); - if (event == AVAHI_RESOLVER_TIMEOUT) - client_output_printf(c, "- Query timed out\n"); - else { - gchar t[64]; + if (event == AVAHI_RESOLVER_FAILURE) + client_output_printf(c, "%+i %s\n", avahi_server_errno(avahi_server), avahi_strerror(avahi_server_errno(avahi_server))); + else if (event == AVAHI_RESOLVER_FOUND) { + char t[AVAHI_ADDRESS_STR_MAX]; avahi_address_snprint(t, sizeof(t), a); client_output_printf(c, "+ %i %u %s %s\n", iface, protocol, hostname, t); } @@ -181,45 +203,78 @@ static void host_name_resolver_callback(AvahiHostNameResolver *r, gint iface, gu c->state = CLIENT_DEAD; } -static void address_resolver_callback(AvahiAddressResolver *r, gint iface, guchar protocol, AvahiBrowserEvent event, const AvahiAddress *a, const gchar *hostname, gpointer userdata) { +static void address_resolver_callback( + AVAHI_GCC_UNUSED AvahiSAddressResolver *r, + AvahiIfIndex iface, + AvahiProtocol protocol, + AvahiResolverEvent event, + AVAHI_GCC_UNUSED const AvahiAddress *a, + const char *hostname, + AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, + void* userdata) { + Client *c = userdata; - - - g_assert(c); - if (event == AVAHI_RESOLVER_TIMEOUT) - client_output_printf(c, "- Query timed out\n"); - else + assert(c); + + if (event == AVAHI_RESOLVER_FAILURE) + client_output_printf(c, "%+i %s\n", avahi_server_errno(avahi_server), avahi_strerror(avahi_server_errno(avahi_server))); + else if (event == AVAHI_RESOLVER_FOUND) 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) { +static void dns_server_browser_callback( + AVAHI_GCC_UNUSED AvahiSDNSServerBrowser *b, + AvahiIfIndex interface, + AvahiProtocol protocol, + AvahiBrowserEvent event, + AVAHI_GCC_UNUSED const char *host_name, + const AvahiAddress *a, + uint16_t port, + AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, + void* userdata) { + Client *c = userdata; - gchar t[64]; - - g_assert(c); + char t[AVAHI_ADDRESS_STR_MAX]; + + 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); + switch (event) { + case AVAHI_BROWSER_FAILURE: + client_output_printf(c, "%+i %s\n", avahi_server_errno(avahi_server), avahi_strerror(avahi_server_errno(avahi_server))); + c->state = CLIENT_DEAD; + break; + + case AVAHI_BROWSER_ALL_FOR_NOW: + case AVAHI_BROWSER_CACHE_EXHAUSTED: + break; + + case AVAHI_BROWSER_NEW: + case AVAHI_BROWSER_REMOVE: + + 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); + break; + } } -static void handle_line(Client *c, const gchar *s) { - gchar cmd[64], arg[64]; - gint n_args; +static void handle_line(Client *c, const char *s) { + char cmd[64], arg[64]; + int n_args; - g_assert(c); - g_assert(s); + assert(c); + assert(s); if (c->state != CLIENT_IDLE) return; if ((n_args = sscanf(s, "%63s %63s", cmd, arg)) < 1 ) { - client_output_printf(c, "- Failed to parse command, try \"HELP\".\n"); + client_output_printf(c, "%+i Failed to parse command, try \"HELP\".\n", AVAHI_ERR_INVALID_OPERATION); c->state = CLIENT_DEAD; return; } @@ -236,70 +291,105 @@ static void handle_line(Client *c, const gchar *s) { "+ 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"); + 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; - c->host_name_resolver = avahi_host_name_resolver_new(avahi_server, -1, AF_UNSPEC, arg, c->afquery = AF_INET, host_name_resolver_callback, c); + if (!(c->host_name_resolver = avahi_s_host_name_resolver_new(avahi_server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, arg, c->afquery = AVAHI_PROTO_INET, AVAHI_LOOKUP_USE_MULTICAST, 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; - c->host_name_resolver = avahi_host_name_resolver_new(avahi_server, -1, AF_UNSPEC, arg, c->afquery = AF_INET6, host_name_resolver_callback, c); + if (!(c->host_name_resolver = avahi_s_host_name_resolver_new(avahi_server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, arg, c->afquery = AVAHI_PROTO_INET6, AVAHI_LOOKUP_USE_MULTICAST, 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; - c->host_name_resolver = avahi_host_name_resolver_new(avahi_server, -1, AF_UNSPEC, arg, c->afquery = AF_UNSPEC, host_name_resolver_callback, c); + if (!(c->host_name_resolver = avahi_s_host_name_resolver_new(avahi_server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, arg, c->afquery = AVAHI_PROTO_UNSPEC, AVAHI_LOOKUP_USE_MULTICAST, 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, "- Failed to parse address \"%s\".\n", arg); + + if (!(avahi_address_parse(arg, AVAHI_PROTO_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; - c->address_resolver = avahi_address_resolver_new(avahi_server, -1, AF_UNSPEC, &addr, address_resolver_callback, c); + if (!(c->address_resolver = avahi_s_address_resolver_new(avahi_server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, &addr, AVAHI_LOOKUP_USE_MULTICAST, 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; - c->dns_server_browser = avahi_dns_server_browser_new(avahi_server, -1, AF_UNSPEC, NULL, AVAHI_DNS_SERVER_RESOLVE, c->afquery = AF_INET, dns_server_browser_callback, c); + if (!(c->dns_server_browser = avahi_s_dns_server_browser_new(avahi_server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, NULL, AVAHI_DNS_SERVER_RESOLVE, c->afquery = AVAHI_PROTO_INET, AVAHI_LOOKUP_USE_MULTICAST, dns_server_browser_callback, c))) + goto fail; client_output_printf(c, "+ Browsing ...\n"); + + avahi_log_debug(__FILE__": Got %s request.", cmd); + } 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, c->afquery = AF_INET6, dns_server_browser_callback, c); + if (!(c->dns_server_browser = avahi_s_dns_server_browser_new(avahi_server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, NULL, AVAHI_DNS_SERVER_RESOLVE, c->afquery = AVAHI_PROTO_INET6, AVAHI_LOOKUP_USE_MULTICAST, dns_server_browser_callback, c))) + goto fail; client_output_printf(c, "+ Browsing ...\n"); + + avahi_log_debug(__FILE__": Got %s request.", cmd); + } 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, c->afquery = AF_UNSPEC, dns_server_browser_callback, c); + if (!(c->dns_server_browser = avahi_s_dns_server_browser_new(avahi_server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, NULL, AVAHI_DNS_SERVER_RESOLVE, c->afquery = AVAHI_PROTO_UNSPEC, AVAHI_LOOKUP_USE_MULTICAST, dns_server_browser_callback, c))) + goto fail; client_output_printf(c, "+ Browsing ...\n"); + + avahi_log_debug(__FILE__": Got %s request.", cmd); + } else { - client_output_printf(c, "- Invalid command \"%s\", try \"HELP\".\n", cmd); + 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); c->inbuf_length -= k + 1; memmove(c->inbuf, e+1, c->inbuf_length); } } -static void client_work(Client *c) { - g_assert(c); +static void client_work(AvahiWatch *watch, AVAHI_GCC_UNUSED 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) avahi_log_warn("read(): %s", strerror(errno)); @@ -308,12 +398,12 @@ static void client_work(Client *c) { } 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) { @@ -322,9 +412,9 @@ static void client_work(Client *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); @@ -334,127 +424,103 @@ static void client_work(Client *c) { } } - 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); + 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 prepare_func(GSource *source, gint *timeout) { - g_assert(source); - g_assert(timeout); - - *timeout = -1; - return FALSE; -} +static void server_work(AVAHI_GCC_UNUSED AvahiWatch *watch, int fd, AvahiWatchEvent events, void *userdata) { + Server *s = userdata; -static gboolean check_func(GSource *source) { - Server *s = (Server*) source; - Client *c; - - g_assert(s); + 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; + if (events & AVAHI_WATCH_IN) { + int cfd; - return FALSE; -} - -static gboolean dispatch_func(GSource *source, GSourceFunc callback, gpointer user_data) { - Server *s = (Server*) source; - Client *c, *n; - - g_assert(s); - - if (s->poll_fd.revents & G_IO_IN) { - gint fd; - - if ((fd = accept(s->fd, NULL, NULL)) < 0) - avahi_log_warn("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; + int n; - static GSourceFuncs source_funcs = { - prepare_func, - check_func, - dispatch_func, - NULL, - NULL, - NULL - }; - - g_assert(!server); - - server = (Server*) g_source_new(&source_funcs, sizeof(Server)); - server->bind_successful = FALSE; + assert(!server); + + server = avahi_new(Server, 1); + server->poll_api = poll_api; + server->remove_socket = 0; server->fd = -1; + server->n_clients = 0; AVAHI_LLIST_HEAD_INIT(Client, server->clients); - g_main_context_ref(server->context = (c ? c : g_main_context_default())); - server->clients = NULL; + server->watch = NULL; u = umask(0000); - if ((server->fd = socket(PF_LOCAL, SOCK_STREAM, 0)) < 0) { - avahi_log_warn("socket(PF_LOCAL, SOCK_STREAM, 0): %s", strerror(errno)); + if ((n = sd_listen_fds(1)) < 0) { + avahi_log_warn("Failed to acquire systemd file descriptors: %s", strerror(-n)); goto fail; } - memset(&sa, 0, sizeof(sa)); - sa.sun_family = AF_LOCAL; - 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) { - avahi_log_warn("bind(): %s", strerror(errno)); + if (n > 1) { + avahi_log_warn("Too many systemd file descriptors passed."); goto fail; } - server->bind_successful = TRUE; - - if (listen(server->fd, 2) < 0) { - avahi_log_warn("listen(): %s", strerror(errno)); - goto fail; + if (n == 1) { + int r; + + if ((r = sd_is_socket(SD_LISTEN_FDS_START, AF_LOCAL, SOCK_STREAM, 1)) < 0) { + avahi_log_warn("Passed systemd file descriptor is of wrong type: %s", strerror(-r)); + goto fail; + } + + server->fd = SD_LISTEN_FDS_START; + + } else { + + if ((server->fd = socket(AF_LOCAL, SOCK_STREAM, 0)) < 0) { + avahi_log_warn("socket(AF_LOCAL, SOCK_STREAM, 0): %s", strerror(errno)); + goto fail; + } + + memset(&sa, 0, sizeof(sa)); + sa.sun_family = AF_LOCAL; + strncpy(sa.sun_path, AVAHI_SOCKET, sizeof(sa.sun_path)-1); + + /* We simply remove existing UNIX sockets under this name. The + Avahi daemon 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, (struct sockaddr*) &sa, sizeof(sa)) < 0) { + avahi_log_warn("bind(): %s", strerror(errno)); + goto fail; + } + + server->remove_socket = 1; + + if (listen(server->fd, SOMAXCONN) < 0) { + 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); + server->watch = poll_api->watch_new(poll_api, server->fd, AVAHI_WATCH_IN, server_work, server); - g_source_attach(&server->source, server->context); - return 0; fail: - + umask(u); simple_protocol_shutdown(); @@ -465,19 +531,23 @@ void simple_protocol_shutdown(void) { if (server) { + if (server->remove_socket) +#ifdef ENABLE_CHROOT + avahi_chroot_helper_unlink(AVAHI_SOCKET); +#else + unlink(AVAHI_SOCKET); +#endif + while (server->clients) client_free(server->clients); - if (server->bind_successful) - unlink(AVAHI_SOCKET); - + if (server->watch) + server->poll_api->watch_free(server->watch); + 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; } @@ -487,14 +557,12 @@ void simple_protocol_restart_queries(void) { Client *c; /* Restart queries in case of local domain name changes */ - - g_assert(server); + + assert(server); for (c = server->clients; c; c = c->clients_next) if (c->state == CLIENT_BROWSE_DNS_SERVERS && c->dns_server_browser) { - avahi_dns_server_browser_free(c->dns_server_browser); - c->dns_server_browser = avahi_dns_server_browser_new(avahi_server, -1, AF_UNSPEC, NULL, AVAHI_DNS_SERVER_RESOLVE, c->afquery, dns_server_browser_callback, c); + avahi_s_dns_server_browser_free(c->dns_server_browser); + c->dns_server_browser = avahi_s_dns_server_browser_new(avahi_server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, NULL, AVAHI_DNS_SERVER_RESOLVE, c->afquery, AVAHI_LOOKUP_USE_MULTICAST, dns_server_browser_callback, c); } } - -