X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=afs.c;h=9f32c8aadb14a2125914ce24d945c9b8f9d8d377;hb=181beb316afad036ac01a778544c5dec0a8d51c7;hp=710670255b2ec1cf67b9ab4e74823bfe19dd3a02;hpb=ec68178958818fab236cb59b084c65a60f2d67b1;p=paraslash.git

diff --git a/afs.c b/afs.c
index 71067025..9f32c8aa 100644
--- a/afs.c
+++ b/afs.c
@@ -715,7 +715,7 @@ static int afs_signal_post_select(struct sched *s, __a_unused void *context)
 		PARA_EMERG_LOG("para_server died\n");
 		goto shutdown;
 	}
-	signum = para_next_signal(&s->rfds);
+	signum = para_next_signal();
 	if (signum == 0)
 		return 0;
 	if (signum == SIGHUP) {
@@ -862,11 +862,11 @@ static int call_callback(int fd, int query_shmid)
 	return ret;
 }
 
-static int execute_server_command(fd_set *rfds)
+static int execute_server_command(void)
 {
 	char buf[8];
 	size_t n;
-	int ret = read_nonblock(server_socket, buf, sizeof(buf) - 1, rfds, &n);
+	int ret = read_nonblock(server_socket, buf, sizeof(buf) - 1, &n);
 
 	if (ret < 0 || n == 0)
 		return ret;
@@ -877,13 +877,13 @@ static int execute_server_command(fd_set *rfds)
 }
 
 /* returns 0 if no data available, 1 else */
-static int execute_afs_command(int fd, fd_set *rfds)
+static int execute_afs_command(int fd)
 {
 	uint32_t cookie;
 	int query_shmid;
 	char buf[sizeof(cookie) + sizeof(query_shmid)];
 	size_t n;
-	int ret = read_nonblock(fd, buf, sizeof(buf), rfds, &n);
+	int ret = read_nonblock(fd, buf, sizeof(buf), &n);
 
 	if (ret < 0)
 		goto err;
@@ -927,7 +927,7 @@ static int command_post_select(struct sched *s, void *context)
 	ret = task_get_notification(ct->task);
 	if (ret < 0)
 		return ret;
-	ret = execute_server_command(&s->rfds);
+	ret = execute_server_command();
 	if (ret < 0) {
 		PARA_EMERG_LOG("%s\n", para_strerror(-ret));
 		task_notify_all(s, -ret);
@@ -935,7 +935,7 @@ static int command_post_select(struct sched *s, void *context)
 	}
 	/* Check the list of connected clients. */
 	list_for_each_entry_safe(client, tmp, &afs_client_list, node) {
-		ret = execute_afs_command(client->fd, &s->rfds);
+		ret = execute_afs_command(client->fd);
 		if (ret == 0) { /* prevent bogus connection flooding */
 			struct timeval diff;
 			tv_diff(now, &client->connect_time, &diff);
@@ -948,7 +948,7 @@ static int command_post_select(struct sched *s, void *context)
 		free(client);
 	}
 	/* Accept connections on the local socket. */
-	ret = para_accept(ct->fd, &s->rfds, &unix_addr, sizeof(unix_addr), &fd);
+	ret = para_accept(ct->fd, &unix_addr, sizeof(unix_addr), &fd);
 	if (ret < 0)
 		PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
 	if (ret <= 0)
@@ -1003,8 +1003,7 @@ __noreturn void afs_init(int socket_fd)
 	PARA_INFO_LOG("server_socket: %d\n", server_socket);
 	init_admissible_files(OPT_STRING_VAL(AFS_INITIAL_MODE));
 	register_command_task(&s);
-	s.default_timeout.tv_sec = 0;
-	s.default_timeout.tv_usec = 999 * 1000;
+	s.default_timeout = 1000;
 	ret = write(socket_fd, "\0", 1);
 	if (ret != 1) {
 		if (ret == 0)