X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-daemon%2Fmain.c;h=8c28fd6ec8d786122d1f83cec0e4bb1a507412b5;hb=7a5b2f69af7d36d6cd4153142f125fa011784e03;hp=8bd856eee68a84a8bb5175e2fd7354eb39e357bb;hpb=d7b03753f10d93d278091d39b95adf3b18a2770c;p=catta diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c index 8bd856e..8c28fd6 100644 --- a/avahi-daemon/main.c +++ b/avahi-daemon/main.c @@ -65,6 +65,7 @@ #include #include #include +#include #ifdef ENABLE_CHROOT #include "chroot.h" @@ -354,7 +355,7 @@ 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)); - + sd_notifyf(0, "STATUS=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(); @@ -374,14 +375,16 @@ static void server_callback(AvahiServer *s, AvahiServerState state, void *userda case AVAHI_SERVER_COLLISION: { char *n; - 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_log_warn("Host name conflict, retrying with %s", n); + sd_notifyf(0, "STATUS=Host name conflict, retrying with %s", n); + avahi_set_proc_title(argv0, "%s: collision [%s]", argv0, n); + avahi_server_set_host_name(s, n); avahi_free(n); @@ -391,11 +394,14 @@ static void server_callback(AvahiServer *s, AvahiServerState state, void *userda case AVAHI_SERVER_FAILURE: avahi_log_error("Server error: %s", avahi_strerror(avahi_server_errno(s))); + sd_notifyf(0, "STATUS=Server error: %s", avahi_strerror(avahi_server_errno(s))); + avahi_simple_poll_quit(simple_poll_api); break; case AVAHI_SERVER_REGISTERING: + sd_notifyf(0, "STATUS=Registering host name %s", 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(); @@ -571,6 +577,29 @@ static int parse_usec(const char *s, AvahiUsec *u) { return 0; } +static char *get_machine_id(void) { + int fd; + char buf[32]; + + fd = open("/etc/machine-id", O_RDONLY|O_CLOEXEC|O_NOCTTY); + if (fd == -1 && errno == ENOENT) + fd = open("/var/lib/dbus/machine-id", O_RDONLY|O_CLOEXEC|O_NOCTTY); + if (fd == -1) + return NULL; + + /* File is on a filesystem so we never get EINTR or partial reads */ + if (read(fd, buf, sizeof buf) != sizeof buf) { + close(fd); + return NULL; + } + close(fd); + + /* Contents can be lower, upper and even mixed case so normalize */ + avahi_strdown(buf); + + return avahi_strndup(buf, sizeof buf); +} + static int load_config_file(DaemonConfig *c) { int r = -1; AvahiIniFile *f; @@ -626,6 +655,15 @@ static int load_config_file(DaemonConfig *c) { 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); + else if (strcasecmp(p->key, "host-name-from-machine-id") == 0) { + if (*(p->value) == 'y' || *(p->value) == 'Y') { + char *machine_id = get_machine_id(); + if (machine_id != NULL) { + avahi_free(c->server_config.host_name); + c->server_config.host_name = machine_id; + } + } + } #ifdef HAVE_DBUS else if (strcasecmp(p->key, "enable-dbus") == 0) { @@ -1041,12 +1079,10 @@ static void signal_callback(AvahiWatch *watch, AVAHI_GCC_UNUSED int fd, AVAHI_GC switch (sig) { case SIGINT: - case SIGQUIT: case SIGTERM: avahi_log_info( "Got %s, quitting.", - sig == SIGINT ? "SIGINT" : - (sig == SIGQUIT ? "SIGQUIT" : "SIGTERM")); + sig == SIGINT ? "SIGINT" : "SIGTERM"); avahi_simple_poll_quit(simple_poll_api); break; @@ -1070,6 +1106,16 @@ 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 void ignore_signal(int sig) { + struct sigaction sa; + + memset(&sa, 0, sizeof(sa)); + sa.sa_handler = SIG_IGN; + sa.sa_flags = SA_RESTART; + + sigaction(sig, &sa, NULL); +} + static int run_server(DaemonConfig *c) { int r = -1; int error; @@ -1086,6 +1132,8 @@ static int run_server(DaemonConfig *c) { assert(c); + ignore_signal(SIGPIPE); + if (!(nss_support = avahi_nss_support())) avahi_log_warn("WARNING: No NSS support for mDNS detected, consider installing nss-mdns!"); @@ -1096,7 +1144,7 @@ static int run_server(DaemonConfig *c) { poll_api = avahi_simple_poll_get(simple_poll_api); - if (daemon_signal_init(SIGINT, SIGQUIT, SIGHUP, SIGTERM, SIGUSR1, 0) < 0) { + if (daemon_signal_init(SIGINT, SIGHUP, SIGTERM, SIGUSR1, 0) < 0) { avahi_log_error("Could not register signal handlers (%s).", strerror(errno)); goto finish; } @@ -1212,6 +1260,7 @@ static int run_server(DaemonConfig *c) { break; } + r = 0; finish: @@ -1568,6 +1617,9 @@ int main(int argc, char *argv[]) { if (daemon_close_all(-1) < 0) avahi_log_warn("Failed to close all remaining file descriptors: %s", strerror(errno)); + daemon_reset_sigs(-1); + daemon_unblock_sigs(-1); + if (make_runtime_dir() < 0) goto finish; @@ -1610,11 +1662,14 @@ int main(int argc, char *argv[]) { } #endif avahi_log_info("%s "PACKAGE_VERSION" starting up.", argv0); - + sd_notifyf(0, "STATUS=%s "PACKAGE_VERSION" starting up.", argv0); avahi_set_proc_title(argv0, "%s: starting up", argv0); if (run_server(&config) == 0) r = 0; + + avahi_log_info("%s "PACKAGE_VERSION" exiting.", argv0); + sd_notifyf(0, "STATUS=%s "PACKAGE_VERSION" exiting.", argv0); } finish: