X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-daemon%2Fsimple-protocol.c;h=7f755621f926a647f26905d30db2e2c88169d1d6;hb=46109dfec75534fe270c0ab902576f685d5ab3a6;hp=2d806dfc9f1841961e5fb24673dd31c9687e65c7;hpb=fd25072a95549aff47d5abafd712fb14de55e172;p=catta diff --git a/avahi-daemon/simple-protocol.c b/avahi-daemon/simple-protocol.c index 2d806df..7f75562 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 @@ -32,6 +30,7 @@ #include #include #include +#include #include #include @@ -43,6 +42,18 @@ #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) @@ -63,7 +74,7 @@ struct Client { Server *server; ClientState state; - + int fd; AvahiWatch *watch; @@ -75,7 +86,7 @@ struct Client { AvahiSDNSServerBrowser *dns_server_browser; AvahiProtocol afquery; - + AVAHI_LLIST_FIELDS(Client, clients); }; @@ -86,7 +97,7 @@ struct Server { AVAHI_LLIST_HEAD(Client, clients); unsigned n_clients; - int bind_successful; + int remove_socket; }; static Server *server = NULL; @@ -110,7 +121,7 @@ static void client_free(Client *c) { c->server->poll_api->watch_free(c->watch); close(c->fd); - + AVAHI_LLIST_REMOVE(Client, clients, c->server->clients, c); avahi_free(c); } @@ -139,7 +150,7 @@ static void client_new(Server *s, int fd) { static void client_output(Client *c, const uint8_t*data, size_t size) { size_t k, m; - + assert(c); assert(data); @@ -158,7 +169,7 @@ static void client_output(Client *c, const uint8_t*data, size_t size) { 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); @@ -174,11 +185,11 @@ static void host_name_resolver_callback( AvahiResolverEvent event, const char *hostname, const AvahiAddress *a, - AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, + AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, void* userdata) { Client *c = userdata; - + assert(c); if (event == AVAHI_RESOLVER_FAILURE) @@ -201,9 +212,9 @@ static void address_resolver_callback( const char *hostname, AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, void* userdata) { - + Client *c = userdata; - + assert(c); if (event == AVAHI_RESOLVER_FAILURE) @@ -224,10 +235,10 @@ static void dns_server_browser_callback( uint16_t port, AVAHI_GCC_UNUSED AvahiLookupResultFlags flags, void* userdata) { - + Client *c = userdata; char t[AVAHI_ADDRESS_STR_MAX]; - + assert(c); if (!a) @@ -245,7 +256,7 @@ static void dns_server_browser_callback( 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; @@ -302,7 +313,7 @@ static void handle_line(Client *c, const char *s) { 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, AVAHI_PROTO_UNSPEC, &addr))) { client_output_printf(c, "%+i Failed to parse address \"%s\".\n", AVAHI_ERR_INVALID_ADDRESS, arg); c->state = CLIENT_DEAD; @@ -320,7 +331,7 @@ static void handle_line(Client *c, const char *s) { goto fail; client_output_printf(c, "+ Browsing ...\n"); - avahi_log_debug(__FILE__": Got %s request for '%s'.", cmd, arg); + 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; @@ -328,7 +339,7 @@ static void handle_line(Client *c, const char *s) { goto fail; client_output_printf(c, "+ Browsing ...\n"); - avahi_log_debug(__FILE__": Got %s request for '%s'.", cmd, arg); + 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; @@ -336,7 +347,7 @@ static void handle_line(Client *c, const char *s) { goto fail; client_output_printf(c, "+ Browsing ...\n"); - avahi_log_debug(__FILE__": Got %s request for '%s'.", cmd, arg); + avahi_log_debug(__FILE__": Got %s request.", cmd); } else { client_output_printf(c, "%+i Invalid command \"%s\", try \"HELP\".\n", AVAHI_ERR_INVALID_OPERATION, cmd); @@ -364,7 +375,7 @@ static void handle_input(Client *c) { 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); @@ -378,7 +389,7 @@ static void client_work(AvahiWatch *watch, AVAHI_GCC_UNUSED int fd, AvahiWatchEv 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)); @@ -403,7 +414,7 @@ static void client_work(AvahiWatch *watch, AVAHI_GCC_UNUSED int fd, AvahiWatchEv 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); @@ -414,7 +425,7 @@ static void client_work(AvahiWatch *watch, AVAHI_GCC_UNUSED int fd, AvahiWatchEv } c->server->poll_api->watch_update( - watch, + watch, (c->outbuf_length > 0 ? AVAHI_WATCH_OUT : 0) | (c->inbuf_length < sizeof(c->inbuf) ? AVAHI_WATCH_IN : 0)); } @@ -433,59 +444,83 @@ static void server_work(AVAHI_GCC_UNUSED AvahiWatch *watch, int fd, AvahiWatchEv client_new(s, cfd); } } - + int simple_protocol_setup(const AvahiPoll *poll_api) { struct sockaddr_un sa; mode_t u; + int n; assert(!server); server = avahi_new(Server, 1); server->poll_api = poll_api; - server->bind_successful = 0; + server->remove_socket = 0; server->fd = -1; server->n_clients = 0; AVAHI_LLIST_HEAD_INIT(Client, server->clients); 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 = 1; - - 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(AF_LOCAL, SOCK_STREAM, 1, 0)) < 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); server->watch = poll_api->watch_new(poll_api, server->fd, AVAHI_WATCH_IN, server_work, server); - + return 0; fail: - + umask(u); simple_protocol_shutdown(); @@ -496,20 +531,24 @@ void simple_protocol_shutdown(void) { if (server) { - if (server->bind_successful) + 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->watch) server->poll_api->watch_free(server->watch); - + if (server->fd >= 0) close(server->fd); avahi_free(server); - + server = NULL; } } @@ -518,7 +557,7 @@ 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) @@ -527,5 +566,3 @@ void simple_protocol_restart_queries(void) { 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); } } - -