X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-daemon%2Fmain.c;h=7fce3a546d8b0b7086d93e9341e01a664cbf0919;hb=78fb052e89e9063ab985c1ad3c3ce10e47d1621d;hp=7b3f209aae57d1a91f0617f50a6d29270cf55f55;hpb=f334deaf9d630782be3f7f535265ff7488162f85;p=catta

diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c
index 7b3f209..7fce3a5 100644
--- a/avahi-daemon/main.c
+++ b/avahi-daemon/main.c
@@ -23,189 +23,572 @@
 #include <config.h>
 #endif
 
-#include <avahi-core/core.h>
+#include <getopt.h>
+#include <string.h>
+#include <signal.h>
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+#include <grp.h>
+#include <pwd.h>
+
+#include <libdaemon/dfork.h>
+#include <libdaemon/dsignal.h>
+#include <libdaemon/dlog.h>
+#include <libdaemon/dpid.h>
 
-#define DBUS_API_SUBJECT_TO_CHANGE
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib-lowlevel.h>
+#include <avahi-core/core.h>
+#include <avahi-core/log.h>
 
 #include "main.h"
 #include "simple-protocol.h"
-
-#define DBUS_SERVICE_AVAHI "org.freedesktop.Avahi"
+#include "dbus-protocol.h"
+#include "static-services.h"
 
 AvahiServer *avahi_server = NULL;
 
-static DBusHandlerResult
-do_register (DBusConnection *conn, DBusMessage *message)
-{
-    DBusError error;
-    char *s;
+typedef enum {
+    DAEMON_RUN,
+    DAEMON_KILL,
+    DAEMON_VERSION,
+    DAEMON_HELP,
+    DAEMON_RELOAD
+} DaemonCommand;
+
+typedef struct {
+    AvahiServerConfig server_config;
+    DaemonCommand command;
+    gboolean daemonize;
+    gchar *config_file;
+    gboolean enable_dbus;
+    gboolean drop_root;
+} DaemonConfig;
+
+static void server_callback(AvahiServer *s, AvahiServerState state, gpointer userdata) {
+    g_assert(s);
 
-    dbus_error_init (&error);
+    if (state == AVAHI_SERVER_RUNNING) {
+        avahi_log_info("Server startup complete.  Host name is <%s>", avahi_server_get_host_name_fqdn(s));
+        static_service_add_to_server();
+    } else if (state == AVAHI_SERVER_COLLISION) {
+        gchar *n;
 
-    dbus_message_get_args (message, &error,
-                           DBUS_TYPE_STRING, &s,
-                           DBUS_TYPE_INVALID);
+        static_service_remove_from_server();
+        
+        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);
+        g_free(n);
+    }
+}
 
-    if (dbus_error_is_set (&error))
-    {
-        g_warning ("Error parsing register attempt");
-        dbus_error_free (&error);
+static void help(FILE *f, const gchar *argv0) {
+    fprintf(f,
+            "%s [options]\n"
+            "    -h --help        Show this help\n"
+            "    -D --daemonize   Daemonize after startup\n"
+            "    -k --kill        Kill a running daemon\n"
+            "    -r --reload      Request a running daemon to reload static services\n"
+            "    -V --version     Show version\n"
+            "    -f --file=FILE   Load the specified configuration file instead of\n"
+            "                     "AVAHI_CONFIG_FILE"\n",
+            argv0);
+}
 
-        return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+static gint parse_command_line(DaemonConfig *config, int argc, char *argv[]) {
+    gint c;
+    
+    static const struct option const 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' },
+    };
+
+    g_assert(config);
+
+    opterr = 0;
+    while ((c = getopt_long(argc, argv, "hDkVf:r", long_options, NULL)) >= 0) {
+
+        switch(c) {
+            case 'h':
+                config->command = DAEMON_HELP;
+                break;
+            case 'D':
+                config->daemonize = TRUE;
+                break;
+            case 'k':
+                config->command = DAEMON_KILL;
+                break;
+            case 'V':
+                config->command = DAEMON_VERSION;
+                break;
+            case 'f':
+                g_free(config->config_file);
+                config->config_file = g_strdup(optarg);
+                break;
+            case 'r':
+                config->command = DAEMON_RELOAD;
+                break;
+            default:
+                fprintf(stderr, "Invalid command line argument: %c\n", c);
+                return -1;
+        }
     }
 
-    g_message ("Register received from: %s", s);
+    if (optind < argc) {
+        fprintf(stderr, "Too many arguments\n");
+        return -1;
+    }
+        
+    return 0;
+}
 
