X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-dnsconfd%2Fmain.c;h=719fbebc46ed725ad1552a65454fb3e69d5656e5;hb=7a5b2f69af7d36d6cd4153142f125fa011784e03;hp=957c91e6d7ae834e8fd6a3df1f7f1afd095efe86;hpb=7540df5ed6b383ec93f5a4f10ab2d08f9b9869e4;p=catta diff --git a/avahi-dnsconfd/main.c b/avahi-dnsconfd/main.c index 957c91e..719fbeb 100644 --- a/avahi-dnsconfd/main.c +++ b/avahi-dnsconfd/main.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,11 +21,11 @@ #include #endif -#include #include #include #include #include +#include #include #include #include @@ -36,11 +34,13 @@ #include #include #include +#include +#include +#include -#include - -#include #include +#include +#include #include #include @@ -50,13 +50,15 @@ #define BROWSE_DNS_SERVERS "BROWSE-DNS-SERVERS\n" +#define ENV_INTERFACE_DNS_SERVERS "AVAHI_INTERFACE_DNS_SERVERS" +#define ENV_DNS_SERVERS "AVAHI_DNS_SERVERS" +#define ENV_INTERFACE "AVAHI_INTERFACE" + static enum { ACKWAIT, BROWSING } state = ACKWAIT; -static gboolean quit = FALSE; - static enum { DAEMON_RUN, DAEMON_KILL, @@ -66,31 +68,37 @@ static enum { DAEMON_CHECK } command = DAEMON_RUN; -static gboolean daemonize = FALSE; +static int quit = 0; +static int daemonize = 0; +static int use_syslog = 0; + +#if !HAVE_DECL_ENVIRON +extern char **environ; +#endif typedef struct DNSServerInfo DNSServerInfo; struct DNSServerInfo { - gint interface; - guchar protocol; - gchar *address; + AvahiIfIndex interface; + AvahiProtocol protocol; + char *address; AVAHI_LLIST_FIELDS(DNSServerInfo, servers); }; static AVAHI_LLIST_HEAD(DNSServerInfo, servers); static void server_info_free(DNSServerInfo *i) { - g_assert(i); + assert(i); + + avahi_free(i->address); - g_free(i->address); - AVAHI_LLIST_REMOVE(DNSServerInfo, servers, servers, i); - g_free(i); + avahi_free(i); } -static DNSServerInfo* get_server_info(gint interface, guchar protocol, const gchar *address) { +static DNSServerInfo* get_server_info(AvahiIfIndex interface, AvahiProtocol protocol, const char *address) { DNSServerInfo *i; - g_assert(address); + assert(address); for (i = servers; i; i = i->servers_next) if (i->interface == interface && @@ -101,21 +109,35 @@ static DNSServerInfo* get_server_info(gint interface, guchar protocol, const gch return NULL; } -static DNSServerInfo* new_server_info(gint interface, guchar protocol, const gchar *address) { +static DNSServerInfo* new_server_info(AvahiIfIndex interface, AvahiProtocol protocol, const char *address) { DNSServerInfo *i; - - g_assert(address); - i = g_new(DNSServerInfo, 1); + assert(address); + + i = avahi_new(DNSServerInfo, 1); i->interface = interface; i->protocol = protocol; - i->address = g_strdup(address); + i->address = avahi_strdup(address); AVAHI_LLIST_PREPEND(DNSServerInfo, servers, servers, i); - + return i; } +static int set_cloexec(int fd) { + int n; + + assert(fd >= 0); + + if ((n = fcntl(fd, F_GETFD)) < 0) + return -1; + + if (n & FD_CLOEXEC) + return 0; + + return fcntl(fd, F_SETFD, n|FD_CLOEXEC); +} + static int open_socket(void) { int fd = -1; struct sockaddr_un sa; @@ -125,11 +147,11 @@ static int open_socket(void) { goto fail; } - if (avahi_set_cloexec(fd) < 0) { + if (set_cloexec(fd) < 0) { daemon_log(LOG_ERR, "fcntl(): %s", strerror(errno)); goto fail; } - + memset(&sa, 0, sizeof(sa)); sa.sun_family = AF_UNIX; strncpy(sa.sun_path, AVAHI_SOCKET, sizeof(sa.sun_path)-1); @@ -137,11 +159,13 @@ static int open_socket(void) { if (connect(fd, (struct sockaddr*) &sa, sizeof(sa)) < 0) { daemon_log(LOG_ERR, "connect(): %s", strerror(errno)); + daemon_log(LOG_INFO, "Failed to connect to the daemon. This probably means that you"); + daemon_log(LOG_INFO, "didn't start avahi-daemon before avahi-dnsconfd."); goto fail; } return fd; - + fail: if (fd >= 0) close(fd); @@ -152,7 +176,7 @@ fail: static ssize_t loop_write(int fd, const void*data, size_t size) { ssize_t ret = 0; - g_assert(fd >= 0 && data && size); + assert(fd >= 0 && data && size); while (size > 0) { ssize_t r; @@ -164,95 +188,101 @@ static ssize_t loop_write(int fd, const void*data, size_t size) { break; ret += r; - data = (const guint8*) data + r; + data = (const uint8_t*) data + r; size -= r; } return ret; } -static gchar *concat_dns_servers(gint interface) { +static char *concat_dns_servers(AvahiIfIndex interface) { DNSServerInfo *i; - gchar *r = NULL; - + char *r = NULL; + for (i = servers; i; i = i->servers_next) if (i->interface == interface || interface <= 0) { - gchar *t; + DNSServerInfo *j; + char *t; + + /* Filter out double entries */ + for (j = servers; j != i; j = j->servers_next) + if (j->interface == interface || interface <= 0) + if (strcmp(i->address, j->address) == 0) + break; + + if (j != i) + continue; if (!r) - t = g_strdup(i->address); + t = avahi_strdup(i->address); else - t = g_strdup_printf("%s %s", r, i->address); + t = avahi_strdup_printf("%s %s", r, i->address); - g_free(r); + avahi_free(r); r = t; } return r; } -static gchar *getifname(gint interface, gchar *name, guint len) { - int fd = -1; - gchar *ret = NULL; - struct ifreq ifr; +static void set_env(const char *name, const char *value) { + char **e; + size_t l; - g_assert(interface >= 0); - - if ((fd = socket(PF_INET, SOCK_DGRAM, 0)) < 0) { - daemon_log(LOG_ERR, "socket(): %s", strerror(errno)); - goto finish; - } + assert(name); + assert(value); - memset(&ifr, 0, sizeof(ifr)); - ifr.ifr_ifindex = interface; - - if (ioctl(fd, SIOCGIFNAME, &ifr) < 0) { - daemon_log(LOG_ERR, "SIOCGIFNAME: %s\n", strerror(errno)); - goto finish; + l = strlen(name); + + for (e = environ; *e; e++) { + /* Search for the variable */ + if (strlen(*e) < l+1) + continue; + + if (strncmp(*e, name, l) != 0 || (*e)[l] != '=') + continue; + + /* We simply free the record, sicne we know that we created it previously */ + avahi_free(*e); + *e = avahi_strdup_printf("%s=%s", name, value); + return; } - strncpy(name, ifr.ifr_name, len-1); - name[len-1] = 0; - ret = name; - -finish: - if (fd >= 0) - close(fd); - - return ret; - } + assert(0); +} -static void run_script(gboolean new, gint interface, guchar protocol, const gchar *address) { - gchar *p; - g_assert(interface > 0); - gint ret; - gchar ia[16], pa[16]; - gchar name[IFNAMSIZ+1]; +static void run_script(int new, AvahiIfIndex interface, AvahiProtocol protocol, const char *address) { + char *p; + int ret; + char ia[16], pa[16]; + char name[IF_NAMESIZE]; - if (!getifname(interface, name, sizeof(name))) + assert(interface > 0); + + if (!if_indextoname(interface, name)) return; - + p = concat_dns_servers(interface); - g_setenv("AVAHI_INTERFACE_DNS_SERVERS", p ? p : "", TRUE); - g_free(p); + set_env(ENV_INTERFACE_DNS_SERVERS, p ? p : ""); + avahi_free(p); p = concat_dns_servers(-1); - g_setenv("AVAHI_DNS_SERVERS", p ? p : "", TRUE); - g_free(p); + set_env(ENV_DNS_SERVERS, p ? p : ""); + avahi_free(p); - g_setenv("AVAHI_INTERFACE", name, TRUE); - - snprintf(ia, sizeof(ia), "%i", interface); - snprintf(pa, sizeof(pa), "%u", protocol); + set_env(ENV_INTERFACE, name); - if (daemon_exec("/", &ret, AVAHI_DNSCONF_SCRIPT, AVAHI_DNSCONF_SCRIPT, new ? "+" : "-", address, ia, pa, NULL) < 0) + snprintf(ia, sizeof(ia), "%i", (int) interface); + snprintf(pa, sizeof(pa), "%i", (int) protocol); + + if (daemon_exec("/", &ret, AVAHI_DNSCONF_SCRIPT, AVAHI_DNSCONF_SCRIPT, new ? "+" : "-", address, ia, pa, avahi_proto_to_string(protocol), NULL) < 0) daemon_log(LOG_WARNING, "Failed to run script"); else if (ret != 0) daemon_log(LOG_WARNING, "Script returned with non-zero exit code %i", ret); } -static gint new_line(const gchar *l) { - g_assert(l); +static int new_line(const char *l) { + assert(l); if (state == ACKWAIT) { if (*l != '+') { @@ -263,50 +293,53 @@ static gint new_line(const gchar *l) { daemon_log(LOG_INFO, "Successfully connected to Avahi daemon."); state = BROWSING; } else { - gint interface; - guint protocol; - guint port; - gchar a[64]; - - g_assert(state == BROWSING); + AvahiIfIndex interface; + AvahiProtocol protocol; + int i_interface, i_protocol, port; + char a[AVAHI_ADDRESS_STR_MAX]; + + assert(state == BROWSING); if (*l != '<' && *l != '>') { daemon_log(LOG_ERR, "Avahi sent us an invalid browsing line: %s", l); return -1; } - if (sscanf(l+1, "%i %u %64s %u", &interface, &protocol, a, &port) != 4) { + if (sscanf(l+1, "%i %i %39s %i", &i_interface, &i_protocol, a, &port) != 4) { daemon_log(LOG_ERR, "Failed to parse browsing line: %s", l); return -1; } + interface = (AvahiIfIndex) i_interface; + protocol = (AvahiProtocol) i_protocol; + if (*l == '>') { if (port != 53) daemon_log(LOG_WARNING, "DNS server with port address != 53 found, ignoring"); else { - daemon_log(LOG_INFO, "New DNS Server %s (interface: %i.%u)", a, interface, protocol); - new_server_info(interface, (guchar) protocol, a); - run_script(TRUE, interface, (guchar) protocol, a); + daemon_log(LOG_INFO, "New DNS Server %s (interface: %i.%s)", a, interface, avahi_proto_to_string(protocol)); + new_server_info(interface, protocol, a); + run_script(1, interface, protocol, a); } } else { DNSServerInfo *i; - if (port == 53) - if ((i = get_server_info(interface, (guchar) protocol, a))) { - daemon_log(LOG_INFO, "DNS Server %s removed (interface: %i.%u)", a, interface, protocol); + if (port == 53) + if ((i = get_server_info(interface, protocol, a))) { + daemon_log(LOG_INFO, "DNS Server %s removed (interface: %i.%s)", a, interface, avahi_proto_to_string(protocol)); server_info_free(i); - run_script(FALSE, interface, (guchar) protocol, a); + run_script(0, interface, protocol, a); } } } - + return 0; } -static gint do_connect(void) { - gint fd = -1; - +static int do_connect(void) { + int fd = -1; + if ((fd = open_socket()) < 0) goto fail; @@ -321,27 +354,28 @@ static gint do_connect(void) { fail: if (fd >= 0) close(fd); - + return -1; } static void free_dns_server_info_list(void) { while (servers) { - gint interface = servers->interface; - guchar protocol = servers->protocol; - gchar *address = g_strdup(servers->address); + AvahiIfIndex interface = servers->interface; + AvahiProtocol protocol = servers->protocol; + char *address = avahi_strdup(servers->address); server_info_free(servers); - - run_script(FALSE, interface, protocol, address); - g_free(address); + + run_script(0, interface, protocol, address); + avahi_free(address); } } -static void help(FILE *f, const gchar *argv0) { +static void help(FILE *f, const char *argv0) { fprintf(f, "%s [options]\n" " -h --help Show this help\n" " -D --daemonize Daemonize after startup\n" + " -s --syslog Write log messages to syslog(3) instead of STDERR\n" " -k --kill Kill a running daemon\n" " -r --refresh Request a running daemon to refresh DNS server data\n" " -c --check Return 0 if a daemon is already running\n" @@ -349,27 +383,31 @@ static void help(FILE *f, const gchar *argv0) { argv0); } -static gint parse_command_line(int argc, char *argv[]) { - gint c; - - static const struct option const long_options[] = { +static int parse_command_line(int argc, char *argv[]) { + int c; + + static const struct option long_options[] = { { "help", no_argument, NULL, 'h' }, { "daemonize", no_argument, NULL, 'D' }, + { "syslog", no_argument, NULL, 's' }, { "kill", no_argument, NULL, 'k' }, { "version", no_argument, NULL, 'V' }, { "refresh", no_argument, NULL, 'r' }, { "check", no_argument, NULL, 'c' }, + { NULL, 0, NULL, 0 } }; - opterr = 0; - while ((c = getopt_long(argc, argv, "hDkVrc", long_options, NULL)) >= 0) { + while ((c = getopt_long(argc, argv, "hDkVrcs", long_options, NULL)) >= 0) { switch(c) { case 'h': command = DAEMON_HELP; break; case 'D': - daemonize = TRUE; + daemonize = 1; + break; + case 's': + use_syslog = 1; break; case 'k': command = DAEMON_KILL; @@ -384,7 +422,6 @@ static gint parse_command_line(int argc, char *argv[]) { command = DAEMON_CHECK; break; default: - fprintf(stderr, "Invalid command line argument: %c\n", c); return -1; } } @@ -393,19 +430,24 @@ static gint parse_command_line(int argc, char *argv[]) { fprintf(stderr, "Too many arguments\n"); return -1; } - + return 0; } static int run_daemon(void) { - gint fd = -1, ret = -1; - gchar buf[1024]; + int fd = -1, ret = -1; + char buf[1024]; size_t buflen = 0; AVAHI_LLIST_HEAD_INIT(DNSServerInfo, servers); - + daemon_signal_init(SIGINT, SIGTERM, SIGCHLD, SIGHUP, 0); - + + /* Allocate some memory for our environment variables */ + putenv(avahi_strdup(ENV_INTERFACE"=")); + putenv(avahi_strdup(ENV_DNS_SERVERS"=")); + putenv(avahi_strdup(ENV_INTERFACE_DNS_SERVERS"=")); + if ((fd = do_connect()) < 0) goto finish; @@ -454,22 +496,22 @@ static int run_daemon(void) { case SIGCHLD: waitpid(-1, NULL, WNOHANG); break; - + case SIGHUP: daemon_log(LOG_INFO, "Refreshing DNS Server list"); - + close(fd); free_dns_server_info_list(); - + if ((fd = do_connect()) < 0) goto finish; - + break; } - + } else if (FD_ISSET(fd, &rfds)) { ssize_t r; - gchar *n; + char *n; if ((r = read(fd, buf, sizeof(buf) - buflen - 1)) <= 0) { daemon_log(LOG_ERR, "read(): %s", r < 0 ? strerror(errno) : "EOF"); @@ -477,7 +519,7 @@ static int run_daemon(void) { } buflen += r; - g_assert(buflen <= sizeof(buf)-1); + assert(buflen <= sizeof(buf)-1); while ((n = memchr(buf, '\n', buflen))) { *(n++) = 0; @@ -492,27 +534,27 @@ static int run_daemon(void) { if (buflen >= sizeof(buf)-1) { /* The incoming line is horribly long */ buf[sizeof(buf)-1] = 0; - + if (new_line(buf) < 0) goto finish; - + buflen = 0; } } } - + finish: free_dns_server_info_list(); if (fd >= 0) close(fd); - + daemon_signal_done(); if (ret != 0 && daemonize) daemon_retval_send(1); - + return ret; } @@ -520,10 +562,10 @@ static const char* pid_file_proc(void) { return AVAHI_RUNTIME_DIR"/avahi-dnsconfd.pid"; } -gint main(gint argc, gchar *argv[]) { - gchar *argv0; - gint r = 1; - gboolean wrote_pid_file = FALSE; +int main(int argc, char *argv[]) { + char *argv0; + int r = 1; + int wrote_pid_file = 0; if ((argv0 = strrchr(argv[0], '/'))) argv0++; @@ -532,7 +574,7 @@ gint main(gint argc, gchar *argv[]) { daemon_pid_file_ident = daemon_log_ident = argv0; daemon_pid_file_proc = pid_file_proc; - + if (parse_command_line(argc, argv) < 0) goto finish; @@ -551,7 +593,7 @@ gint main(gint argc, gchar *argv[]) { if (daemonize) { daemon_retval_init(); - + if ((pid = daemon_fork()) < 0) goto finish; else if (pid != 0) { @@ -559,7 +601,7 @@ gint main(gint argc, gchar *argv[]) { /** Parent **/ if ((ret = daemon_retval_wait(20)) < 0) { - daemon_log(LOG_ERR, "Could not recieve return value from daemon process."); + daemon_log(LOG_ERR, "Could not receive return value from daemon process."); goto finish; } @@ -570,6 +612,9 @@ gint main(gint argc, gchar *argv[]) { /* Child */ } + if (use_syslog || daemonize) + daemon_log_use = DAEMON_LOG_SYSLOG; + chdir("/"); if (daemon_pid_file_create() < 0) { @@ -579,7 +624,7 @@ gint main(gint argc, gchar *argv[]) { daemon_retval_send(1); goto finish; } else - wrote_pid_file = TRUE; + wrote_pid_file = 1; if (run_daemon() < 0) goto finish; @@ -587,18 +632,18 @@ gint main(gint argc, gchar *argv[]) { r = 0; } else if (command == DAEMON_HELP) { help(stdout, argv0); - + r = 0; } else if (command == DAEMON_VERSION) { printf("%s "PACKAGE_VERSION"\n", argv0); - + r = 0; } else if (command == DAEMON_KILL) { if (daemon_pid_file_kill_wait(SIGTERM, 5) < 0) { daemon_log(LOG_WARNING, "Failed to kill daemon: %s", strerror(errno)); goto finish; } - + r = 0; } else if (command == DAEMON_REFRESH) { if (daemon_pid_file_kill(SIGHUP) < 0) { @@ -611,12 +656,11 @@ gint main(gint argc, gchar *argv[]) { r = (daemon_pid_file_is_running() >= 0) ? 0 : 1; - finish: if (daemonize) daemon_retval_done(); - + if (wrote_pid_file) daemon_pid_file_remove();