#include <grp.h>
#include <pwd.h>
#include <sys/stat.h>
+#include <sys/ioctl.h>
#include <stdio.h>
#include <fcntl.h>
#include <time.h>
#include <sys/resource.h>
#include <sys/socket.h>
+#ifdef HAVE_INOTIFY
+#ifdef HAVE_SYS_INOTIFY_H
+#include <sys/inotify.h>
+#else
+#include "inotify-nosys.h"
+#endif
+#endif
+
+#ifdef HAVE_KQUEUE
+#include <sys/types.h>
+#include <sys/event.h>
+#include <unistd.h>
+#endif
+
#include <libdaemon/dfork.h>
#include <libdaemon/dsignal.h>
#include <libdaemon/dlog.h>
#include "main.h"
#include "simple-protocol.h"
#include "static-services.h"
+#include "static-hosts.h"
#include "ini-file-parser.h"
#ifdef HAVE_DBUS
} DaemonConfig;
#define RESOLV_CONF "/etc/resolv.conf"
+#define BROWSE_DOMAINS_MAX 16
static AvahiSEntryGroup *dns_servers_entry_group = NULL;
static AvahiSEntryGroup *resolv_conf_entry_group = NULL;
-static char **resolv_conf = NULL;
+static char **resolv_conf_name_servers = NULL;
+static char **resolv_conf_search_domains = NULL;
static DaemonConfig config;
static int load_resolv_conf(void) {
int ret = -1;
FILE *f;
- int i = 0;
+ int i = 0, j = 0;
- avahi_strfreev(resolv_conf);
- resolv_conf = NULL;
+ avahi_strfreev(resolv_conf_name_servers);
+ resolv_conf_name_servers = NULL;
+ avahi_strfreev(resolv_conf_search_domains);
+ resolv_conf_search_domains = NULL;
+
#ifdef ENABLE_CHROOT
f = avahi_chroot_helper_get_file(RESOLV_CONF);
#else
goto finish;
}
- resolv_conf = avahi_new0(char*, AVAHI_WIDE_AREA_SERVERS_MAX+1);
+ resolv_conf_name_servers = avahi_new0(char*, AVAHI_WIDE_AREA_SERVERS_MAX+1);
+ resolv_conf_search_domains = avahi_new0(char*, BROWSE_DOMAINS_MAX+1);
- while (!feof(f) && i < AVAHI_WIDE_AREA_SERVERS_MAX) {
+ while (!feof(f)) {
char ln[128];
char *p;
ln[strcspn(ln, "\r\n#")] = 0;
p = ln + strspn(ln, "\t ");
- if (has_prefix(p, "nameserver")) {
+ if ((has_prefix(p, "nameserver ") || has_prefix(p, "nameserver\t")) && i < AVAHI_WIDE_AREA_SERVERS_MAX) {
p += 10;
p += strspn(p, "\t ");
p[strcspn(p, "\t ")] = 0;
- resolv_conf[i++] = avahi_strdup(p);
+ resolv_conf_name_servers[i++] = avahi_strdup(p);
+ }
+
+ if ((has_prefix(p, "search ") || has_prefix(p, "search\t") ||
+ has_prefix(p, "domain ") || has_prefix(p, "domain\t"))) {
+
+ p += 6;
+
+ while (j < BROWSE_DOMAINS_MAX) {
+ size_t k;
+
+ p += strspn(p, "\t ");
+ k = strcspn(p, "\t ");
+
+ if (k > 0) {
+ resolv_conf_search_domains[j++] = avahi_strndup(p, k);
+ p += k;
+ }
+
+ if (!*p)
+ break;
+ }
}
}
finish:
if (ret != 0) {
- avahi_strfreev(resolv_conf);
- resolv_conf = NULL;
- }
+ avahi_strfreev(resolv_conf_name_servers);
+ resolv_conf_name_servers = NULL;
+ avahi_strfreev(resolv_conf_search_domains);
+ resolv_conf_search_domains = NULL;
+ }
+
if (f)
fclose(f);
unsigned n = 0;
char **p;
- if (!resolv_conf) {
+ if (!resolv_conf_name_servers) {
avahi_server_set_wide_area_servers(avahi_server, NULL, 0);
return;
}
- for (p = resolv_conf; *p && n < AVAHI_WIDE_AREA_SERVERS_MAX; p++) {
+ for (p = resolv_conf_name_servers; *p && n < AVAHI_WIDE_AREA_SERVERS_MAX; p++) {
if (!avahi_address_parse(*p, AVAHI_PROTO_UNSPEC, &a[n]))
avahi_log_warn("Failed to parse address '%s', ignoring.", *p);
else
avahi_server_set_wide_area_servers(avahi_server, a, n);
}
+static AvahiStringList *filter_duplicate_domains(AvahiStringList *l) {
+ AvahiStringList *e, *n, *p;
+
+ if (!l)
+ return l;
+
+ for (p = l, e = l->next; e; e = n) {
+ n = e->next;
+
+ if (avahi_domain_equal((char*) e->text, (char*) l->text)) {
+ p->next = e->next;
+ avahi_free(e);
+ } else
+ p = e;
+ }
+
+ l->next = filter_duplicate_domains(l->next);
+ return l;
+}
+
+static void update_browse_domains(void) {
+ AvahiStringList *l;
+ int n;
+ char **p;
+
+ l = avahi_string_list_copy(config.server_config.browse_domains);
+
+ for (p = resolv_conf_search_domains, n = 0; *p && n < BROWSE_DOMAINS_MAX; p++, n++) {
+ if (!avahi_is_valid_domain_name(*p))
+ avahi_log_warn("'%s' is no valid domain name, ignoring.", *p);
+ else
+ l = avahi_string_list_add(l, *p);
+ }
+
+ l = filter_duplicate_domains(l);
+
+ avahi_server_set_browse_domains(avahi_server, l);
+}
+
static void server_callback(AvahiServer *s, AvahiServerState state, void *userdata) {
DaemonConfig *c = userdata;
case AVAHI_SERVER_RUNNING:
avahi_log_info("Server startup complete. Host name is %s. Local service cookie is %u.", avahi_server_get_host_name_fqdn(s), avahi_server_get_local_service_cookie(s));
- avahi_set_proc_title("%s: running [%s]", argv0, avahi_server_get_host_name_fqdn(s));
+ avahi_set_proc_title(argv0, "%s: running [%s]", argv0, avahi_server_get_host_name_fqdn(s));
static_service_add_to_server();
+ static_hosts_add_to_server();
remove_dns_server_entry_groups();
- if (c->publish_resolv_conf && resolv_conf && resolv_conf[0])
- resolv_conf_entry_group = add_dns_servers(s, resolv_conf_entry_group, resolv_conf);
+ if (c->publish_resolv_conf && resolv_conf_name_servers && resolv_conf_name_servers[0])
+ resolv_conf_entry_group = add_dns_servers(s, resolv_conf_entry_group, resolv_conf_name_servers);
if (c->publish_dns_servers && c->publish_dns_servers[0])
dns_servers_entry_group = add_dns_servers(s, dns_servers_entry_group, c->publish_dns_servers);
case AVAHI_SERVER_COLLISION: {
char *n;
- static_service_remove_from_server();
+ avahi_set_proc_title(argv0, "%s: collision", argv0);
+ static_service_remove_from_server();
+ static_hosts_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);
avahi_free(n);
- avahi_set_proc_title("%s: collision", argv0);
-
break;
}
break;
case AVAHI_SERVER_REGISTERING:
- avahi_set_proc_title("%s: registering [%s]", argv0, avahi_server_get_host_name_fqdn(s));
+ avahi_set_proc_title(argv0, "%s: registering [%s]", argv0, avahi_server_get_host_name_fqdn(s));
+
+ static_service_remove_from_server();
+ static_hosts_remove_from_server();
+ remove_dns_server_entry_groups();
+
+ break;
case AVAHI_SERVER_INVALID:
break;
assert(c);
- opterr = 0;
while ((o = getopt_long(argc, argv, "hDkVf:rcs", long_options, NULL)) >= 0) {
switch(o) {
c->debug = 1;
break;
default:
- fprintf(stderr, "Invalid command line argument: %c\n", o);
return -1;
}
}
static int is_yes(const char *s) {
assert(s);
- return *s == 'y' || *s == 'Y';
+ return *s == 'y' || *s == 'Y' || *s == '1' || *s == 't' || *s == 'T';
}
static int load_config_file(DaemonConfig *c) {
}
avahi_strfreev(e);
+
+ c->server_config.browse_domains = filter_duplicate_domains(c->server_config.browse_domains);
} else if (strcasecmp(p->key, "use-ipv4") == 0)
c->server_config.use_ipv4 = is_yes(p->value);
else if (strcasecmp(p->key, "use-ipv6") == 0)
c->server_config.use_ipv6 = is_yes(p->value);
else if (strcasecmp(p->key, "check-response-ttl") == 0)
c->server_config.check_response_ttl = is_yes(p->value);
+ else if (strcasecmp(p->key, "allow-point-to-point") == 0)
+ c->server_config.allow_point_to_point = is_yes(p->value);
else if (strcasecmp(p->key, "use-iff-running") == 0)
c->server_config.use_iff_running = is_yes(p->value);
else if (strcasecmp(p->key, "disallow-other-stacks") == 0)
c->server_config.add_service_cookie = is_yes(p->value);
else if (strcasecmp(p->key, "publish-dns-servers") == 0) {
avahi_strfreev(c->publish_dns_servers);
- c->publish_dns_servers = avahi_split_csv(p->value);
- } else {
+ c->publish_dns_servers = avahi_split_csv(p->value);
+ } else if (strcasecmp(p->key, "publish-a-on-ipv6") == 0)
+ c->server_config.publish_a_on_ipv6 = is_yes(p->value);
+ else if (strcasecmp(p->key, "publish-aaaa-on-ipv4") == 0)
+ c->server_config.publish_aaaa_on_ipv4 = is_yes(p->value);
+ else {
avahi_log_error("Invalid configuration key \"%s\" in group \"%s\"\n", p->key, g->name);
goto finish;
}
} else if (strcasecmp(p->key, "rlimit-stack") == 0) {
c->rlimit_stack_set = 1;
c->rlimit_stack = atoi(p->value);
-#ifdef RLIMIT_NPROC
} else if (strcasecmp(p->key, "rlimit-nproc") == 0) {
+#ifdef RLIMIT_NPROC
c->rlimit_nproc_set = 1;
c->rlimit_nproc = atoi(p->value);
+#else
+ avahi_log_error("Ignoring configuration key \"%s\" in group \"%s\"\n", p->key, g->name);
#endif
} else {
avahi_log_error("Invalid configuration key \"%s\" in group \"%s\"\n", p->key, g->name);
avahi_log_info("%s", text);
}
+#ifdef HAVE_INOTIFY
+
+static int inotify_fd = -1;
+
+static void add_inotify_watches(void) {
+ int c = 0;
+ /* We ignore the return values, because one or more of these files
+ * might not exist and we're OK with that. In addition we never
+ * want to remove these watches, hence we keep their ids? */
+
+#ifdef ENABLE_CHROOT
+ c = config.use_chroot;
+#endif
+
+ inotify_add_watch(inotify_fd, c ? "/services" : AVAHI_SERVICE_DIR, IN_CLOSE_WRITE|IN_DELETE|IN_DELETE_SELF|IN_MOVED_FROM|IN_MOVED_TO|IN_MOVE_SELF
+#ifdef IN_ONLYDIR
+ |IN_ONLYDIR
+#endif
+ );
+ inotify_add_watch(inotify_fd, c ? "/" : AVAHI_CONFIG_DIR, IN_CLOSE_WRITE|IN_DELETE|IN_DELETE_SELF|IN_MOVED_FROM|IN_MOVED_TO|IN_MOVE_SELF
+#ifdef IN_ONLYDIR
+ |IN_ONLYDIR
+#endif
+ );
+}
+
+#endif
+
+#ifdef HAVE_KQUEUE
+
+#define NUM_WATCHES 2
+
+static int kq = -1;
+static int kfds[NUM_WATCHES];
+static int num_kfds = 0;
+
+static void add_kqueue_watch(const char *dir);
+
+static void add_kqueue_watches(void) {
+ int c = 0;
+
+#ifdef ENABLE_CHROOT
+ c = config.use_chroot;
+#endif
+
+ add_kqueue_watch(c ? "/" : AVAHI_CONFIG_DIR);
+ add_kqueue_watch(c ? "/services" : AVAHI_SERVICE_DIR);
+}
+
+static void add_kqueue_watch(const char *dir) {
+ int fd;
+ struct kevent ev;
+
+ if (kq < 0)
+ return;
+
+ if (num_kfds >= NUM_WATCHES)
+ return;
+
+ fd = open(dir, O_RDONLY);
+ if (fd < 0)
+ return;
+ EV_SET(&ev, fd, EVFILT_VNODE, EV_ADD | EV_ENABLE | EV_CLEAR,
+ NOTE_DELETE | NOTE_EXTEND | NOTE_WRITE | NOTE_RENAME,
+ 0, 0);
+ if (kevent(kq, &ev, 1, NULL, 0, NULL) == -1) {
+ close(fd);
+ return;
+ }
+
+ kfds[num_kfds++] = fd;
+}
+
+#endif
+
+static void reload_config(void) {
+
+#ifdef HAVE_INOTIFY
+ /* Refresh in case the config dirs have been removed */
+ add_inotify_watches();
+#endif
+
+#ifdef HAVE_KQUEUE
+ add_kqueue_watches();
+#endif
+
+#ifdef ENABLE_CHROOT
+ static_service_load(config.use_chroot);
+ static_hosts_load(config.use_chroot);
+#else
+ static_service_load(0);
+ static_hosts_load(0);
+#endif
+ static_service_add_to_server();
+ static_hosts_add_to_server();
+
+ if (resolv_conf_entry_group)
+ avahi_s_entry_group_reset(resolv_conf_entry_group);
+
+ load_resolv_conf();
+
+ update_wide_area_servers();
+ update_browse_domains();
+
+ if (config.publish_resolv_conf && resolv_conf_name_servers && resolv_conf_name_servers[0])
+ resolv_conf_entry_group = add_dns_servers(avahi_server, resolv_conf_entry_group, resolv_conf_name_servers);
+}
+
+#ifdef HAVE_INOTIFY
+
+static void inotify_callback(AvahiWatch *watch, int fd, AVAHI_GCC_UNUSED AvahiWatchEvent event, AVAHI_GCC_UNUSED void *userdata) {
+ char* buffer;
+ int n = 0;
+
+ assert(fd == inotify_fd);
+ assert(watch);
+
+ ioctl(inotify_fd, FIONREAD, &n);
+ if (n <= 0)
+ n = 128;
+
+ buffer = avahi_malloc(n);
+ if (read(inotify_fd, buffer, n) < 0 ) {
+ avahi_free(buffer);
+ avahi_log_error("Failed to read inotify event: %s", avahi_strerror(errno));
+ return;
+ }
+ avahi_free(buffer);
+
+ avahi_log_info("Files changed, reloading.");
+ reload_config();
+}
+
+#endif
+
+#ifdef HAVE_KQUEUE
+
+static void kqueue_callback(AvahiWatch *watch, int fd, AVAHI_GCC_UNUSED AvahiWatchEvent event, AVAHI_GCC_UNUSED void *userdata) {
+ struct kevent ev;
+ struct timespec nullts = { 0, 0 };
+ int res;
+
+ assert(fd == kq);
+ assert(watch);
+
+ res = kevent(kq, NULL, 0, &ev, 1, &nullts);
+
+ if (res > 0) {
+ /* Sleep for a half-second to avoid potential races
+ * during install/uninstall. */
+ usleep(500000);
+ avahi_log_info("Files changed, reloading.");
+ reload_config();
+ } else {
+ avahi_log_error("Failed to read kqueue event: %s", avahi_strerror(errno));
+ }
+}
+
+#endif
+
static void signal_callback(AvahiWatch *watch, AVAHI_GCC_UNUSED int fd, AVAHI_GCC_UNUSED AvahiWatchEvent event, AVAHI_GCC_UNUSED void *userdata) {
int sig;
const AvahiPoll *poll_api;
case SIGQUIT:
case SIGTERM:
avahi_log_info(
- "Got %s, quitting.",
- sig == SIGINT ? "SIGINT" :
- (sig == SIGQUIT ? "SIGQUIT" : "SIGTERM"));
+ "Got %s, quitting.",
+ sig == SIGINT ? "SIGINT" :
+ (sig == SIGQUIT ? "SIGQUIT" : "SIGTERM"));
avahi_simple_poll_quit(simple_poll_api);
break;
case SIGHUP:
avahi_log_info("Got SIGHUP, reloading.");
-#ifdef ENABLE_CHROOT
- static_service_load(config.use_chroot);
-#else
- static_service_load(0);
-#endif
- static_service_add_to_server();
-
- if (resolv_conf_entry_group)
- avahi_s_entry_group_reset(resolv_conf_entry_group);
-
- load_resolv_conf();
-
- update_wide_area_servers();
-
- if (config.publish_resolv_conf && resolv_conf && resolv_conf[0])
- resolv_conf_entry_group = add_dns_servers(avahi_server, resolv_conf_entry_group, resolv_conf);
+ reload_config();
break;
case SIGUSR1:
const AvahiPoll *poll_api = NULL;
AvahiWatch *sig_watch = NULL;
int retval_is_sent = 0;
+#ifdef HAVE_INOTIFY
+ AvahiWatch *inotify_watch = NULL;
+#endif
+#ifdef HAVE_KQUEUE
+ int i;
+ AvahiWatch *kqueue_watch = NULL;
+#endif
assert(c);
#ifdef HAVE_DBUS
if (c->enable_dbus) {
- if (dbus_protocol_setup(poll_api, config.disable_user_service_publishing) < 0) {
+ if (dbus_protocol_setup(poll_api, config.disable_user_service_publishing, !c->fail_on_missing_dbus
+#ifdef ENABLE_CHROOT
+ && !config.use_chroot
+#endif
+ ) < 0) {
+
+ avahi_log_warn("WARNING: Failed to contact D-Bus daemon.");
if (c->fail_on_missing_dbus)
goto finish;
-
- avahi_log_warn("WARNING: Failed to contact D-BUS daemon, disabling D-BUS support.");
- c->enable_dbus = 0;
}
}
#endif
#endif
+#ifdef HAVE_INOTIFY
+ if ((inotify_fd = inotify_init()) < 0)
+ avahi_log_warn( "Failed to initialize inotify: %s", strerror(errno));
+ else {
+ add_inotify_watches();
+
+ if (!(inotify_watch = poll_api->watch_new(poll_api, inotify_fd, AVAHI_WATCH_IN, inotify_callback, NULL))) {
+ avahi_log_error( "Failed to create inotify watcher");
+ goto finish;
+ }
+ }
+#endif
+
+#ifdef HAVE_KQUEUE
+ if ((kq = kqueue()) < 0)
+ avahi_log_warn( "Failed to initialize kqueue: %s", strerror(errno));
+ else {
+ add_kqueue_watches();
+
+ if (!(kqueue_watch = poll_api->watch_new(poll_api, kq, AVAHI_WATCH_IN, kqueue_callback, NULL))) {
+ avahi_log_error( "Failed to create kqueue watcher");
+ goto finish;
+ }
+ }
+#endif
+
load_resolv_conf();
#ifdef ENABLE_CHROOT
static_service_load(config.use_chroot);
+ static_hosts_load(config.use_chroot);
#else
static_service_load(0);
+ static_hosts_load(0);
#endif
if (!(avahi_server = avahi_server_new(poll_api, &c->server_config, server_callback, c, &error))) {
}
update_wide_area_servers();
+ update_browse_domains();
if (c->daemonize) {
daemon_retval_send(0);
- retval_is_sent = 1;
+ retval_is_sent = 1;
}
for (;;) {
static_service_remove_from_server();
static_service_free_all();
+
+ static_hosts_remove_from_server();
+ static_hosts_free_all();
+
remove_dns_server_entry_groups();
simple_protocol_shutdown();
if (sig_watch)
poll_api->watch_free(sig_watch);
+#ifdef HAVE_INOTIFY
+ if (inotify_watch)
+ poll_api->watch_free(inotify_watch);
+ if (inotify_fd >= 0)
+ close(inotify_fd);
+#endif
+
+#ifdef HAVE_KQUEUE
+ if (kqueue_watch)
+ poll_api->watch_free(kqueue_watch);
+ if (kq >= 0)
+ close(kq);
+ for (i = 0; i < num_kfds; i++) {
+ if (kfds[i] >= 0)
+ close(kfds[i]);
+ }
+#endif
+
if (simple_poll_api) {
avahi_simple_poll_free(simple_poll_api);
simple_poll_api = NULL;
}
/* If the initialization failed by some reason, we add the time to the seed*/
- seed |= (unsigned) time(NULL);
+ seed ^= (unsigned) time(NULL);
srand(seed);
}
if (config.use_syslog || config.daemonize)
daemon_log_use = DAEMON_LOG_SYSLOG;
+ if (daemon_close_all(-1) < 0) {
+ avahi_log_error("Failed to close remaining file descriptors: %s", strerror(errno));
+ goto finish;
+ }
+
if (make_runtime_dir() < 0)
goto finish;
#endif
avahi_log_info("%s "PACKAGE_VERSION" starting up.", argv0);
- avahi_set_proc_title("%s: starting up", argv0);
+ avahi_set_proc_title(argv0, "%s: starting up", argv0);
if (run_server(&config) == 0)
r = 0;
avahi_server_config_free(&config.server_config);
avahi_free(config.config_file);
avahi_strfreev(config.publish_dns_servers);
- avahi_strfreev(resolv_conf);
+ avahi_strfreev(resolv_conf_name_servers);
+ avahi_strfreev(resolv_conf_search_domains);
if (wrote_pid_file) {
#ifdef ENABLE_CHROOT
projects / catta / blobdiff