#include <avahi-common/simple-watch.h>
#include <avahi-common/error.h>
#include <avahi-common/alternative.h>
+#include <avahi-common/domain.h>
#include <avahi-core/core.h>
#include <avahi-core/publish.h>
#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
AvahiServer *avahi_server = NULL;
AvahiSimplePoll *simple_poll_api = NULL;
+static char *argv0 = NULL;
+int nss_support = 0;
typedef enum {
DAEMON_RUN,
#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;
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("%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();
char *n;
static_service_remove_from_server();
+ static_hosts_remove_from_server();
remove_dns_server_entry_groups();
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));
+
+
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"
#ifdef ENABLE_CHROOT
" --no-chroot Don't chroot()\n"
#endif
+ " --no-proc-title Don't modify process title\n"
" --debug Increase verbosity\n",
argv0);
}
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 }
};
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;
} 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_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') {
} 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;
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);
+ c->publish_dns_servers = avahi_split_csv(p->value);
} else {
avahi_log_error("Invalid configuration key \"%s\" in group \"%s\"\n", p->key, g->name);
goto finish;
avahi_log_info("Got SIGHUP, reloading.");
#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_service_remove_from_server();
if (resolv_conf_entry_group)
avahi_s_entry_group_reset(resolv_conf_entry_group);
}
}
+/* 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;
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;
#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) < 0) {
if (c->fail_on_missing_dbus)
goto finish;
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
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();
- 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) {
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
simple_poll_api = NULL;
}
- if (r != 0 && c->daemonize)
+ if (!retval_is_sent && c->daemonize)
daemon_retval_send(1);
return r;
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
int main(int argc, char *argv[]) {
int r = 255;
- const char *argv0;
int wrote_pid_file = 0;
avahi_set_log_function(log_function);
#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;
#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;
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);
#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("%s: starting up", argv0);
+
if (run_server(&config) == 0)
r = 0;
}
#endif
}
-#if ENABLE_CHROOT
+#ifdef ENABLE_CHROOT
avahi_chroot_helper_shutdown();
#endif
+ avahi_free(argv0);
+
return r;
}
projects / catta / blobdiff