X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=afs.c;h=e491e30791f309b27a9ba8873e262323204f41d5;hb=fecbff83c4ca773815965f4ebdc7e6d9769a87dc;hp=1350db3423c3a184cb645e09cae9a2ebb060358b;hpb=4f01c486bb70a27f614cdc9c07a2b8d653db7605;p=paraslash.git

diff --git a/afs.c b/afs.c
index 1350db34..e491e307 100644
--- a/afs.c
+++ b/afs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2010 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -709,15 +709,16 @@ static void signal_pre_select(struct sched *s, struct task *t)
 
 static void afs_signal_post_select(struct sched *s, struct task *t)
 {
-	struct signal_task *st = container_of(t, struct signal_task, task);
+	int signum;
+
 	if (getppid() == 1) {
 		PARA_EMERG_LOG("para_server died\n");
 		goto shutdown;
 	}
-	if (!FD_ISSET(st->fd, &s->rfds))
+	signum = para_next_signal(&s->rfds);
+	if (signum == 0)
 		return;
-	st->signum = para_next_signal();
-	if (st->signum == SIGHUP) {
+	if (signum == SIGHUP) {
 		close_afs_tables();
 		parse_config_or_die(1);
 		t->error = open_afs_tables();
@@ -726,7 +727,7 @@ static void afs_signal_post_select(struct sched *s, struct task *t)
 		init_admissible_files(current_mop);
 		return;
 	}
-	PARA_EMERG_LOG("terminating on signal %d\n", st->signum);
+	PARA_EMERG_LOG("terminating on signal %d\n", signum);
 shutdown:
 	sched_shutdown();
 	t->error = -E_AFS_SIGNAL;
@@ -930,14 +931,11 @@ static void command_post_select(struct sched *s, struct task *t)
 		free(client);
 	}
 	/* Accept connections on the local socket. */
-	if (!FD_ISSET(ct->fd, &s->rfds))
-		return;
-	ret = para_accept(ct->fd, &unix_addr, sizeof(unix_addr));
-	if (ret < 0) {
+	ret = para_accept(ct->fd, &s->rfds, &unix_addr, sizeof(unix_addr), &fd);
+	if (ret < 0)
 		PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
+	if (ret <= 0)
 		return;
-	}
-	fd = ret;
 	ret = mark_fd_nonblocking(fd);
 	if (ret < 0) {
 		PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
@@ -1151,12 +1149,30 @@ void afs_event(enum afs_events event, struct para_buffer *pb,
 	}
 }
 
+/**
+ * Dummy event handler for the images table.
+ *
+ * \param event Unused.
+ * \param pb Unused.
+ * \param data Unused.
+ *
+ * This table does not honor events.
+ */
 int images_event_handler(__a_unused enum afs_events event,
 	__a_unused  struct para_buffer *pb, __a_unused void *data)
 {
 	return 1;
 }
 
+/**
+ * Dummy event handler for the lyrics table.
+ *
+ * \param event Unused.
+ * \param pb Unused.
+ * \param data Unused.
+ *
+ * This table does not honor events.
+ */
 int lyrics_event_handler(__a_unused enum afs_events event,
 	__a_unused struct para_buffer *pb, __a_unused void *data)
 {