-    return DBUS_HANDLER_RESULT_HANDLED;
+static gboolean is_yes(const gchar *s) {
+    g_assert(s);
+    
+    return *s == 'y' || *s == 'Y';
 }
 
-static DBusHandlerResult
-signal_filter (DBusConnection *conn, DBusMessage *message, void *user_data)
-{
-    GMainLoop *loop = user_data;
-    DBusError error;
-
-    dbus_error_init (&error);
-
-    g_message ("dbus: interface=%s, path=%s, member=%s",
-               dbus_message_get_interface (message),
-               dbus_message_get_path (message),
-               dbus_message_get_member (message));
-
-    if (dbus_message_is_signal (message,
-                                DBUS_INTERFACE_ORG_FREEDESKTOP_LOCAL,
-                                "Disconnected"))
-    {
-        /* No, we shouldn't quit, but until we get somewhere
-         * usefull such that we can restore our state, we will */
-        g_warning ("Disconnnected from d-bus");
-
-        g_main_loop_quit (loop);
-        return DBUS_HANDLER_RESULT_HANDLED;
-    } else if (dbus_message_is_method_call (message, DBUS_SERVICE_AVAHI,
-                                            "Register"))
-    {
-        return do_register (conn, message);
-    } else if (dbus_message_is_signal (message,
-                                       DBUS_INTERFACE_ORG_FREEDESKTOP_DBUS,
-                                       "ServiceAcquired"))
-    {
-        char *name;
-
-        dbus_message_get_args (message, &error,
-                               DBUS_TYPE_STRING, &name,
-                               DBUS_TYPE_INVALID);
-
-        if (dbus_error_is_set (&error))
-        {
-            g_warning ("Error parsing NameAcquired message");
-            dbus_error_free (&error);
-
-            return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-        }
+static gint load_config_file(DaemonConfig *config) {
+    int r = -1;
+    GKeyFile *f = NULL;
+    GError *err = NULL;
+    gchar **groups = NULL, **g, **keys = NULL, *v = NULL;
 
-        g_message ("dbus: ServiceAcquired (%s)", name);
+    g_assert(config);
+    
+    f = g_key_file_new();
+    
+    if (!g_key_file_load_from_file(f, config->config_file ? config->config_file : AVAHI_CONFIG_FILE, G_KEY_FILE_NONE, &err)) {
+        fprintf(stderr, "Unable to read config file: %s\n", err->message);
+        goto finish;
+    }
 
-        return DBUS_HANDLER_RESULT_HANDLED;
+    groups = g_key_file_get_groups(f, NULL);
+
+    for (g = groups; *g; g++) {
+        if (g_strcasecmp(*g, "server") == 0) {
+            gchar **k;
+            
+            keys = g_key_file_get_keys(f, *g, NULL, NULL);
+
+            for (k = keys; *k; k++) {
+
+                v = g_key_file_get_value(f, *g, *k, NULL);
+                
+                if (g_strcasecmp(*k, "host-name") == 0) {
+                    g_free(config->server_config.host_name);
+                    config->server_config.host_name = v;
+                    v = NULL;
+                } else if (g_strcasecmp(*k, "domain-name") == 0) {
+                    g_free(config->server_config.domain_name);
+                    config->server_config.domain_name = v;
+                    v = NULL;
+                } else if (g_strcasecmp(*k, "use-ipv4") == 0)
+                    config->server_config.use_ipv4 = is_yes(v);
+                else if (g_strcasecmp(*k, "use-ipv6") == 0)
+                    config->server_config.use_ipv6 = is_yes(v);
+                else if (g_strcasecmp(*k, "check-response-ttl") == 0)
+                    config->server_config.check_response_ttl = is_yes(v);
+                else if (g_strcasecmp(*k, "use-iff-running") == 0)
+                    config->server_config.use_iff_running = is_yes(v);
+                else if (g_strcasecmp(*k, "enable-dbus") == 0)
+                    config->enable_dbus = is_yes(v);
+                else if (g_strcasecmp(*k, "drop-root") == 0)
+                    config->drop_root = is_yes(v);
+                else {
+                    fprintf(stderr, "Invalid configuration key \"%s\" in group \"%s\"\n", *k, *g);
+                    goto finish;
+                }
+
+                g_free(v);
+                v = NULL;
+            }
+        
+            g_strfreev(keys);
+            keys = NULL;
+            
+        } else if (g_strcasecmp(*g, "publish") == 0) {
+            gchar **k;
+            
+            keys = g_key_file_get_keys(f, *g, NULL, NULL);
+
+            for (k = keys; *k; k++) {
+
+                v = g_key_file_get_string(f, *g, *k, NULL);
+                
+                if (g_strcasecmp(*k, "publish-addresses") == 0)
+                    config->server_config.publish_addresses = is_yes(v);
+                else if (g_strcasecmp(*k, "publish-hinfo") == 0)
+                    config->server_config.publish_hinfo = is_yes(v);
+                else if (g_strcasecmp(*k, "publish-workstation") == 0)
+                    config->server_config.publish_workstation = is_yes(v);
+                else if (g_strcasecmp(*k, "publish-domain") == 0)
+                    config->server_config.publish_domain = is_yes(v);
+                else {
+                    fprintf(stderr, "Invalid configuration key \"%s\" in group \"%s\"\n", *k, *g);
+                    goto finish;
+                }
+
+                g_free(v);
+                v = NULL;
+            }
+
+            g_strfreev(keys);
+            keys = NULL;
+
+        } else if (g_strcasecmp(*g, "reflector") == 0) {
+            gchar **k;
+            
+            keys = g_key_file_get_keys(f, *g, NULL, NULL);
+
+            for (k = keys; *k; k++) {
+
+                v = g_key_file_get_string(f, *g, *k, NULL);
+                
+                if (g_strcasecmp(*k, "enable-reflector") == 0)
+                    config->server_config.enable_reflector = is_yes(v);
+                else if (g_strcasecmp(*k, "reflect-ipv") == 0)
+                    config->server_config.reflect_ipv = is_yes(v);
+                else {
+                    fprintf(stderr, "Invalid configuration key \"%s\" in group \"%s\"\n", *k, *g);
+                    goto finish;
+                }
+
+                g_free(v);
+                v = NULL;
+            }
+    
+            g_strfreev(keys);
+            keys = NULL;
+            
+        } else {
+            fprintf(stderr, "Invalid configuration file group \"%s\".\n", *g);
+            goto finish;
+        }
     }
 
-    g_message ("dbus: missed event");
+    r = 0;
 
-    return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-}
+finish:
 
-static void server_callback(AvahiServer *s, AvahiServerState state, gpointer userdata) {
-    g_assert(s);
+    g_strfreev(groups);
+    g_strfreev(keys);
+    g_free(v);
 
-    if (state == AVAHI_SERVER_RUNNING)
-        g_message("Server startup complete.  Host name is <%s>", avahi_server_get_host_name_fqdn(s));
-    else if (state == AVAHI_SERVER_COLLISION) {
-        gchar *n;
-        n = avahi_alternative_host_name(avahi_server_get_host_name(s));
-        g_message("Host name conflict, retrying with <%s>", n);
-        avahi_server_set_host_name(s, n);
-        g_free(n);
-    }
-}
+    if (err)
+        g_error_free (err);
 
-int main(int argc, char *argv[]) {
-    GMainLoop *loop = NULL;
-    DBusConnection *bus = NULL;
-    DBusError error;
-    gint r = 255;
-    AvahiServer *server = NULL;
-    AvahiServerConfig config;
+    if (f)
+        g_key_file_free(f);
+    
+    return r;
+}
 
-    avahi_server_config_init(&config);
+static void log_function(AvahiLogLevel level, const gchar *txt) {
 
-    loop = g_main_loop_new(NULL, FALSE);
+    static const int const log_level_map[] = {
+        LOG_ERR,
+        LOG_WARNING,
+        LOG_NOTICE,
+        LOG_INFO,
+        LOG_DEBUG
+    };
+    
+    g_assert(level < AVAHI_LOG_LEVEL_MAX);
+    g_assert(txt);
 
-    dbus_error_init (&error);
+    daemon_log(log_level_map[level], "%s", txt);
+}
 
-    bus = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
+static gboolean signal_callback(GIOChannel *source, GIOCondition condition, gpointer data) {
+    gint sig;
+    g_assert(source);
 
-    if (bus == NULL)
-    {
-        g_warning ("dbus_bus_get(): %s", error.message);
-        dbus_error_free (&error);
+    if ((sig = daemon_signal_next()) <= 0) {
+        avahi_log_error("daemon_signal_next() failed");
+        return FALSE;
+    }
 
-        goto finish;
+    switch (sig) {
+        case SIGINT:
+        case SIGQUIT:
+        case SIGTERM:
+            avahi_log_info(
+                "Got %s, quitting.",
+                sig == SIGINT ? "SIGINT" :
+                (sig == SIGQUIT ? "SIGQUIT" : "SIGTERM"));
+            g_main_loop_quit((GMainLoop*) data);
+            break;
+
+        case SIGHUP:
+            avahi_log_info("Got SIGHUP, reloading.");
+            static_service_load();
+            static_service_add_to_server();
+            break;
+
+        default:
+            avahi_log_warn("Got spurious signal, ignoring.");
+            break;
     }
 
-    dbus_connection_setup_with_g_main (bus, NULL);
-    dbus_connection_set_exit_on_disconnect (bus, FALSE);
+    return TRUE;
+}
 
-    dbus_bus_acquire_service (bus, DBUS_SERVICE_AVAHI, 0, &error);
+static gint run_server(DaemonConfig *config) {
+    GMainLoop *loop = NULL;
+    gint r = -1;
+    GIOChannel *io = NULL;
+    guint watch_id = (guint) -1;
 
-    if (dbus_error_is_set (&error))
-    {
-        g_warning ("dbus_error_is_set (): %s", error.message);
-        dbus_error_free (&error);
+    g_assert(config);
+    
+    loop = g_main_loop_new(NULL, FALSE);
 
+    if (daemon_signal_init(SIGINT, SIGQUIT, SIGHUP, SIGTERM, 0) < 0) {
+        avahi_log_error("Could not register signal handlers (%s).", strerror(errno));
         goto finish;
     }
 
-    dbus_connection_add_filter (bus, signal_filter, loop, NULL);
-    dbus_bus_add_match (bus,
-                        "type='method_call',interface='org.freedesktop.Avahi'",
-                        &error);
-
-    if (dbus_error_is_set (&error))
-    {
-        g_warning ("dbus_bus_add_match (): %s", error.message);
-        dbus_error_free (&error);
-
+    if (!(io = g_io_channel_unix_new(daemon_signal_fd()))) {
+        avahi_log_error( "Failed to create signal io channel.");
         goto finish;
     }
 
+    g_io_channel_set_close_on_unref(io, FALSE);
+    g_io_add_watch(io, G_IO_IN, signal_callback, loop);
+    
     if (simple_protocol_setup(NULL) < 0)
         goto finish;
-
-    if (!(avahi_server = avahi_server_new(NULL, &config, server_callback, NULL)))
+    
+#ifdef ENABLE_DBUS
+    if (config->enable_dbus)
+        if (dbus_protocol_setup(loop) < 0)
+            goto finish;
+#endif
+    
+    if (!(avahi_server = avahi_server_new(NULL, &config->server_config, server_callback, NULL)))
         goto finish;
+    
+    static_service_load();
+
+    if (config->daemonize) {
+        daemon_retval_send(0);
+        r = 0;
+    }
 
     g_main_loop_run(loop);
 
-    r = 0;
-    
 finish:
-
+    
+    static_service_remove_from_server();
+    static_service_free_all();
+    
     simple_protocol_shutdown();
 
-    if (bus) {
-        dbus_connection_disconnect(bus);
-        dbus_connection_unref(bus);
-    }
+#ifdef ENABLE_DBUS
+    if (config->enable_dbus)
+        dbus_protocol_shutdown();
+#endif
 
     if (avahi_server)
         avahi_server_free(avahi_server);
+
+    daemon_signal_done();
+
+    if (watch_id != (guint) -1)
+        g_source_remove(watch_id);
     
+    if (io)
+        g_io_channel_unref(io);
+
+        
     if (loop)
         g_main_loop_unref(loop);
 
-    avahi_server_config_free(&config);
+    if (r != 0 && config->daemonize)
+        daemon_retval_send(1);
+    
+    return r;
+}
+
+static gint drop_root(void) {
+    struct passwd *pw;
+    struct group * gr;
+    gint r;
+    
+    if (!(pw = getpwnam(AVAHI_USER))) {
+        avahi_log_error( "Failed to find user '"AVAHI_USER"'.");
+        return -1;
+    }
+
+    if (!(gr = getgrnam(AVAHI_GROUP))) {
+        avahi_log_error( "Failed to find group '"AVAHI_GROUP"'.");
+        return -1;
+    }
+
+    avahi_log_info("Found user '"AVAHI_USER"' (UID %lu) and group '"AVAHI_GROUP"' (GID %lu).", (unsigned long) pw->pw_uid, (unsigned long) gr->gr_gid);
+
+    if (initgroups(AVAHI_USER, gr->gr_gid) != 0) {
+        avahi_log_error("Failed to change group list: %s", strerror(errno));
+        return -1;
+    }
+
+#if defined(HAVE_SETRESGID)
+    r = setresgid(gr->gr_gid, gr->gr_gid, gr->gr_gid);
+#elif defined(HAVE_SETREGID)
+    r = setregid(gr->gr_gid, gr->gr_gid);
+#else
+    if ((r = setgid(gr->gr_gid)) >= 0)
+        r = setegid(gr->gr_gid);
+#endif
+
+    if (r < 0) {
+        avahi_log_error("Failed to change GID: %s", strerror(errno));
+        return -1;
+    }
+
+#if defined(HAVE_SETRESUID)
+    r = setresuid(pw->pw_uid, pw->pw_uid, pw->pw_uid);
+#elif defined(HAVE_SETREUID)
+    r = setreuid(pw->pw_uid, pw->pw_uid);
+#else
+    if ((r = setuid(pw->pw_uid)) >= 0)
+        r = seteuid(pw->pw_uid);
+#endif
+
+    if (r < 0) {
+        avahi_log_error("Failed to change UID: %s", strerror(errno));
+        return -1;
+    }
+
+    g_setenv("USER", pw->pw_name, 1);
+    g_setenv("LOGNAME", pw->pw_name, 1);
+    g_setenv("HOME", pw->pw_dir, 1);
+    
+    avahi_log_info("Successfully dropped root privileges.");
+
+    return 0;
+}
+
+int main(int argc, char *argv[]) {
+    gint r = 255;
+    DaemonConfig config;
+    const gchar *argv0;
+    gboolean wrote_pid_file = FALSE;
+
+    avahi_set_log_function(log_function);
+    
+    avahi_server_config_init(&config.server_config);
+    config.command = DAEMON_RUN;
+    config.daemonize = FALSE;
+    config.config_file = NULL;
+    config.enable_dbus = TRUE;
+    config.drop_root = TRUE;
+
+    if ((argv0 = strrchr(argv[0], '/')))
+        argv0++;
+    else
+        argv0 = argv[0];
+
+    daemon_pid_file_ident = daemon_log_ident = (char *) argv0;
+    
+    if (parse_command_line(&config, argc, argv) < 0)
+        goto finish;
+
+    if (config.command == DAEMON_HELP) {
+        help(stdout, argv0);
+        r = 0;
+    } else if (config.command == DAEMON_VERSION) {
+        printf("%s "PACKAGE_VERSION"\n", argv0);
+
+    } else if (config.command == DAEMON_KILL) {
+        if (daemon_pid_file_kill_wait(SIGTERM, 5) < 0) {
+            avahi_log_warn("Failed to kill daemon: %s", strerror(errno));
+            goto finish;
+        }
+
+        r = 0;
+        
+    } else if (config.command == DAEMON_RELOAD) {
+        if (daemon_pid_file_kill(SIGHUP) < 0) {
+            avahi_log_warn("Failed to kill daemon: %s", strerror(errno));
+            goto finish;
+        }
+
+        r = 0;
+        
+    } else if (config.command == DAEMON_RUN) {
+        pid_t pid;
 
+        if (getuid() != 0) {
+            avahi_log_error("This program is intended to be run as root.");
+            goto finish;
+        }
+        
+        if ((pid = daemon_pid_file_is_running()) >= 0) {
+            avahi_log_error("Daemon already running on PID %u", pid);
+            goto finish;
+        }
+
+        if (load_config_file(&config) < 0)
+            goto finish;
+        
+        if (config.daemonize) {
+
+            daemon_retval_init();
+            
+            if ((pid = daemon_fork()) < 0)
+                goto finish;
+            else if (pid != 0) {
+                int ret;
+                /** Parent **/
+
+                if ((ret = daemon_retval_wait(20)) < 0) {
+                    avahi_log_error("Could not recieve return value from daemon process.");
+                    goto finish;
+                }
+
+                r = ret;
+                goto finish;
+            }
+
+            /* Child */
+        }
+
+        chdir("/");
+
+        if (daemon_pid_file_create() < 0) {
+            avahi_log_error("Failed to create PID file: %s", strerror(errno));
+
+            if (config.daemonize)
+                daemon_retval_send(1);
+            goto finish;
+        } else
+            wrote_pid_file = TRUE;
+
+        if (config.drop_root) {
+            if (drop_root() < 0)
+                goto finish;
+        }
+
+        if (run_server(&config) == 0)
+            r = 0;
+    }
+        
+finish:
+
+    if (config.daemonize)
+        daemon_retval_done();
+
+    avahi_server_config_free(&config.server_config);
+    g_free(config.config_file);
+
+    if (wrote_pid_file)
+        daemon_pid_file_remove();
+    
     return r;
 }