X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-daemon%2Fmain.c;h=9f5547382daa5dcf010964939575735edc18f28d;hb=8c4483baa593205c3eaecebe0738d1455025777c;hp=7ebfcd776f195a3121245d5a0d7ef46dbe82d8e6;hpb=aedd4e87362371d83dd64d0bfb03ea3e5526607f;p=catta diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c index 7ebfcd7..9f55473 100644 --- a/avahi-daemon/main.c +++ b/avahi-daemon/main.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -41,6 +42,14 @@ #include #include +#ifdef HAVE_INOTIFY +#ifdef HAVE_SYS_INOTIFY_H +#include +#else +#include "inotify-nosys.h" +#endif +#endif + #include #include #include @@ -50,6 +59,7 @@ #include #include #include +#include #include #include @@ -61,9 +71,11 @@ #include "caps.h" #endif +#include "setproctitle.h" #include "main.h" #include "simple-protocol.h" #include "static-services.h" +#include "static-hosts.h" #include "ini-file-parser.h" #ifdef HAVE_DBUS @@ -72,6 +84,8 @@ AvahiServer *avahi_server = NULL; AvahiSimplePoll *simple_poll_api = NULL; +static char *argv0 = NULL; +int nss_support = 0; typedef enum { DAEMON_RUN, @@ -97,7 +111,9 @@ typedef struct { #ifdef ENABLE_CHROOT int use_chroot; #endif - + int modify_proc_title; + + int disable_user_service_publishing; int publish_resolv_conf; char ** publish_dns_servers; int debug; @@ -259,7 +275,11 @@ static void server_callback(AvahiServer *s, AvahiServerState state, void *userda switch (state) { 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(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(); @@ -275,14 +295,17 @@ static void server_callback(AvahiServer *s, AvahiServerState state, void *userda 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); + break; } @@ -293,13 +316,22 @@ static void server_callback(AvahiServer *s, AvahiServerState state, void *userda break; case AVAHI_SERVER_REGISTERING: + + 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; } } -static void help(FILE *f, const char *argv0) { +static void help(FILE *f) { fprintf(f, "%s [options]\n" " -h --help Show this help\n" @@ -316,6 +348,7 @@ static void help(FILE *f, const char *argv0) { #ifdef ENABLE_CHROOT " --no-chroot Don't chroot()\n" #endif + " --no-proc-title Don't modify process title\n" " --debug Increase verbosity\n", argv0); } @@ -329,31 +362,32 @@ static int parse_command_line(DaemonConfig *c, int argc, char *argv[]) { OPTION_NO_DROP_ROOT, #ifdef ENABLE_CHROOT OPTION_NO_CHROOT, -#endif +#endif + OPTION_NO_PROC_TITLE, OPTION_DEBUG }; static const struct option long_options[] = { - { "help", no_argument, NULL, 'h' }, - { "daemonize", no_argument, NULL, 'D' }, - { "kill", no_argument, NULL, 'k' }, - { "version", no_argument, NULL, 'V' }, - { "file", required_argument, NULL, 'f' }, - { "reload", no_argument, NULL, 'r' }, - { "check", no_argument, NULL, 'c' }, - { "syslog", no_argument, NULL, 's' }, - { "no-rlimits", no_argument, NULL, OPTION_NO_RLIMITS }, - { "no-drop-root", no_argument, NULL, OPTION_NO_DROP_ROOT }, + { "help", no_argument, NULL, 'h' }, + { "daemonize", no_argument, NULL, 'D' }, + { "kill", no_argument, NULL, 'k' }, + { "version", no_argument, NULL, 'V' }, + { "file", required_argument, NULL, 'f' }, + { "reload", no_argument, NULL, 'r' }, + { "check", no_argument, NULL, 'c' }, + { "syslog", no_argument, NULL, 's' }, + { "no-rlimits", no_argument, NULL, OPTION_NO_RLIMITS }, + { "no-drop-root", no_argument, NULL, OPTION_NO_DROP_ROOT }, #ifdef ENABLE_CHROOT - { "no-chroot", no_argument, NULL, OPTION_NO_CHROOT }, -#endif - { "debug", no_argument, NULL, OPTION_DEBUG }, + { "no-chroot", no_argument, NULL, OPTION_NO_CHROOT }, +#endif + { "no-proc-title", no_argument, NULL, OPTION_NO_PROC_TITLE }, + { "debug", no_argument, NULL, OPTION_DEBUG }, { NULL, 0, NULL, 0 } }; assert(c); - opterr = 0; while ((o = getopt_long(argc, argv, "hDkVf:rcs", long_options, NULL)) >= 0) { switch(o) { @@ -392,12 +426,14 @@ static int parse_command_line(DaemonConfig *c, int argc, char *argv[]) { case OPTION_NO_CHROOT: c->use_chroot = 0; break; -#endif +#endif + case OPTION_NO_PROC_TITLE: + c->modify_proc_title = 0; + break; case OPTION_DEBUG: c->debug = 1; break; default: - fprintf(stderr, "Invalid command line argument: %c\n", o); return -1; } } @@ -413,7 +449,7 @@ static int parse_command_line(DaemonConfig *c, int argc, char *argv[]) { 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) { @@ -439,16 +475,37 @@ static int load_config_file(DaemonConfig *c) { } else if (strcasecmp(p->key, "domain-name") == 0) { avahi_free(c->server_config.domain_name); c->server_config.domain_name = avahi_strdup(p->value); + } else if (strcasecmp(p->key, "browse-domains") == 0) { + char **e, **t; + + e = avahi_split_csv(p->value); + + for (t = e; *t; t++) { + char cleaned[AVAHI_DOMAIN_NAME_MAX]; + + if (!avahi_normalize_name(*t, cleaned, sizeof(cleaned))) { + avahi_log_error("Invalid domain name \"%s\" for key \"%s\" in group \"%s\"\n", *t, p->key, g->name); + avahi_strfreev(e); + goto finish; + } + + c->server_config.browse_domains = avahi_string_list_add(c->server_config.browse_domains, cleaned); + } + + avahi_strfreev(e); } 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.disallow_other_stacks = is_yes(p->value); +#ifdef HAVE_DBUS else if (strcasecmp(p->key, "enable-dbus") == 0) { if (*(p->value) == 'w' || *(p->value) == 'W') { @@ -460,10 +517,8 @@ static int load_config_file(DaemonConfig *c) { } else { c->enable_dbus = 0; } - } else if (strcasecmp(p->key, "drop-root") == 0) - c->drop_root = is_yes(p->value); - else if (strcasecmp(p->key, "add-service-cookie") == 0) - c->server_config.add_service_cookie = is_yes(p->value); + } +#endif else { avahi_log_error("Invalid configuration key \"%s\" in group \"%s\"\n", p->key, g->name); goto finish; @@ -485,10 +540,20 @@ static int load_config_file(DaemonConfig *c) { c->server_config.publish_domain = is_yes(p->value); else if (strcasecmp(p->key, "publish-resolv-conf-dns-servers") == 0) c->publish_resolv_conf = is_yes(p->value); + else if (strcasecmp(p->key, "disable-publishing") == 0) + c->server_config.disable_publishing = is_yes(p->value); + else if (strcasecmp(p->key, "disable-user-service-publishing") == 0) + c->disable_user_service_publishing = is_yes(p->value); + else if (strcasecmp(p->key, "add-service-cookie") == 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 { + } 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; } @@ -545,10 +610,12 @@ static int load_config_file(DaemonConfig *c) { } 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); @@ -596,6 +663,89 @@ static void dump(const char *text, AVAHI_GCC_UNUSED void* userdata) { 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 + +static void reload_config(void) { + +#ifdef HAVE_INOTIFY + /* Refresh in case the config dirs have been removed */ + add_inotify_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(); + + 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); +} + +#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 + 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; @@ -624,23 +774,8 @@ static void signal_callback(AvahiWatch *watch, AVAHI_GCC_UNUSED int fd, AVAHI_GC 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: @@ -654,15 +789,24 @@ static void signal_callback(AvahiWatch *watch, AVAHI_GCC_UNUSED int fd, AVAHI_GC } } +/* Imported from ../avahi-client/nss-check.c */ +int avahi_nss_support(void); static int run_server(DaemonConfig *c) { int r = -1; int error; const AvahiPoll *poll_api = NULL; AvahiWatch *sig_watch = NULL; + int retval_is_sent = 0; +#ifdef HAVE_INOTIFY + AvahiWatch *inotify_watch = NULL; +#endif assert(c); + if (!(nss_support = avahi_nss_support())) + avahi_log_warn("WARNING: No NSS support for mDNS detected, consider installing nss-mdns!"); + if (!(simple_poll_api = avahi_simple_poll_new())) { avahi_log_error("Failed to create main loop object."); goto finish; @@ -685,13 +829,16 @@ static int run_server(DaemonConfig *c) { #ifdef HAVE_DBUS if (c->enable_dbus) { - if (dbus_protocol_setup(poll_api) < 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 @@ -704,23 +851,38 @@ static int run_server(DaemonConfig *c) { goto finish; } + avahi_log_info("Successfully called chroot()."); chdir("/"); if (avahi_caps_drop_all() < 0) { avahi_log_error("Failed to drop capabilities."); goto finish; } - - avahi_log_info("chroot() successful."); + avahi_log_info("Successfully dropped remaining capabilities."); } #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 + 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))) { @@ -730,8 +892,10 @@ static int run_server(DaemonConfig *c) { update_wide_area_servers(); - if (c->daemonize) + if (c->daemonize) { daemon_retval_send(0); + retval_is_sent = 1; + } for (;;) { if ((r = avahi_simple_poll_iterate(simple_poll_api, -1)) < 0) { @@ -752,11 +916,15 @@ finish: 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(); -#ifdef ENABLE_DBUS +#ifdef HAVE_DBUS if (c->enable_dbus) dbus_protocol_shutdown(); #endif @@ -771,12 +939,19 @@ finish: 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 + if (simple_poll_api) { avahi_simple_poll_free(simple_poll_api); simple_poll_api = NULL; } - if (r != 0 && c->daemonize) + if (!retval_is_sent && c->daemonize) daemon_retval_send(1); return r; @@ -925,7 +1100,8 @@ static void enforce_rlimits(void) { set_one_rlimit(RLIMIT_NPROC, config.rlimit_nproc, "RLIMIT_NPROC"); #endif -#ifdef RLIMIT_MEMLOCK + /* the sysctl() call from iface-pfroute.c needs locked memory on FreeBSD */ +#if defined(RLIMIT_MEMLOCK) && !defined(__FreeBSD__) /* We don't need locked memory */ set_one_rlimit(RLIMIT_MEMLOCK, 0, "RLIMIT_MEMLOCK"); #endif @@ -946,14 +1122,13 @@ static void init_rand_seed(void) { } /* If the initialization failed by some reason, we add the time to the seed*/ - seed |= (unsigned) time(NULL); + seed ^= (unsigned) time(NULL); srand(seed); } int main(int argc, char *argv[]) { int r = 255; - const char *argv0; int wrote_pid_file = 0; avahi_set_log_function(log_function); @@ -974,12 +1149,13 @@ int main(int argc, char *argv[]) { #ifdef ENABLE_CHROOT config.use_chroot = 1; #endif - + config.modify_proc_title = 1; + + config.disable_user_service_publishing = 0; config.publish_dns_servers = NULL; config.publish_resolv_conf = 0; config.use_syslog = 0; config.debug = 0; - config.rlimit_as_set = 0; config.rlimit_core_set = 0; config.rlimit_data_set = 0; @@ -991,9 +1167,9 @@ int main(int argc, char *argv[]) { #endif if ((argv0 = strrchr(argv[0], '/'))) - argv0++; + argv0 = avahi_strdup(argv0 + 1); else - argv0 = argv[0]; + argv0 = avahi_strdup(argv[0]); daemon_pid_file_ident = (const char *) argv0; daemon_log_ident = (char*) argv0; @@ -1002,12 +1178,15 @@ int main(int argc, char *argv[]) { if (parse_command_line(&config, argc, argv) < 0) goto finish; + if (config.modify_proc_title) + avahi_init_proc_title(argc, argv); + #ifdef ENABLE_CHROOT config.use_chroot = config.use_chroot && config.drop_root; #endif if (config.command == DAEMON_HELP) { - help(stdout, argv0); + help(stdout); r = 0; } else if (config.command == DAEMON_VERSION) { printf("%s "PACKAGE_VERSION"\n", argv0); @@ -1106,13 +1285,15 @@ int main(int argc, char *argv[]) { #ifdef ENABLE_CHROOT if (config.drop_root && config.use_chroot) - if (avahi_chroot_helper_start() < 0) { + if (avahi_chroot_helper_start(argv0) < 0) { avahi_log_error("failed to start chroot() helper daemon."); goto finish; } #endif avahi_log_info("%s "PACKAGE_VERSION" starting up.", argv0); + avahi_set_proc_title(argv0, "%s: starting up", argv0); + if (run_server(&config) == 0) r = 0; } @@ -1135,9 +1316,11 @@ finish: #endif } -#if ENABLE_CHROOT +#ifdef ENABLE_CHROOT avahi_chroot_helper_shutdown(); #endif + avahi_free(argv0); + return r; }