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

diff --git a/afs.c b/afs.c
index cafe9b47..de713fa7 100644
--- a/afs.c
+++ b/afs.c
@@ -6,6 +6,8 @@
 
 /** \file afs.c Paraslash's audio file selector. */
 
+#include <signal.h>
+#include <fnmatch.h>
 #include "server.cmdline.h"
 #include "para.h"
 #include "afh.h"
@@ -278,6 +280,42 @@ 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;
+}
+
+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 +338,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,46 +450,21 @@ 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 (conf.mood_given) {
+		ret = change_current_mood(conf.mood_arg);
 		if (ret >= 0) {
-			if (given_playlist)
+			if (conf.playlist_given)
 				PARA_WARNING_LOG("ignoring playlist %s\n",
-					given_playlist);
+					conf.playlist_arg);
 			return PLAY_MODE_MOOD;
 		}
 	}
-	if (given_playlist) {
-		ret = playlist_open(given_playlist);
+	if (conf.playlist_given) {
+		ret = playlist_open(conf.playlist_arg);
 		if (ret >= 0)
 			return PLAY_MODE_PLAYLIST;
 	}
@@ -518,16 +497,6 @@ static int setup_command_socket_or_die(void)
 	return ret;
 }
 
-static int server_socket;
-static struct command_task command_task_struct;
-static struct signal_task signal_task_struct;
-
-static void unregister_tasks(void)
-{
-	unregister_task(&command_task_struct.task);
-	unregister_task(&signal_task_struct.task);
-}
-
 static void close_afs_tables(enum osl_close_flags flags)
 {
 	PARA_NOTICE_LOG("closing afs_tables\n");
@@ -542,6 +511,86 @@ static void close_afs_tables(enum osl_close_flags flags)
 	aft_shutdown(flags);
 }
 
+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;
+}
+
+static int server_socket;
+static struct command_task command_task_struct;
+static struct signal_task signal_task_struct;
+
+static void unregister_tasks(void)
+{
+	unregister_task(&command_task_struct.task);
+	unregister_task(&signal_task_struct.task);
+}
+
 static void signal_pre_select(struct sched *s, struct task *t)
 {
 	struct signal_task *st = t->private_data;
@@ -559,6 +608,11 @@ 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(OSL_MARK_CLEAN);
+		t->ret = open_afs_tables();
+		return;
+	}
 	PARA_NOTICE_LOG("caught signal %d\n", st->signum);
 	t->ret = -E_SIGNAL_CAUGHT;
 	unregister_tasks();
@@ -572,6 +626,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 +635,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 +709,75 @@ 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. */
 	call_callback(fd, query_shmid);
+}
+
+#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 flodding */
+			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)
@@ -711,80 +799,14 @@ void register_tasks(uint32_t cookie)
 	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)
 {
 	enum play_mode current_play_mode;
 	struct sched s;
-	int ret = open_afs_tables();
+	int ret;
+
+	INIT_LIST_HEAD(&afs_client_list);
+	ret = open_afs_tables();
 
 	if (ret < 0) {
 		PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));