X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=77bbc88357cdb9904127de83f0a41c8eda700d9d;hp=5ea8811f960550c26d9b99a2c0a15b9ac204f7f7;hb=141b0fd36edcad22ee07c65b101e90064d8567b6;hpb=d79c420304e9ae7e0dec89ca2644f2e04a7134e2

diff --git a/server.c b/server.c
index 5ea8811f..77bbc883 100644
--- a/server.c
+++ b/server.c
@@ -12,8 +12,9 @@
  *
  * Starting points for getting an overview:
  *
+ *
  * 	- The main programs: \ref server.c, \ref audiod.c, \ref client.c,
- *	  \ref audioc.c, \ref fsck.c,
+ *	  \ref audioc.c, \ref fsck.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.
@@ -21,12 +22,12 @@
  *
  * The gory details, listed by topic:
  *
- * 	- Audio format handlers: \ref mp3_afh.c, \ref ogg_afh.c, \ref aac_afh.c,
- * 	- Decoders: \ref mp3dec.c, \ref oggdec.c, \ref aacdec.c,
- *	- Volume normalizer: \ref compress.c,
+ * 	- Audio format handlers: \ref send_common.c \ref mp3_afh.c, \ref ogg_afh.c, \ref aac_afh.c,
+ * 	- Decoders: \ref mp3dec_filter.c, \ref oggdec_filter.c, \ref aacdec_filter.c,
+ *	- Volume normalizer: \ref compress_filter.c,
  *	- Output: \ref alsa_write.c, \ref osx_write.c,
  * 	- http: \ref http_recv.c, \ref http_send.c,
- *	- ortp: \ref ortp_recv.c, \ref ortp_send.c,
+ *	- udp: \ref udp_recv.c, \ref udp_send.c,
  *	- dccp: \ref dccp_recv.c, \ref dccp_send.c,
  *	- Audio file selector: \ref afs.c, \ref aft.c, \ref mood.c,
  *	- Afs structures: \ref afs_table, \ref audio_file_data,
@@ -115,7 +116,6 @@ static FILE *logfile;
 /** The file containing user information (public key, permissions). */
 static char *user_list_file = NULL;
 static int mmd_shm_id;
-static pid_t afs_pid;
 
 
 /** The task responsible for server command handling. */
@@ -136,7 +136,7 @@ struct server_command_task {
  * \param ll The log level.
  * \param fmt The format string describing the log message.
  */
-void para_log(int ll, const char* fmt,...)
+__printf_2_3 void para_log(int ll, const char* fmt,...)
 {
 	va_list argp;
 	FILE *outfd;
@@ -260,8 +260,8 @@ static void handle_sighup(void)
 	logfile = NULL;
 	parse_config(1); /* reopens log */
 	init_user_list(user_list_file); /* reload user list */
-	if (afs_pid)
-		kill(afs_pid, SIGHUP);
+	if (mmd->afs_pid)
+		kill(mmd->afs_pid, SIGHUP);
 }
 
 static void signal_post_select(struct sched *s, struct task *t)
@@ -282,7 +282,7 @@ static void signal_post_select(struct sched *s, struct task *t)
 			int ret = para_reap_child(&pid);
 			if (ret <= 0)
 				break;
-			if (pid != afs_pid)
+			if (pid != mmd->afs_pid)
 				continue;
 			PARA_EMERG_LOG("fatal: afs died\n");
 			goto genocide;
@@ -448,10 +448,10 @@ static int init_afs(void)
 	if (ret < 0)
 		exit(EXIT_FAILURE);
 	afs_socket_cookie = para_random((uint32_t)-1);
-	afs_pid = fork();
-	if (afs_pid < 0)
+	mmd->afs_pid = fork();
+	if (mmd->afs_pid < 0)
 		exit(EXIT_FAILURE);
-	if (!afs_pid) { /* child (afs) */
+	if (!mmd->afs_pid) { /* child (afs) */
 		close(afs_server_socket[0]);
 		afs_init(afs_socket_cookie, afs_server_socket[1]);
 	}
@@ -493,10 +493,9 @@ static void server_init(int argc, char **argv)
 		daemon_init();
 	PARA_NOTICE_LOG("initializing audio format handlers\n");
 	afh_init();
-	mmd->server_pid = getpid();
-	init_signal_task();
 	PARA_NOTICE_LOG("initializing the audio file selector\n");
 	afs_socket = init_afs();
+	init_signal_task();
 	PARA_NOTICE_LOG("initializing virtual streaming system\n");
 	init_vss_task(afs_socket);
 	init_server_command_task(argc, argv);