X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=35d6f19137b3a881482df4e65c3945d6bcdb8a78;hp=89a8137233c019df844f56d3a21bf841fd3fda15;hb=69a7e7aa11d8bf9b05d6431c57276befbc9b35a3;hpb=b0fe6d882dd35b01360a66e130d6714aff7b6a0d

diff --git a/server.c b/server.c
index 89a81372..35d6f191 100644
--- a/server.c
+++ b/server.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -23,9 +23,9 @@
  * The gory details, listed by topic:
  *
  * 	- Audio format handlers: \ref send_common.c \ref mp3_afh.c,
- *	  \ref ogg_afh.c, \ref aac_afh.c, \ref wma_afh.c,
+ *	  \ref ogg_afh.c, \ref aac_afh.c, \ref wma_afh.c, \ref spx_afh.c
  * 	- Decoders: \ref mp3dec_filter.c, \ref oggdec_filter.c,
- *	  \ref aacdec_filter.c, \ref wmadec_filter.c,
+ *	  \ref aacdec_filter.c, \ref wmadec_filter.c, spxdec_filter.c,
  *	- Volume normalizer: \ref compress_filter.c,
  *	- Output: \ref alsa_write.c, \ref osx_write.c, \ref oss_write.c,
  * 	- http: \ref http_recv.c, \ref http_send.c,
@@ -68,6 +68,7 @@
 #include <openssl/rc4.h>
 #include <regex.h>
 #include <osl.h>
+#include <stdbool.h>
 
 #include "para.h"
 #include "error.h"
@@ -77,11 +78,11 @@
 #include "string.h"
 #include "afs.h"
 #include "server.h"
+#include "list.h"
+#include "send.h"
 #include "vss.h"
 #include "config.h"
 #include "close_on_fork.h"
-#include "list.h"
-#include "send.h"
 #include "net.h"
 #include "daemon.h"
 #include "ipc.h"
@@ -146,17 +147,14 @@ static int want_colors(void)
 
 static void init_colors_or_die(void)
 {
-	int ret, i;
+	int i;
 
 	if (!want_colors())
 		return;
 	daemon_set_flag(DF_COLOR_LOG);
 	daemon_set_default_log_colors();
-	for (i = 0; i < conf.log_color_given; i++) {
-		ret = daemon_set_log_color(conf.log_color_arg[i]);
-		if (ret < 0)
-			exit(EXIT_FAILURE);
-	}
+	for (i = 0; i < conf.log_color_given; i++)
+		daemon_set_log_color_or_die(conf.log_color_arg[i]);
 }
 
 /*
@@ -276,15 +274,13 @@ static void handle_sighup(void)
 		kill(mmd->afs_pid, SIGHUP);
 }
 
-static void signal_post_select(struct sched *s, struct task *t)
+static void signal_post_select(struct sched *s, __a_unused struct task *t)
 {
-	struct signal_task *st = container_of(t, struct signal_task, task);
+	int signum = para_next_signal(&s->rfds);
 
-	if (!FD_ISSET(st->fd, &s->rfds))
+	switch (signum) {
+	case 0:
 		return;
-
-	st->signum = para_next_signal();
-	switch (st->signum) {
 	case SIGHUP:
 		handle_sighup();
 		break;
@@ -304,7 +300,7 @@ static void signal_post_select(struct sched *s, struct task *t)
 	/* die on sigint/sigterm. Kill all children too. */
 	case SIGINT:
 	case SIGTERM:
-		PARA_EMERG_LOG("terminating on signal %d\n", st->signum);
+		PARA_EMERG_LOG("terminating on signal %d\n", signum);
 		kill(0, SIGTERM);
 		/*
 		 * We must wait for afs because afs catches SIGINT/SIGTERM.
@@ -366,12 +362,9 @@ static void command_post_select(struct sched *s, struct task *t)
 	pid_t child_pid;
 	uint32_t *chunk_table;
 
-	if (!FD_ISSET(sct->listen_fd, &s->rfds))
-		return;
-	ret = para_accept(sct->listen_fd, NULL, 0);
-	if (ret < 0)
+	ret = para_accept(sct->listen_fd, &s->rfds, NULL, 0, &new_fd);
+	if (ret <= 0)
 		goto out;
-	new_fd = ret;
 	peer_name = remote_name(new_fd);
 	PARA_INFO_LOG("got connection from %s, forking\n", peer_name);
 	mmd->num_connects++;
@@ -433,6 +426,7 @@ static void init_server_command_task(int argc, char **argv)
 	if (ret < 0)
 		goto err;
 	add_close_on_fork_list(sct->listen_fd); /* child doesn't need the listener */
+	sprintf(sct->task.status, "server command task");
 	register_task(&sct->task);
 	return;
 err: