X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=018fc5dcd23f51da96291504b75e16f80fd46aff;hp=0efb6991fe20b4d7e5aadd5585841cc39f739a5f;hb=9ae0041ae0dd073657862c4abdf3886a66035ee9;hpb=74d8b443aba528dc65af874a81c53be26aaace9e

diff --git a/afs.c b/afs.c
index 0efb6991..018fc5dc 100644
--- a/afs.c
+++ b/afs.c
@@ -6,18 +6,20 @@
 
 /** \file afs.c Paraslash's audio file selector. */
 
+#include <signal.h>
+#include <fnmatch.h>
 #include "server.cmdline.h"
 #include "para.h"
+#include "error.h"
+#include "string.h"
 #include "afh.h"
+#include "afs.h"
 #include "server.h"
-#include "error.h"
 #include <dirent.h> /* readdir() */
 #include <sys/mman.h>
 #include <sys/time.h>
 #include "net.h"
-#include "afs.h"
 #include "ipc.h"
-#include "string.h"
 #include "list.h"
 #include "sched.h"
 #include "signal.h"
@@ -51,7 +53,15 @@ enum afs_table_num {
 	NUM_AFS_TABLES
 };
 
-static struct table_info afs_tables[NUM_AFS_TABLES];
+static struct afs_table afs_tables[NUM_AFS_TABLES] = {
+	[TBLNUM_AUDIO_FILES] = {.init = aft_init},
+	[TBLNUM_ATTRIBUTES] = {.init = attribute_init},
+	[TBLNUM_SCORES] = {.init = score_init},
+	[TBLNUM_MOODS] = {.init = moods_init},
+	[TBLNUM_LYRICS] = {.init = lyrics_init},
+	[TBLNUM_IMAGES] = {.init = images_init},
+	[TBLNUM_PLAYLIST] = {.init = playlists_init},
+};
 
 struct command_task {
 	/** The file descriptor for the local socket. */
@@ -65,6 +75,16 @@ struct command_task {
 	struct task task;
 };
 
+extern struct misc_meta_data *mmd;
+
+static int server_socket;
+static struct command_task command_task_struct;
+static struct signal_task signal_task_struct;
+
+static enum play_mode current_play_mode;
+static char *current_mop; /* mode or playlist specifier. NULL means dummy mooe */
+
+
 /**
  * A random number used to "authenticate" the connection.
  *
@@ -121,14 +141,14 @@ struct callback_result {
 };
 
 /**
- * Ask the parent process to call a given function.
+ * Ask the afs process to call a given function.
  *
  * \param f The function to be called.
  * \param query Pointer to arbitrary data for the callback.
  * \param result Callback result will be stored here.
  *
  * This function creates a shared memory area, copies the buffer pointed to by
- * \a buf to that area and notifies the afs process that \a f should be
+ * query to that area and notifies the afs process that \a f should be
  * called ASAP.
  *
  * \return Negative, on errors, the return value of the callback function
@@ -144,11 +164,11 @@ int send_callback_request(callback_function *f, struct osl_object *query,
 	int ret, fd = -1, query_shmid, result_shmid;
 	void *query_shm, *result_shm;
 	char buf[sizeof(afs_socket_cookie) + sizeof(int)];
-//	char *tmpsocket_name;
-	struct sockaddr_un unix_addr;
+	size_t query_shm_size = sizeof(*cq);
 
-	assert(query->data && query->size);
-	ret = shm_new(query->size + sizeof(*cq));
+	if (query)
+		query_shm_size += query->size;
+	ret = shm_new(query_shm_size);
 	if (ret < 0)
 		return ret;
 	query_shmid = ret;
@@ -157,9 +177,10 @@ int send_callback_request(callback_function *f, struct osl_object *query,
 		goto out;
 	cq = query_shm;
 	cq->handler = f;
-	cq->query_size = query->size;
+	cq->query_size = query_shm_size - sizeof(*cq);
 
-	memcpy(query_shm + sizeof(*cq), query->data, query->size);
+	if (query)
+		memcpy(query_shm + sizeof(*cq), query->data, query->size);
 	ret = shm_detach(query_shm);
 	if (ret < 0)
 		goto out;
@@ -167,16 +188,10 @@ int send_callback_request(callback_function *f, struct osl_object *query,
 	*(uint32_t *) buf = afs_socket_cookie;
 	*(int *) (buf + sizeof(afs_socket_cookie)) = query_shmid;
 
-	ret = get_stream_socket(PF_UNIX);
+	ret = create_remote_socket(conf.afs_socket_arg);
 	if (ret < 0)
 		goto out;
 	fd = ret;
-	ret = init_unix_addr(&unix_addr, conf.afs_socket_arg);
-	if (ret < 0)
-		goto out;
-	ret = PARA_CONNECT(fd, &unix_addr);
-	if (ret < 0)
-		goto out;
 	ret = send_bin_buffer(fd, buf, sizeof(buf));
 	if (ret < 0)
 		goto out;
@@ -184,7 +199,7 @@ int send_callback_request(callback_function *f, struct osl_object *query,
 	if (ret < 0)
 		goto out;
 	if (ret != sizeof(int)) {
-		ret = -E_RECV;
+		ret = -E_AFS_SHORT_READ;
 		goto out;
 	}
 	ret = *(int *) buf;
@@ -276,6 +291,50 @@ int send_standard_callback_request(int argc,  char * const * const argv,
 	return send_option_arg_callback_request(NULL, argc, argv, f, result);
 }
 
+static int action_if_pattern_matches(struct osl_row *row, void *data)
+{
+	struct pattern_match_data *pmd = data;
+	struct osl_object name_obj;
+	const char *p, *name;
+	int ret = osl_get_object(pmd->table, row, pmd->match_col_num, &name_obj);
+	const char *pattern_txt = (const char *)pmd->patterns.data;
+
+	if (ret < 0)
+		return ret;
+	name = (char *)name_obj.data;
+	if ((!name || !*name) && (pmd->pm_flags & PM_SKIP_EMPTY_NAME))
+		return 1;
+	if (!pmd->patterns.size && (pmd->pm_flags & PM_NO_PATTERN_MATCHES_EVERYTHING))
+		return pmd->action(pmd->table, row, name, pmd->data);
+	for (p = pattern_txt; p < pattern_txt + pmd->patterns.size;
+			p += strlen(p) + 1) {
+		ret = fnmatch(p, name, pmd->fnmatch_flags);
+		if (ret == FNM_NOMATCH)
+			continue;
+		if (ret)
+			return -E_FNMATCH;
+		return pmd->action(pmd->table, row, name, pmd->data);
+	}
+	return 1;
+}
+
+/**
+ * Execute the given function for each matching row.
+ *
+ * \param pmd Describes what to match and how.
+ *
+ * \return The return value of the underlying call to osl_rbtree_loop()
+ * or osl_rbtree_loop_reverse().
+ */
+int for_each_matching_row(struct pattern_match_data *pmd)
+{
+	if (pmd->pm_flags & PM_REVERSE_LOOP)
+		return osl_rbtree_loop_reverse(pmd->table, pmd->loop_col_num, pmd,
+			action_if_pattern_matches);
+	return osl_rbtree_loop(pmd->table, pmd->loop_col_num, pmd,
+			action_if_pattern_matches);
+}
+
 /**
  * Compare two osl objects of string type.
  *
@@ -298,82 +357,41 @@ int string_compare(const struct osl_object *obj1, const struct osl_object *obj2)
 	return strncmp(str1, str2, PARA_MIN(obj1->size, obj2->size));
 }
 
-/**
- * A wrapper for strtol(3).
- *
- * \param str The string to be converted to a long integer.
- * \param result The converted value is stored here.
- *
- * \return Positive on success, -E_ATOL on errors.
- *
- * \sa strtol(3), atoi(3).
- */
-int para_atol(const char *str, long *result)
-{
-	char *endptr;
-	long val;
-	int ret, base = 10;
-
-	errno = 0; /* To distinguish success/failure after call */
-	val = strtol(str, &endptr, base);
-	ret = -E_ATOL;
-	if (errno == ERANGE && (val == LONG_MAX || val == LONG_MIN))
-		goto out; /* overflow */
-	if (errno != 0 && val == 0)
-		goto out; /* other error */
-	if (endptr == str)
-		goto out; /* No digits were found */
-	if (*endptr != '\0')
-		goto out; /* Further characters after number */
-	*result = val;
-	ret = 1;
-out:
-	return ret;
-}
-
-
 /*
- * write input from fd to dynamically allocated char array,
- * but maximal max_size byte. Return size.
+ * write input from fd to dynamically allocated buffer,
+ * but maximal max_size byte.
  */
-static int fd2buf(int fd, char **buf, int max_size)
+static int fd2buf(int fd, unsigned max_size, struct osl_object *obj)
 {
 	const size_t chunk_size = 1024;
-	size_t size = 2048;
-	char *p;
+	size_t size = 2048, received = 0;
 	int ret;
+	char *buf = para_malloc(size);
 
-	*buf = para_malloc(size * sizeof(char));
-	p = *buf;
-	while ((ret = read(fd, p, chunk_size)) > 0) {
-		p += ret;
-		if ((p - *buf) + chunk_size >= size) {
-			char *tmp;
-
+	for (;;) {
+		ret = recv_bin_buffer(fd, buf + received, chunk_size);
+		if (ret <= 0)
+			break;
+		received += ret;
+		if (received + chunk_size >= size) {
 			size *= 2;
-			if (size > max_size) {
-				ret = -E_INPUT_TOO_LARGE;
-				goto out;
-			}
-			tmp = para_realloc(*buf, size);
-			p = (p - *buf) + tmp;
-			*buf = tmp;
+			ret = -E_INPUT_TOO_LARGE;
+			if (size > max_size)
+				break;
+			buf = para_realloc(buf, size);
 		}
 	}
-	if (ret < 0) {
-		ret = -E_READ;
-		goto out;
-	}
-	ret = p - *buf;
-out:
-	if (ret < 0 && *buf)
-		free(*buf);
+	obj->data = buf;
+	obj->size = received;
+	if (ret < 0)
+		free(buf);
 	return ret;
 }
 
 /**
- * Read from stdin, and send the result to the parent process.
+ * Read data from a file descriptor, and send it to the afs process.
  *
+ * \param fd File descriptor to read data from.
  * \param arg_obj Pointer to the arguments to \a f.
  * \param f The callback function.
  * \param max_len Don't read more than that many bytes from stdin.
@@ -381,128 +399,226 @@ out:
  *
  * This function is used by commands that wish to let para_server store
  * arbitrary data specified by the user (for instance the add_blob family of
- * commands). First, at most \a max_len bytes are read from stdin, the result
+ * commands). First, at most \a max_len bytes are read from \a fd, the result
  * is concatenated with the buffer given by \a arg_obj, and the combined buffer
  * is made available to the parent process via shared memory.
  *
  * \return Negative on errors, the return value of the underlying call to
  * send_callback_request() otherwise.
  */
-int stdin_command(struct osl_object *arg_obj, callback_function *f,
+int stdin_command(int fd, struct osl_object *arg_obj, callback_function *f,
 		unsigned max_len, struct osl_object *result)
 {
-	char *stdin_buf;
-	size_t stdin_len;
-	struct osl_object query;
-	int ret = fd2buf(STDIN_FILENO, &stdin_buf, max_len);
+	struct osl_object query, stdin_obj;
+	int ret;
 
+	ret = send_buffer(fd, AWAITING_DATA_MSG);
 	if (ret < 0)
 		return ret;
-	stdin_len = ret;
-	query.size = arg_obj->size + stdin_len;
+	ret = fd2buf(fd, max_len, &stdin_obj);
+	if (ret < 0)
+		return ret;
+	query.size = arg_obj->size + stdin_obj.size;
 	query.data = para_malloc(query.size);
 	memcpy(query.data, arg_obj->data, arg_obj->size);
-	memcpy((char *)query.data + arg_obj->size, stdin_buf, stdin_len);
-	free(stdin_buf);
+	memcpy((char *)query.data + arg_obj->size, stdin_obj.data, stdin_obj.size);
+	free(stdin_obj.data);
 	ret = send_callback_request(f, &query, result);
 	free(query.data);
 	return ret;
 }
 
+static int pass_afd(int fd, char *buf, size_t size)
+{
+	struct msghdr msg = {.msg_iov = NULL};
+	struct cmsghdr *cmsg;
+	char control[255];
+	int ret;
+	struct iovec iov;
+
+	iov.iov_base = buf;
+	iov.iov_len  = size;
+
+	msg.msg_iov = &iov;
+	msg.msg_iovlen = 1;
+
+	msg.msg_control = control;
+	msg.msg_controllen = sizeof(control);
+
+	cmsg = CMSG_FIRSTHDR(&msg);
+	cmsg->cmsg_level = SOL_SOCKET;
+	cmsg->cmsg_type = SCM_RIGHTS;
+	cmsg->cmsg_len = CMSG_LEN(sizeof(int));
+	*(int *)CMSG_DATA(cmsg) = fd;
+
+	/* Sum of the length of all control messages in the buffer */
+	msg.msg_controllen = cmsg->cmsg_len;
+	PARA_DEBUG_LOG("passing %zu bytes and fd %d\n", size, fd);
+	ret = sendmsg(server_socket, &msg, 0);
+	if (ret < 0) {
+		ret = -ERRNO_TO_PARA_ERROR(errno);
+		return ret;
+	}
+	return 1;
+}
+
 /**
  * Open the audio file with highest score.
  *
- * \param afd Audio file data is returned here.
+ * This stores all information for streaming the "best" audio file in a shared
+ * memory area. The id of that area and an open file descriptor for the next
+ * audio file are passed to the server process.
  *
- * This stores all information for streaming the "best" audio file
- * in the \a afd structure.
+ * \return Standard.
  *
- * \return Positive on success, negative on errors.
- *
- * \sa close_audio_file(), open_and_update_audio_file().
+ * \sa open_and_update_audio_file().
  */
-int open_next_audio_file(struct audio_file_data *afd)
+int open_next_audio_file(void)
 {
 	struct osl_row *aft_row;
-	int ret;
-	for (;;) {
-		ret = score_get_best(&aft_row, &afd->score);
-		if (ret < 0)
-			return ret;
-		ret = open_and_update_audio_file(aft_row, afd);
-		if (ret >= 0)
-			return ret;
+	struct audio_file_data afd;
+	int ret, shmid;
+	char buf[8];
+	long score;
+again:
+	PARA_NOTICE_LOG("getting next audio file\n");
+	ret = score_get_best(&aft_row, &score);
+	if (ret < 0) {
+		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+		goto no_admissible_files;
 	}
+	ret = open_and_update_audio_file(aft_row, score, &afd);
+	if (ret < 0) {
+		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+		ret = score_delete(aft_row);
+		if (ret < 0) {
+			PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+			goto no_admissible_files;
+		}
+		goto again;
+	}
+	shmid = ret;
+	if (!write_ok(server_socket)) {
+		ret = -E_AFS_SOCKET;
+		goto destroy;
+	}
+	*(uint32_t *)buf = NEXT_AUDIO_FILE;
+	*(uint32_t *)(buf + 4) = (uint32_t)shmid;
+	ret = pass_afd(afd.fd, buf, 8);
+	close(afd.fd);
+	if (ret >= 0)
+		return ret;
+destroy:
+	shm_destroy(shmid);
+	return ret;
+no_admissible_files:
+	*(uint32_t *)buf = NO_ADMISSIBLE_FILES;
+	*(uint32_t *)(buf + 4) = (uint32_t)0;
+	return send_bin_buffer(server_socket, buf, 8);
 }
 
-/**
- * Free all resources which were allocated by open_next_audio_file().
- *
- * \param afd The structure previously filled in by open_next_audio_file().
- *
- * \return The return value of the underlying call to para_munmap().
- *
- * \sa open_next_audio_file().
- */
-int close_audio_file(struct audio_file_data *afd)
+/* Never fails if arg == NULL */
+static int activate_mood_or_playlist(char *arg, int *num_admissible)
 {
-	free(afd->afhi.chunk_table);
-	return para_munmap(afd->map.data, afd->map.size);
+	enum play_mode mode;
+	int ret;
+
+	if (!arg) {
+		ret = change_current_mood(NULL); /* always successful */
+		mode = PLAY_MODE_MOOD;
+	} else {
+		if (!strncmp(arg, "p/", 2)) {
+			ret = playlist_open(arg + 2);
+			mode = PLAY_MODE_PLAYLIST;
+		} else if (!strncmp(arg, "m/", 2)) {
+			ret = change_current_mood(arg + 2);
+			mode = PLAY_MODE_MOOD;
+		} else
+			return -E_AFS_SYNTAX;
+		if (ret < 0)
+			return ret;
+	}
+	if (num_admissible)
+		*num_admissible = ret;
+	current_play_mode = mode;
+	if (arg != current_mop) {
+		free(current_mop);
+		if (arg) {
+			current_mop = para_strdup(arg);
+			mmd_lock();
+			strncpy(mmd->afs_mode_string, arg,
+				sizeof(mmd->afs_mode_string));
+			mmd->afs_mode_string[sizeof(mmd->afs_mode_string) - 1] = '\0';
+			mmd_unlock();
+		} else {
+			mmd_lock();
+			strcpy(mmd->afs_mode_string, "dummy");
+			mmd_unlock();
+			current_mop = NULL;
+		}
+	}
+	return 1;
 }
 
-#if 0
-static void play_loop(enum play_mode current_play_mode)
+static int com_select_callback(const struct osl_object *query,
+		struct osl_object *result)
 {
-	int i, ret;
-	struct audio_file_data afd;
+	struct para_buffer pb = {.buf = NULL};
+	char *arg = query->data;
+	int num_admissible, ret;
 
-	afd.current_play_mode = current_play_mode;
-	for (i = 0; i < 0; i++) {
-		ret = open_next_audio_file(&afd);
+	ret = clear_score_table();
+	if (ret < 0)
+		return ret;
+	if (current_play_mode == PLAY_MODE_MOOD)
+		close_current_mood();
+	else
+		playlist_close();
+	ret = activate_mood_or_playlist(arg, &num_admissible);
+	if (ret < 0) {
+		para_printf(&pb, "%s\n", para_strerror(-ret));
+		para_printf(&pb, "switching back to %s\n", current_mop?
+			current_mop : "dummy");
+		ret = activate_mood_or_playlist(current_mop, &num_admissible);
 		if (ret < 0) {
-			PARA_ERROR_LOG("failed to open next audio file: %d\n", ret);
-			return;
+			para_printf(&pb, "failed, switching to dummy\n");
+			activate_mood_or_playlist(NULL, &num_admissible);
 		}
-		PARA_NOTICE_LOG("next audio file: %s, score: %li\n", afd.path, afd.score);
-		sleep(1);
-		close_audio_file(&afd);
 	}
+	para_printf(&pb, "activated %s (%d admissible files)\n", current_mop?
+		current_mop : "dummy mood", num_admissible);
+	result->data = pb.buf;
+	result->size = pb.size;
+	return 1;
 }
-#endif
-
 
-static enum play_mode init_admissible_files(void)
+int com_select(int fd, int argc, char * const * const argv)
 {
 	int ret;
-	char *given_mood, *given_playlist;
-
-	given_mood = "mood_that_was_given_at_the_command_line";
-	given_playlist = "given_playlist";
-
-	if (given_mood) {
-		ret = mood_open(given_mood);
-		if (ret >= 0) {
-			if (given_playlist)
-				PARA_WARNING_LOG("ignoring playlist %s\n",
-					given_playlist);
-			return PLAY_MODE_MOOD;
-		}
-	}
-	if (given_playlist) {
-		ret = playlist_open(given_playlist);
-		if (ret >= 0)
-			return PLAY_MODE_PLAYLIST;
+	struct osl_object query, result;
+
+	if (argc != 2)
+		return -E_AFS_SYNTAX;
+	query.data = argv[1];
+	query.size = strlen(argv[1]) + 1;
+	ret = send_callback_request(com_select_callback, &query,
+		&result);
+	if (ret > 0 && result.data && result.size) {
+		ret = send_va_buffer(fd, "%s", (char *)result.data);
+		free(result.data);
 	}
-	ret = mood_open(NULL); /* open first available mood */
-	if (ret >= 0)
-		return PLAY_MODE_MOOD;
-	mood_open(""); /* open dummy mood, always successful */
-	return PLAY_MODE_MOOD;
+	return ret;
+}
+
+static void init_admissible_files(char *arg)
+{
+	if (activate_mood_or_playlist(arg, NULL) < 0)
+		activate_mood_or_playlist(NULL, NULL); /* always successful */
 }
 
 static int setup_command_socket_or_die(void)
 {
-	int ret;
+	int ret, socket_fd;
 	char *socket_name = conf.afs_socket_arg;
 	struct sockaddr_un unix_addr;
 
@@ -510,21 +626,80 @@ static int setup_command_socket_or_die(void)
 	ret = create_local_socket(socket_name, &unix_addr,
 		S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWOTH);
 	if (ret < 0) {
-		PARA_EMERG_LOG("%s: %s\n", PARA_STRERROR(-ret), socket_name);
+		PARA_EMERG_LOG("%s: %s\n", para_strerror(-ret), socket_name);
 		exit(EXIT_FAILURE);
 	}
-	if (listen(ret , 5) < 0) {
-		PARA_EMERG_LOG("%s", "can not listen on socket\n");
+	socket_fd = ret;
+	if (listen(socket_fd , 5) < 0) {
+		PARA_EMERG_LOG("can not listen on socket\n");
 		exit(EXIT_FAILURE);
 	}
-	PARA_INFO_LOG("listening on command socket %s (fd %d)\n", socket_name,
-		ret);
+	ret = mark_fd_nonblocking(socket_fd);
+	if (ret < 0) {
+		close(socket_fd);
+		return ret;
+	}
+	PARA_INFO_LOG("listening on socket %s (fd %d)\n", socket_name, ret);
+	return socket_fd;
+}
+
+static void close_afs_tables(void)
+{
+	int i;
+	PARA_NOTICE_LOG("closing afs_tables\n");
+	for (i = 0; i < NUM_AFS_TABLES; i++)
+		afs_tables[i].close();
+}
+
+static char *database_dir;
+
+static void get_database_dir(void)
+{
+	if (!database_dir) {
+		if (conf.afs_database_dir_given)
+			database_dir = para_strdup(conf.afs_database_dir_arg);
+		else {
+			char *home = para_homedir();
+			database_dir = make_message(
+				"%s/.paraslash/afs_database", home);
+			free(home);
+		}
+	}
+	PARA_INFO_LOG("afs_database dir %s\n", database_dir);
+}
+
+static int make_database_dir(void)
+{
+	int ret;
+
+	get_database_dir();
+	ret = para_mkdir(database_dir, 0777);
+	if (ret >= 0 || is_errno(-ret, EEXIST))
+		return 1;
 	return ret;
 }
 
-static int server_socket;
-static struct command_task command_task_struct;
-static struct signal_task signal_task_struct;
+static int open_afs_tables(void)
+{
+	int i, ret;
+
+	get_database_dir();
+	PARA_NOTICE_LOG("opening %u osl tables in %s\n", NUM_AFS_TABLES,
+		database_dir);
+	for (i = 0; i < NUM_AFS_TABLES; i++) {
+		ret = afs_tables[i].open(database_dir);
+		if (ret >= 0)
+			continue;
+		PARA_ERROR_LOG("%s init: %s\n", afs_tables[i].name,
+			para_strerror(-ret));
+		break;
+	}
+	if (ret >= 0)
+		return ret;
+	while (i)
+		afs_tables[--i].close();
+	return ret;
+}
 
 static void unregister_tasks(void)
 {
@@ -532,20 +707,6 @@ static void unregister_tasks(void)
 	unregister_task(&signal_task_struct.task);
 }
 
-static void close_afs_tables(enum osl_close_flags flags)
-{
-	PARA_NOTICE_LOG("closing afs_tables\n");
-	score_shutdown(flags);
-	attribute_shutdown(flags);
-	mood_close();
-	playlist_close();
-	moods_shutdown(flags);
-	playlists_shutdown(flags);
-	lyrics_shutdown(flags);
-	images_shutdown(flags);
-	aft_shutdown(flags);
-}
-
 static void signal_pre_select(struct sched *s, struct task *t)
 {
 	struct signal_task *st = t->private_data;
@@ -556,15 +717,27 @@ static void signal_pre_select(struct sched *s, struct task *t)
 static void signal_post_select(struct sched *s, struct task *t)
 {
 	struct signal_task *st = t->private_data;
+	t->ret = -E_AFS_PARENT_DIED;
+	if (getppid() == 1)
+		goto err;
 	t->ret = 1;
 	if (!FD_ISSET(st->fd, &s->rfds))
 		return;
 	st->signum = para_next_signal();
-	PARA_NOTICE_LOG("caught signal %d\n", st->signum);
 	t->ret = 1;
 	if (st->signum == SIGUSR1)
 		return; /* ignore SIGUSR1 */
-	t->ret = -E_SIGNAL_CAUGHT;
+	if (st->signum == SIGHUP) {
+		close_afs_tables();
+		t->ret = open_afs_tables();
+		if (t->ret < 0)
+			goto err;
+		init_admissible_files(current_mop);
+		return;
+	}
+	t->ret = -E_AFS_SIGNAL;
+err:
+	PARA_NOTICE_LOG("%s\n", para_strerror(-t->ret));
 	unregister_tasks();
 }
 
@@ -576,6 +749,7 @@ static void register_signal_task(void)
 	para_install_sighandler(SIGINT);
 	para_install_sighandler(SIGTERM);
 	para_install_sighandler(SIGPIPE);
+	para_install_sighandler(SIGHUP);
 
 	st->task.pre_select = signal_pre_select;
 	st->task.post_select = signal_post_select;
@@ -584,11 +758,28 @@ static void register_signal_task(void)
 	register_task(&st->task);
 }
 
+static struct list_head afs_client_list;
+
+/** Describes on connected afs client. */
+struct afs_client {
+	/** Position in the afs client list. */
+	struct list_head node;
+	/** The socket file descriptor for this client. */
+	int fd;
+	/** The time the client connected. */
+	struct timeval connect_time;
+};
+
 static void command_pre_select(struct sched *s, struct task *t)
 {
 	struct command_task *ct = t->private_data;
-	t->ret = 1;
+	struct afs_client *client;
+
+	para_fd_set(server_socket, &s->rfds, &s->max_fileno);
 	para_fd_set(ct->fd, &s->rfds, &s->max_fileno);
+	list_for_each_entry(client, &afs_client_list, node)
+		para_fd_set(client->fd, &s->rfds, &s->max_fileno);
+	t->ret = 1;
 }
 
 /*
@@ -646,54 +837,110 @@ out:
 	return ret;
 }
 
-static void command_post_select(struct sched *s, struct task *t)
+static void execute_server_command(void)
 {
-	struct command_task *ct = t->private_data;
-	struct sockaddr_un unix_addr;
-	char buf[sizeof(uint32_t) + sizeof(int)];
-	uint32_t cookie;
-	int query_shmid, fd;
+	char buf[8];
+	int ret = recv_bin_buffer(server_socket, buf, sizeof(buf) - 1);
 
-	t->ret = 1;
-	if (!FD_ISSET(ct->fd, &s->rfds))
+	if (ret <= 0) {
+		if (ret < 0)
+			PARA_ERROR_LOG("%s\n", para_strerror(-ret));
 		return;
-	t->ret = para_accept(ct->fd, &unix_addr, sizeof(unix_addr));
-	if (t->ret < 0)
+	}
+	buf[ret] = '\0';
+	PARA_DEBUG_LOG("received: %s\n", buf);
+	if (!strcmp(buf, "new")) {
+		ret = open_next_audio_file();
+		if (ret < 0) {
+			PARA_EMERG_LOG("%s\n", para_strerror(-ret));
+			unregister_tasks();
+		}
 		return;
-	/*
-	 * The following errors may be caused by a malicious local user. So do
-	 * not return an error in this case as this would terminate  para_afs
-	 * and para_server.
-	 */
-	fd = t->ret;
-	/* FIXME: This is easily dosable (peer doesn't send data) */
-	t->ret = recv_bin_buffer(fd, buf, sizeof(buf));
-	if (t->ret < 0) {
-		PARA_NOTICE_LOG("%s (%d)\n", PARA_STRERROR(-t->ret), t->ret);
-		goto out;
 	}
-	if (t->ret != sizeof(buf)) {
+	PARA_ERROR_LOG("unknown command\n");
+
+}
+
+static void execute_afs_command(int fd, uint32_t expected_cookie)
+{
+	uint32_t cookie;
+	int query_shmid;
+	char buf[sizeof(cookie) + sizeof(query_shmid)];
+	int ret = recv_bin_buffer(fd, buf, sizeof(buf));
+
+	if (ret < 0) {
+		PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
+		return;
+	}
+	if (ret != sizeof(buf)) {
 		PARA_NOTICE_LOG("short read (%d bytes, expected %lu)\n",
-			t->ret, (long unsigned) sizeof(buf));
-		goto out;
+			ret, (long unsigned) sizeof(buf));
+		return;
 	}
 	cookie = *(uint32_t *)buf;
-	if (cookie != ct->cookie) {
+	if (cookie != expected_cookie) {
 		PARA_NOTICE_LOG("received invalid cookie(got %u, expected %u)\n",
-			(unsigned)cookie, (unsigned)ct->cookie);
-		goto out;
+			(unsigned)cookie, (unsigned)expected_cookie);
+		return;
 	}
 	query_shmid = *(int *)(buf + sizeof(cookie));
 	if (query_shmid < 0) {
 		PARA_WARNING_LOG("received invalid query shmid %d)\n",
 			query_shmid);
-		goto out;
+		return;
 	}
-	/* Ignore return value: Errors might be ok here. */
+	/* Ignore return value: Errors might be OK here. */
 	call_callback(fd, query_shmid);
+}
+
+/** Shutdown connection if query has not arrived until this many seconds. */
+#define AFS_CLIENT_TIMEOUT 3
+
+static void command_post_select(struct sched *s, struct task *t)
+{
+	struct command_task *ct = t->private_data;
+	struct sockaddr_un unix_addr;
+	struct afs_client *client, *tmp;
+	int fd;
+	if (FD_ISSET(server_socket, &s->rfds))
+		execute_server_command();
+
+	/* Check the list of connected clients. */
+	list_for_each_entry_safe(client, tmp, &afs_client_list, node) {
+		if (FD_ISSET(client->fd, &s->rfds))
+			execute_afs_command(client->fd, ct->cookie);
+		else { /* prevent bogus connection flooding */
+			struct timeval diff;
+			tv_diff(now, &client->connect_time, &diff);
+			if (diff.tv_sec < AFS_CLIENT_TIMEOUT)
+				continue;
+			PARA_WARNING_LOG("connection timeout\n");
+		}
+		close(client->fd);
+		list_del(&client->node);
+		free(client);
+	}
+	/* Accept connections on the local socket. */
+	if (!FD_ISSET(ct->fd, &s->rfds))
+		goto out;
+	t->ret = para_accept(ct->fd, &unix_addr, sizeof(unix_addr));
+	if (t->ret < 0) {
+		PARA_NOTICE_LOG("%s\n", para_strerror(-t->ret));
+		goto out;
+	}
+	fd = t->ret;
+	t->ret = mark_fd_nonblocking(fd);
+	if (t->ret < 0) {
+		PARA_NOTICE_LOG("%s\n", para_strerror(-t->ret));
+		close(fd);
+		goto out;
+	}
+	client = para_malloc(sizeof(*client));
+	client->fd = fd;
+	client->connect_time = *now;
+	para_list_add(&client->node, &afs_client_list);
 out:
 	t->ret = 1;
-	close(fd);
 }
 
 static void register_command_task(uint32_t cookie)
@@ -709,102 +956,46 @@ static void register_command_task(uint32_t cookie)
 	register_task(&ct->task);
 }
 
-void register_tasks(uint32_t cookie)
+static void register_tasks(uint32_t cookie)
 {
 	register_signal_task();
 	register_command_task(cookie);
 }
 
-static char *database_dir;
-
-static int make_database_dir(void)
-{
-	int ret;
-
-	if (!database_dir) {
-		if (conf.afs_database_dir_given)
-			database_dir = para_strdup(conf.afs_database_dir_arg);
-		else {
-			char *home = para_homedir();
-			database_dir = make_message(
-				"%s/.paraslash/afs_database", home);
-			free(home);
-		}
-	}
-	PARA_INFO_LOG("afs_database dir %s\n", database_dir);
-	ret = para_mkdir(database_dir, 0777);
-	if (ret >= 0 || ret == -E_EXIST)
-		return 1;
-	free(database_dir);
-	database_dir = NULL;
-	return ret;
-}
-
-static int open_afs_tables(void)
-{
-	int ret = make_database_dir();
-
-	if (ret < 0)
-		return ret;
-	ret = attribute_init(&afs_tables[TBLNUM_ATTRIBUTES], database_dir);
-	if (ret < 0)
-		return ret;
-	ret = moods_init(&afs_tables[TBLNUM_MOODS], database_dir);
-	if (ret < 0)
-		goto moods_init_error;
-	ret = playlists_init(&afs_tables[TBLNUM_PLAYLIST], database_dir);
-	if (ret < 0)
-		goto playlists_init_error;
-	ret = lyrics_init(&afs_tables[TBLNUM_LYRICS], database_dir);
-	if (ret < 0)
-		goto lyrics_init_error;
-	ret = images_init(&afs_tables[TBLNUM_IMAGES], database_dir);
-	if (ret < 0)
-		goto images_init_error;
-	ret = score_init(&afs_tables[TBLNUM_SCORES], database_dir);
-	if (ret < 0)
-		goto score_init_error;
-	ret = aft_init(&afs_tables[TBLNUM_AUDIO_FILES], database_dir);
-	if (ret < 0)
-		goto aft_init_error;
-	return 1;
-
-aft_init_error:
-	score_shutdown(OSL_MARK_CLEAN);
-score_init_error:
-	images_shutdown(OSL_MARK_CLEAN);
-images_init_error:
-	lyrics_shutdown(OSL_MARK_CLEAN);
-lyrics_init_error:
-	playlists_shutdown(OSL_MARK_CLEAN);
-playlists_init_error:
-	moods_shutdown(OSL_MARK_CLEAN);
-moods_init_error:
-	attribute_shutdown(OSL_MARK_CLEAN);
-	return ret;
-}
-
-__noreturn int afs_init(uint32_t cookie, int socket_fd)
+/**
+ * Initialize the audio file selector process.
+ *
+ * \param cookie The value used for "authentication".
+ * \param socket_fd File descriptor used for communication with the server.
+ */
+__noreturn void afs_init(uint32_t cookie, int socket_fd)
 {
-	enum play_mode current_play_mode;
 	struct sched s;
-	int ret = open_afs_tables();
+	int i, ret;
+
+	INIT_LIST_HEAD(&afs_client_list);
+	for (i = 0; i < NUM_AFS_TABLES; i++)
+		afs_tables[i].init(&afs_tables[i]);
+	ret = open_afs_tables();
 
 	if (ret < 0) {
-		PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
+		PARA_EMERG_LOG("%s\n", para_strerror(-ret));
 		exit(EXIT_FAILURE);
 	}
 	server_socket = socket_fd;
+	ret = mark_fd_nonblocking(server_socket);
+	if (ret < 0)
+		exit(EXIT_FAILURE);
 	PARA_INFO_LOG("server_socket: %d, afs_socket_cookie: %u\n",
 		server_socket, (unsigned) cookie);
-	current_play_mode = init_admissible_files();
+	init_admissible_files(conf.afs_initial_mode_arg);
 	register_tasks(cookie);
 	s.default_timeout.tv_sec = 0;
-	s.default_timeout.tv_usec = 99 * 1000;
-	ret = sched(&s);
+	s.default_timeout.tv_usec = 999 * 1000;
+	ret = schedule(&s);
 	if (ret < 0)
-		PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
-	close_afs_tables(OSL_MARK_CLEAN);
+		PARA_EMERG_LOG("%s\n", para_strerror(-ret));
+	close_afs_tables();
 	exit(EXIT_FAILURE);
 }
 
@@ -814,15 +1005,15 @@ static int create_tables_callback(const struct osl_object *query,
 	uint32_t table_mask = *(uint32_t *)query->data;
 	int i, ret;
 
-	close_afs_tables(OSL_MARK_CLEAN);
+	close_afs_tables();
 	for (i = 0; i < NUM_AFS_TABLES; i++) {
-		struct table_info *ti = afs_tables + i;
+		struct afs_table *t = &afs_tables[i];
 
-		if (ti->flags & TBLFLAG_SKIP_CREATE)
-			continue;
 		if (!(table_mask & (1 << i)))
 			continue;
-		ret = osl_create_table(ti->desc);
+		if (!t->create)
+			continue;
+		ret = t->create(database_dir);
 		if (ret < 0)
 			return ret;
 	}
@@ -837,15 +1028,16 @@ int com_init(int fd, int argc, char * const * const argv)
 	struct osl_object query = {.data = &table_mask,
 		.size = sizeof(table_mask)};
 
+	ret = make_database_dir();
+	if (ret < 0)
+		return ret;
 	if (argc != 1) {
 		table_mask = 0;
 		for (i = 1; i < argc; i++) {
 			for (j = 0; j < NUM_AFS_TABLES; j++) {
-				struct table_info *ti = afs_tables + j;
+				struct afs_table *t = &afs_tables[j];
 
-				if (ti->flags & TBLFLAG_SKIP_CREATE)
-					continue;
-				if (strcmp(argv[i], ti->desc->name))
+				if (strcmp(argv[i], t->name))
 					continue;
 				table_mask |= (1 << j);
 				break;
@@ -859,3 +1051,112 @@ int com_init(int fd, int argc, char * const * const argv)
 		return ret;
 	return send_va_buffer(fd, "successfully created afs table(s)\n");
 }
+
+/**
+ * Flags for the check command.
+ *
+ * \sa com_check().
+ */
+enum com_check_flags {
+	/** Check the audio file table. */
+	CHECK_AFT = 1,
+	/** Check the mood table. */
+	CHECK_MOODS = 2,
+	/** Check the playlist table. */
+	CHECK_PLAYLISTS = 4
+};
+
+int com_check(int fd, int argc, char * const * const argv)
+{
+	unsigned flags = 0;
+	int i, ret;
+	struct osl_object result;
+
+	for (i = 1; i < argc; i++) {
+		const char *arg = argv[i];
+		if (arg[0] != '-')
+			break;
+		if (!strcmp(arg, "--")) {
+			i++;
+			break;
+		}
+		if (!strcmp(arg, "-a")) {
+			flags |= CHECK_AFT;
+			continue;
+		}
+		if (!strcmp(arg, "-p")) {
+			flags |= CHECK_PLAYLISTS;
+			continue;
+		}
+		if (!strcmp(arg, "-m")) {
+			flags |= CHECK_MOODS;
+			continue;
+		}
+		return -E_AFS_SYNTAX;
+	}
+	if (i < argc)
+		return -E_AFS_SYNTAX;
+	if (!flags)
+		flags = ~0U;
+	if (flags & CHECK_AFT) {
+		ret = send_callback_request(aft_check_callback, NULL, &result);
+		if (ret < 0)
+			return ret;
+		if (ret > 0) {
+			ret = send_buffer(fd, (char *) result.data);
+			free(result.data);
+			if (ret < 0)
+				return ret;
+		}
+	}
+	if (flags & CHECK_PLAYLISTS) {
+		ret = send_callback_request(playlist_check_callback, NULL, &result);
+		if (ret < 0)
+			return ret;
+		if (ret > 0) {
+			ret = send_buffer(fd, (char *) result.data);
+			free(result.data);
+			if (ret < 0)
+				return ret;
+		}
+	}
+	if (flags & CHECK_MOODS) {
+		ret = send_callback_request(mood_check_callback, NULL, &result);
+		if (ret < 0)
+			return ret;
+		if (ret > 0) {
+			ret = send_buffer(fd, (char *) result.data);
+			free(result.data);
+			if (ret < 0)
+				return ret;
+		}
+	}
+	return 1;
+}
+
+void afs_event(enum afs_events event, struct para_buffer *pb,
+		void *data)
+{
+	int i, ret;
+
+	for (i = 0; i < NUM_AFS_TABLES; i++) {
+		struct afs_table *t = &afs_tables[i];
+		if (!t->event_handler)
+			continue;
+		ret = t->event_handler(event, pb, data);
+		if (ret < 0)
+			PARA_CRIT_LOG("%s\n", para_strerror(-ret));
+	}
+}
+
+int images_event_handler(__a_unused enum afs_events event,
+	__a_unused  struct para_buffer *pb, __a_unused void *data)
+{
+	return 1;
+}
+
+int lyrics_event_handler(__a_unused enum afs_events event,
+	__a_unused struct para_buffer *pb, __a_unused void *data)
+{
+	return 1;
+}