X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=server.c;h=cb32d4d962e129ccf3589fa2ba3db8eb72e18984;hb=c20e3e67fc2be1d5f8778b9c482271e023bbdcb8;hp=e0d50f4f8689e1de283ef80f8341504bcf386d33;hpb=0d1918752a18755bf701b82cf57fad79d9b18bc9;p=paraslash.git

diff --git a/server.c b/server.c
index e0d50f4f..cb32d4d9 100644
--- a/server.c
+++ b/server.c
@@ -2,31 +2,6 @@
 
 /** \file server.c Paraslash's main server. */
 
-/**
- * \mainpage Main data structures and selected APIs:
- *
- *	- Senders: \ref sender,
- *	- Audio file selector: \ref afs_info, \ref afs_table,
- *	- Audio format handler: \ref audio_format_handler, \ref afh_info
- *	- Receivers/filters/writers: \ref receiver, \ref receiver_node,
- *	  \ref filter, \ref filter_node, \ref writer_node, \ref writer.
- *	- Scheduling: \ref sched.h,
- *	- Buffer trees: \ref buffer_tree.h,
- *	- Sideband API: \ref sideband.h,
- *	- Crypto: \ref crypt.h, \ref crypt_backend.h,
- *	- Error subsystem: \ref error.h,
- *	- Inter process communication: \ref ipc.h,
- *	- Forward error correction: \ref fec.h,
- *	- Daemons: \ref daemon.h,
- *	- Mixer API: \ref mix.h,
- *	- Interactive sessions: \ref interactive.h,
- *	- File descriptors: \ref fd.h,
- *	- Signals: \ref signal.h,
- *	- Networking: \ref net.h,
- *	- Time: \ref time.c,
- *	- Doubly linked lists: \ref list.h.
- */
-
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <signal.h>
@@ -110,7 +85,7 @@ static struct signal_task *signal_task;
 /** The process id of the audio file selector process. */
 pid_t afs_pid = 0;
 
-/* The the main server process (parent of afs and the command handlers). */
+/* The main server process (parent of afs and the command handlers). */
 static pid_t server_pid;
 
 /**
@@ -298,14 +273,14 @@ static int signal_post_select(struct sched *s, __a_unused void *context)
 			if (pid != afs_pid)
 				continue;
 			PARA_EMERG_LOG("fatal: afs died\n");
-			kill(0, SIGTERM);
-			goto cleanup;
+			goto genocide;
 		}
 		break;
 	/* die on sigint/sigterm. Kill all children too. */
 	case SIGINT:
 	case SIGTERM:
 		PARA_EMERG_LOG("terminating on signal %d\n", signum);
+genocide:
 		kill(0, SIGTERM);
 		/*
 		 * We must wait for all of our children to die. For the afs
@@ -320,7 +295,6 @@ static int signal_post_select(struct sched *s, __a_unused void *context)
 		while (wait(NULL) != -1 || errno != ECHILD)
 			; /* still at least one child alive */
 		mutex_lock(mmd_mutex);
-cleanup:
 		free(mmd->afd.afhi.chunk_table);
 		task_notify_all(s, E_DEADLY_SIGNAL);
 		return -E_DEADLY_SIGNAL;