X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=95f6b311bb8597527f894d525f8cdd6c8eed5ca8;hp=cafe9b474d11be29ba911c929d43fb9e05b60b8e;hb=53d503ce;hpb=02baea145799b33cc82ffb227966e77182b5f790

diff --git a/afs.c b/afs.c
index cafe9b47..95f6b311 100644
--- a/afs.c
+++ b/afs.c
@@ -6,8 +6,11 @@
 
 /** \file afs.c Paraslash's audio file selector. */
 
+#include <signal.h>
+#include <fnmatch.h>
 #include "server.cmdline.h"
 #include "para.h"
+#include "string.h"
 #include "afh.h"
 #include "server.h"
 #include "error.h"
@@ -17,7 +20,6 @@
 #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. */
@@ -121,7 +131,7 @@ 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.
@@ -278,6 +288,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.
  *
@@ -300,40 +354,6 @@ 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 buffer,
  * but maximal max_size byte.
@@ -446,53 +466,31 @@ int close_audio_file(struct audio_file_data *afd)
 	return para_munmap(afd->map.data, afd->map.size);
 }
 
-#if 0
-static void play_loop(enum play_mode current_play_mode)
-{
-	int i, ret;
-	struct audio_file_data afd;
-
-	afd.current_play_mode = current_play_mode;
-	for (i = 0; i < 0; i++) {
-		ret = open_next_audio_file(&afd);
-		if (ret < 0) {
-			PARA_ERROR_LOG("failed to open next audio file: %d\n", ret);
-			return;
-		}
-		PARA_NOTICE_LOG("next audio file: %s, score: %li\n", afd.path, afd.score);
-		sleep(1);
-		close_audio_file(&afd);
-	}
-}
-#endif
-
-
 static enum play_mode init_admissible_files(void)
 {
-	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 = change_current_mood(given_mood);
-		if (ret >= 0) {
-			if (given_playlist)
-				PARA_WARNING_LOG("ignoring playlist %s\n",
-					given_playlist);
-			return PLAY_MODE_MOOD;
+	int ret = 0;
+	char *arg = conf.afs_initial_mode_arg;
+
+	if (conf.afs_initial_mode_given) {
+		if (!strncmp(arg, "p:", 2)) {
+			ret = playlist_open(arg + 2);
+			if (ret >= 0)
+				return PLAY_MODE_PLAYLIST;
+			goto dummy;
 		}
+		if (!strncmp(arg, "m:", 2)) {
+			ret = change_current_mood(arg + 2);
+			if (ret >= 0)
+				return PLAY_MODE_MOOD;
+			goto dummy;
+		}
+		PARA_ERROR_LOG("bad afs initial mode arg: %s\n", arg);
 	}
-	if (given_playlist) {
-		ret = playlist_open(given_playlist);
-		if (ret >= 0)
-			return PLAY_MODE_PLAYLIST;
-	}
-	ret = change_current_mood(NULL); /* open first available mood */
-	if (ret >= 0)
-		return PLAY_MODE_MOOD;
-	change_current_mood(""); /* open dummy mood, always successful */
+dummy:
+	if (ret < 0)
+		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+	PARA_NOTICE_LOG("defaulting to dummy mood\n");
+	change_current_mood(""); /* always successful */
 	return PLAY_MODE_MOOD;
 }
 
@@ -518,6 +516,62 @@ static int setup_command_socket_or_die(void)
 	return ret;
 }
 
+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 open_afs_tables(void)
+{
+	int i, ret;
+
+	get_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));
+	}
+	if (ret >= 0)
+		return ret;
+	do
+		afs_tables[i].close();
+	while (i--);
+	return ret;
+}
+
 static int server_socket;
 static struct command_task command_task_struct;
 static struct signal_task signal_task_struct;
@@ -528,20 +582,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);
-	close_current_mood();
-	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;
@@ -559,8 +599,13 @@ static void signal_post_select(struct sched *s, struct task *t)
 	t->ret = 1;
 	if (st->signum == SIGUSR1)
 		return; /* ignore SIGUSR1 */
+	if (st->signum == SIGHUP) {
+		close_afs_tables();
+		t->ret = open_afs_tables();
+		return;
+	}
 	PARA_NOTICE_LOG("caught signal %d\n", st->signum);
-	t->ret = -E_SIGNAL_CAUGHT;
+	t->ret = -E_AFS_SIGNAL;
 	unregister_tasks();
 }
 
@@ -572,6 +617,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;
@@ -580,11 +626,23 @@ static void register_signal_task(void)
 	register_task(&st->task);
 }
 
+static struct list_head afs_client_list;
+
+struct afs_client {
+	struct list_head node;
+	int fd;
+	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(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;
 }
 
 /*
@@ -642,54 +700,76 @@ out:
 	return ret;
 }
 
-static void command_post_select(struct sched *s, struct task *t)
+static void execute_afs_command(int fd, uint32_t expected_cookie)
 {
-	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;
+	int query_shmid;
+	char buf[sizeof(cookie) + sizeof(query_shmid)];
+	int ret = recv_bin_buffer(fd, buf, sizeof(buf));
 
-	t->ret = 1;
-	if (!FD_ISSET(ct->fd, &s->rfds))
-		return;
-	t->ret = para_accept(ct->fd, &unix_addr, sizeof(unix_addr));
-	if (t->ret < 0)
+	if (ret < 0) {
+		PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-ret));
 		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)) {
+	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;
+
+	/* First, 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);
+	}
+	/* Next, 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;
+	}
+	client = para_malloc(sizeof(*client));
+	client->fd = t->ret;
+	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)
@@ -705,86 +785,28 @@ 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));
@@ -803,7 +825,7 @@ __noreturn int afs_init(uint32_t cookie, int socket_fd)
 	ret = sched(&s);
 	if (ret < 0)
 		PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
-	close_afs_tables(OSL_MARK_CLEAN);
+	close_afs_tables();
 	exit(EXIT_FAILURE);
 }
 
@@ -813,15 +835,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;
 	}
@@ -836,15 +858,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,9 +882,17 @@ int com_init(int fd, int argc, char * const * const argv)
 	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
 };