X-Git-Url: https://code.delx.au/pulseaudio/blobdiff_plain/a9ca9c4a3bd8c3c03fe5d30cd2694cf891f5bbc1..fa499dad06ba6558111cdef64c18f2401e803cff:/polyp/main.c

diff --git a/polyp/main.c b/polyp/main.c
index 0218f396..941bf923 100644
--- a/polyp/main.c
+++ b/polyp/main.c
@@ -4,7 +4,7 @@
   This file is part of polypaudio.
  
   polypaudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published
+  it under the terms of the GNU Lesser General Public License as published
   by the Free Software Foundation; either version 2 of the License,
   or (at your option) any later version.
  
@@ -13,7 +13,7 @@
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
  
-  You should have received a copy of the GNU General Public License
+  You should have received a copy of the GNU Lesser General Public License
   along with polypaudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
@@ -34,6 +34,11 @@
 #include <ltdl.h>
 #include <memblock.h>
 
+#ifdef HAVE_LIBWRAP
+#include <syslog.h>
+#include <tcpd.h>
+#endif
+
 #include "core.h"
 #include "mainloop.h"
 #include "module.h"
@@ -45,31 +50,19 @@
 #include "xmalloc.h"
 #include "cpulimit.h"
 #include "log.h"
-
-static struct pa_mainloop *mainloop;
-
-static void drop_root(void) {
-    if (getuid() != 0 && geteuid() == 0) {
-        pa_log(__FILE__": Started SUID root, dropping root rights.\n");
-        setuid(getuid());
-        seteuid(getuid());
-    }
-}
-
-static const char* signal_name(int s) {
-    switch(s) {
-        case SIGINT: return "SIGINT";
-        case SIGTERM: return "SIGTERM";
-        case SIGUSR1: return "SIGUSR1";
-        case SIGUSR2: return "SIGUSR2";
-        case SIGXCPU: return "SIGXCPU";
-        case SIGPIPE: return "SIGPIPE";
-        default: return "UNKNOWN SIGNAL";
-    }
-}
+#include "daemon-conf.h"
+#include "dumpmodules.h"
+#include "caps.h"
+#include "cli-text.h"
+
+#ifdef HAVE_LIBWRAP
+/* Only one instance of these variables */
+int allow_severity = LOG_INFO;
+int deny_severity = LOG_WARNING;
+#endif
 
 static void signal_callback(struct pa_mainloop_api*m, struct pa_signal_event *e, int sig, void *userdata) {
-    pa_log(__FILE__": Got signal %s.\n", signal_name(sig));
+    pa_log(__FILE__": Got signal %s.\n", pa_strsignal(sig));
 
     switch (sig) {
         case SIGUSR1:
@@ -79,7 +72,47 @@ static void signal_callback(struct pa_mainloop_api*m, struct pa_signal_event *e,
         case SIGUSR2:
             pa_module_load(userdata, "module-cli-protocol-unix", NULL);
             return;
-        
+
+        case SIGHUP: {
+            int i;
+
+            for (i = 0;; i++) {
+                char *c;
+                switch (i) {
+                    case 0: 
+                        c = pa_sink_list_to_string(userdata);
+                        break;
+                    case 1:
+                        c = pa_source_list_to_string(userdata);
+                        break;
+                    case 2:
+                        c = pa_sink_input_list_to_string(userdata);
+                        break;
+                    case 3:
+                        c = pa_source_output_list_to_string(userdata);
+                        break;
+                    case 4: 
+                        c = pa_client_list_to_string(userdata);
+                        break;
+                    case 5:
+                        c = pa_module_list_to_string(userdata);
+                        break;
+                    case 6:
+                        c = pa_scache_list_to_string(userdata);
+                        break;
+                    case 7:
+                        c = pa_autoload_list_to_string(userdata);
+                        break;
+                    default:
+                        return;
+                }
+                pa_log(c);
+                pa_xfree(c);
+            }
+
+            return;
+        }
+
         case SIGINT:
         case SIGTERM:
         default:
@@ -89,7 +122,8 @@ static void signal_callback(struct pa_mainloop_api*m, struct pa_signal_event *e,
     }
 }
 
-static void close_pipe(int p[2]) {
+
+            static void close_pipe(int p[2]) {
     if (p[0] != -1)
         close(p[0]);
     if (p[1] != -1)
@@ -99,40 +133,87 @@ static void close_pipe(int p[2]) {
 
 int main(int argc, char *argv[]) {
     struct pa_core *c;
-    struct pa_cmdline *cmdline = NULL;
     struct pa_strbuf *buf = NULL;
+    struct pa_daemon_conf *conf;
+    struct pa_mainloop *mainloop;
+
     char *s;
-    int r, retval = 1;
+    int r, retval = 1, d = 0;
     int daemon_pipe[2] = { -1, -1 };
+    gid_t gid = (gid_t) -1;
+    int suid_root;
 
-    pa_log_set_ident("polypaudio");
+    pa_limit_caps();
 
-    if (!(cmdline = pa_cmdline_parse(argc, argv))) {
-        pa_log(__FILE__": failed to parse command line.\n");
-        goto finish;
+    suid_root = getuid() != 0 && geteuid() == 0;
+    
+    if (suid_root && (pa_uid_in_group("realtime", &gid) <= 0 || gid >= 1000)) {
+        pa_log(__FILE__": WARNING: called SUID root, but not in group 'realtime'.\n");
+        pa_drop_root();
     }
+    
+    LTDL_SET_PRELOADED_SYMBOLS();
+    
+    r = lt_dlinit();
+    assert(r == 0);
 
-    pa_log_set_target(cmdline->auto_log_target ? PA_LOG_STDERR : cmdline->log_target, NULL);
-
-    if (cmdline->help) {
-        pa_cmdline_help(argv[0]);
-        retval = 0;
+    pa_log_set_ident("polypaudio");
+    
+    conf = pa_daemon_conf_new();
+    
+    if (pa_daemon_conf_load(conf, NULL) < 0)
         goto finish;
-    }
-
-    if (cmdline->version) {
-        printf(PACKAGE_NAME" "PACKAGE_VERSION"\n");
-        retval = 0;
+    
+    if (pa_daemon_conf_env(conf) < 0)
+        goto finish;
+    
+    if (pa_cmdline_parse(conf, argc, argv, &d) < 0) {
+        pa_log(__FILE__": failed to parse command line.\n");
         goto finish;
     }
+    
+    pa_log_set_target(conf->auto_log_target ? PA_LOG_STDERR : conf->log_target, NULL);
 
-    if (cmdline->high_priority)
+    if (conf->high_priority && conf->cmd == PA_CMD_DAEMON)
         pa_raise_priority();
+
+    pa_drop_caps();
+
+    if (suid_root)
+        pa_drop_root();
     
-    if (!cmdline->stay_root)
-        drop_root();
+    if (conf->dl_search_path)
+        lt_dlsetsearchpath(conf->dl_search_path);
 
-    if (cmdline->daemonize) {
+    switch (conf->cmd) {
+        case PA_CMD_DUMP_MODULES:
+            pa_dump_modules(conf, argc-d, argv+d);
+            retval = 0;
+            goto finish;
+
+        case PA_CMD_DUMP_CONF: {
+            char *s = pa_daemon_conf_dump(conf);
+            fputs(s, stdout);
+            pa_xfree(s);
+            retval = 0;
+            goto finish;
+        }
+
+        case PA_CMD_HELP :
+            pa_cmdline_help(argv[0]);
+            retval = 0;
+            goto finish;
+
+        case PA_CMD_VERSION :
+            printf(PACKAGE_NAME" "PACKAGE_VERSION"\n");
+            retval = 0;
+            goto finish;
+
+        default:
+            assert(conf->cmd == PA_CMD_DAEMON);
+    }
+
+    if (conf->daemonize) {
         pid_t child;
 
         if (pa_stdio_acquire() < 0) {
@@ -161,33 +242,29 @@ int main(int argc, char *argv[]) {
                 retval = 1;
             }
 
+            if (conf->verbose)
+                pa_log(__FILE__": daemon startup %s.\n", retval ? "failed" : "succeeded");
+            
             goto finish;
         }
 
         close(daemon_pipe[0]);
         daemon_pipe[0] = -1;
-        
 
-        if (cmdline->auto_log_target)
+        if (conf->auto_log_target)
             pa_log_set_target(PA_LOG_SYSLOG, NULL);
 
         setsid();
-        setpgrp();
+        setpgid(0,0);
         
         close(0);
         close(1);
     }
     
-    r = lt_dlinit();
-    assert(r == 0);
-
-    if (cmdline->dl_search_path)
-        lt_dlsetsearchpath(cmdline->dl_search_path);
-#ifdef DLSEARCHPATH
-    else
-        lt_dlsetsearchpath(DLSEARCHPATH);
-#endif
+    chdir("/");
 
+    pa_log(__FILE__": sizeof(pa_usec_t) = %u\n", sizeof(pa_usec_t));
+    
     mainloop = pa_mainloop_new();
     assert(mainloop);
 
@@ -202,31 +279,39 @@ int main(int argc, char *argv[]) {
     
     pa_signal_new(SIGUSR1, signal_callback, c);
     pa_signal_new(SIGUSR2, signal_callback, c);
+    pa_signal_new(SIGHUP, signal_callback, c);
 
     r = pa_cpu_limit_init(pa_mainloop_get_api(mainloop));
     assert(r == 0);
     
     buf = pa_strbuf_new();
     assert(buf);
-    r = pa_cli_command_execute(c, cmdline->cli_commands, buf, &cmdline->fail, &cmdline->verbose);
+    if (conf->default_script_file)
+        r = pa_cli_command_execute_file(c, conf->default_script_file, buf, &conf->fail, &conf->verbose);
+
+    if (r >= 0)
+        r = pa_cli_command_execute(c, conf->script_commands, buf, &conf->fail, &conf->verbose);
     pa_log(s = pa_strbuf_tostring_free(buf));
     pa_xfree(s);
     
-    if (r < 0 && cmdline->fail) {
+    if (r < 0 && conf->fail) {
         pa_log(__FILE__": failed to initialize daemon.\n");
-        if (cmdline->daemonize)
+        if (conf->daemonize)
             pa_loop_write(daemon_pipe[1], &retval, sizeof(retval));
     } else if (!c->modules || pa_idxset_ncontents(c->modules) == 0) {
         pa_log(__FILE__": daemon startup without any loaded modules, refusing to work.\n");
-        if (cmdline->daemonize)
+        if (conf->daemonize)
             pa_loop_write(daemon_pipe[1], &retval, sizeof(retval));
     } else {
         retval = 0;
-        if (cmdline->daemonize)
+        if (conf->daemonize)
             pa_loop_write(daemon_pipe[1], &retval, sizeof(retval));
 
-        c->disallow_module_loading = cmdline->disallow_module_loading;
-        c->quit_after_last_client_time = cmdline->quit_after_last_client_time;
+        c->disallow_module_loading = conf->disallow_module_loading;
+        c->exit_idle_time = conf->exit_idle_time;
+        c->module_idle_time = conf->module_idle_time;
+        c->scache_idle_time = conf->scache_idle_time;
+        c->resample_method = conf->resample_method;
         
         pa_log(__FILE__": Daemon startup complete.\n");
         if (pa_mainloop_run(mainloop, &retval) < 0)
@@ -240,16 +325,16 @@ int main(int argc, char *argv[]) {
     pa_signal_done();
     pa_mainloop_free(mainloop);
     
-    lt_dlexit();
-
     pa_log(__FILE__": Daemon terminated.\n");
     
 finish:
 
-    if (cmdline)
-        pa_cmdline_free(cmdline);
+    if (conf)
+        pa_daemon_conf_free(conf);
 
     close_pipe(daemon_pipe);
 
+    lt_dlexit();
+    
     return retval;
 }