X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=e08b0661d14ddc4a8ef1cf2386cb75efe0655d19;hp=da55b99923621975335a86a7dfbbad41e3e6a573;hb=e752cdeab213b329552e1eecd5687bca512217c5;hpb=a0b1604a44be6bb89c91ae760f1ccf00768eb09a

diff --git a/server.c b/server.c
index da55b999..e08b0661 100644
--- a/server.c
+++ b/server.c
@@ -14,7 +14,7 @@
  *
  *
  * 	- The main programs: \ref server.c, \ref audiod.c, \ref client.c,
- *	  \ref audioc.c, \ref fsck.c, \ref afh.c
+ *	  \ref audioc.c, \ref afh.c
  *	- Server: \ref server_command, \ref sender,
  *	- Audio file selector: \ref audio_format_handler, \ref mood, \ref afs_table,
  *	- Client: \ref receiver, \ref receiver_node, \ref filter, \ref filter_node.
@@ -47,7 +47,6 @@
  *	- Time: \ref time.c,
  *	- Spawning processes: \ref exec.c,
  *	- Inter process communication: \ref ipc.c,
- *	- The object storage layer: \ref osl.c,
  *	- Blob tables: \ref blob.c,
  *	- The error subssystem: \ref error.h.
  *	- Access control for paraslash senders: \ref acl.c, \ref acl.h.
@@ -55,16 +54,16 @@
  * Low-level data structures:
  *
  *	- Doubly linked lists: \ref list.h,
- *	- Red-black trees: \ref rbtree.h, \ref rbtree.c,
  *	- Ring buffer: \ref ringbuffer.c, \ref ringbuffer.h,
  *	- Hashing: \ref hash.h, \ref sha1.h, \ref sha1.c,
  *	- Crypto: \ref crypt.c.
- *
+ *	- Forward error correction: \ref fec.c
  */
 
 #include <signal.h>
 #include <dirent.h>
 #include <sys/time.h>
+#include <osl.h>
 
 #include "para.h"
 #include "error.h"
@@ -318,7 +317,6 @@ static void signal_post_select(struct sched *s, struct task *t)
 		waitpid(mmd->afs_pid, NULL, 0);
 cleanup:
 		free(mmd->afd.afhi.chunk_table);
-		free(mmd->afd.afhi.info_string);
 		close_listed_fds();
 		mutex_destroy(mmd_mutex);
 		shm_detach(mmd);
@@ -335,25 +333,15 @@ static void init_signal_task(void)
 	st->task.post_select = signal_post_select;
 	sprintf(st->task.status, "signal task");
 
+	PARA_NOTICE_LOG("setting up signal handling\n");
 	st->fd = para_signal_init(); /* always successful */
-
-	PARA_NOTICE_LOG("setting up signal handlers\n");
-	if (para_install_sighandler(SIGINT) < 0)
-		goto err;
-	if (para_install_sighandler(SIGTERM) < 0)
-		goto err;
-	if (para_install_sighandler(SIGHUP) < 0)
-		goto err;
-	if (para_install_sighandler(SIGCHLD) < 0)
-		goto err;
-	if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
-		goto err;
+	para_install_sighandler(SIGINT);
+	para_install_sighandler(SIGTERM);
+	para_install_sighandler(SIGHUP);
+	para_install_sighandler(SIGCHLD);
+	para_sigaction(SIGPIPE, SIG_IGN);
 	add_close_on_fork_list(st->fd);
 	register_task(&st->task);
-	return;
-err:
-	PARA_EMERG_LOG("could not install signal handlers\n");
-	exit(EXIT_FAILURE);
 }
 
 static void command_pre_select(struct sched *s, struct task *t)
@@ -370,7 +358,6 @@ static void command_post_select(struct sched *s, struct task *t)
 	char *peer_name;
 	pid_t child_pid;
 	uint32_t *chunk_table;
-	char *info_string;
 
 	if (!FD_ISSET(sct->listen_fd, &s->rfds))
 		return;
@@ -383,15 +370,15 @@ static void command_post_select(struct sched *s, struct task *t)
 	mmd->num_connects++;
 	mmd->active_connections++;
 	random();
-	/* The chunk table and the info_string are pointers located in the
-	 * mmd struct that point to dynamically allocated memory that must be
-	 * freed by the parent and the child. However, as the mmd struct is in
-	 * a shared memory area, there's no guarantee that after the fork these
-	 * pointers are still valid in child context. As these two pointers are
-	 * not used in the child anyway, we save them to local variables and
-	 * free the memory via that copy in the child.
+	/*
+	 * The chunk table is a pointer located in the mmd struct that point to
+	 * dynamically allocated memory that must be freed by the parent and
+	 * the child. However, as the mmd struct is in a shared memory area,
+	 * there's no guarantee that after the fork these pointers are still
+	 * valid in child context. As this pointer is not used in the child
+	 * anyway, we save it to a local variable and free the memory via that
+	 * copy in the child.
 	 */
-	info_string = mmd->afd.afhi.info_string;
 	chunk_table = mmd->afd.afhi.chunk_table;
 	child_pid = fork();
 	if (child_pid < 0) {
@@ -404,7 +391,6 @@ static void command_post_select(struct sched *s, struct task *t)
 		return;
 	}
 	/* mmd might already have changed at this point */
-	free(info_string);
 	free(chunk_table);
 	alarm(ALARM_TIMEOUT);
 	close_listed_fds();
@@ -546,19 +532,13 @@ static void server_init(int argc, char **argv)
 	 * before the child gets a chance to ignore this signal -- only the
 	 * good die young.
 	 */
-	if (signal(SIGUSR1, SIG_IGN) == SIG_ERR) {
-		PARA_EMERG_LOG("failed to ignore SIGUSR1\n");
-		exit(EXIT_FAILURE);
-	}
+	para_sigaction(SIGUSR1, SIG_IGN);
 	/*
 	 * We have to install a SIGCHLD handler before the afs process is being
 	 * forked off. Otherwise, para_server does not notice if afs dies before
 	 * the SIGCHLD handler has been installed by init_signal_task() below.
 	 */
-	if (signal(SIGCHLD, tmp_sigchld_handler) == SIG_ERR) {
-		PARA_EMERG_LOG("failed to install temporary SIGCHLD handler\n");
-		exit(EXIT_FAILURE);
-	}
+	para_sigaction(SIGCHLD, tmp_sigchld_handler);
 	PARA_NOTICE_LOG("initializing the audio file selector\n");
 	afs_socket = init_afs();
 	init_signal_task();