X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=server.c;h=ce4ebf34ee680a4e24b9305879ef1b7ea248ba7e;hb=181beb316afad036ac01a778544c5dec0a8d51c7;hp=09087f7a72396bf01e51782dbebc1b9d1a82eb7c;hpb=a16741dcf32b9ed20ca572d6353c3f1b9212a464;p=paraslash.git

diff --git a/server.c b/server.c
index 09087f7a..ce4ebf34 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>
@@ -282,7 +257,7 @@ static int signal_post_select(struct sched *s, __a_unused void *context)
 	ret = task_get_notification(signal_task->task);
 	if (ret < 0)
 		return ret;
-	signum = para_next_signal(&s->rfds);
+	signum = para_next_signal();
 	switch (signum) {
 	case 0:
 		return 0;
@@ -362,7 +337,7 @@ static int command_task_accept(unsigned listen_idx, struct sched *s,
 	pid_t child_pid;
 	uint32_t *chunk_table;
 
-	ret = para_accept(sct->listen_fds[listen_idx], &s->rfds, NULL, 0, &new_fd);
+	ret = para_accept(sct->listen_fds[listen_idx], NULL, 0, &new_fd);
 	if (ret <= 0)
 		goto out;
 	mmd->num_connects++;
@@ -432,15 +407,16 @@ static int command_post_select(struct sched *s, void *context)
 
 	ret = task_get_notification(sct->task);
 	if (ret < 0)
-		return ret;
+		goto fail;
 	for (n = 0; n < sct->num_listen_fds; n++) {
 		ret = command_task_accept(n, s, sct);
-		if (ret < 0) {
-			free(sct->listen_fds);
-			return ret;
-		}
+		if (ret < 0)
+			goto fail;
 	}
 	return 0;
+fail:
+	free(sct->listen_fds);
+	return ret;
 }
 
 static void init_server_command_task(struct server_command_task *sct,
@@ -642,13 +618,13 @@ out:
 }
 
 static int server_select(int max_fileno, fd_set *readfds, fd_set *writefds,
-		struct timeval *timeout_tv)
+		int timeout)
 {
 	int ret;
 
 	status_refresh();
 	mutex_unlock(mmd_mutex);
-	ret = para_select(max_fileno + 1, readfds, writefds, timeout_tv);
+	ret = para_select(max_fileno + 1, readfds, writefds, timeout);
 	mutex_lock(mmd_mutex);
 	return ret;
 }
@@ -682,7 +658,7 @@ int main(int argc, char *argv[])
 	struct server_command_task server_command_task_struct,
 		*sct = &server_command_task_struct;
 
-	sched.default_timeout.tv_sec = 1;
+	sched.default_timeout = 1000;
 	sched.select_function = server_select;
 
 	server_init(argc, argv, sct);
@@ -703,12 +679,13 @@ int main(int argc, char *argv[])
 		deplete_close_on_fork_list();
 		if (ret < 0)
 			PARA_EMERG_LOG("%s\n", para_strerror(-ret));
+		vss_shutdown();
 	} else {
+		vss_shutdown();
 		alarm(ALARM_TIMEOUT);
 		close_listed_fds();
 		ret = handle_connect(sct->child_fd);
 	}
-	vss_shutdown();
 	shm_detach(mmd);
 	user_list_deplete();
 	free_lpr();