/*
- * Copyright (C) 2007-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2011 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/** \file afs.c Paraslash's audio file selector. */
+#include <regex.h>
#include <signal.h>
#include <fnmatch.h>
+#include <openssl/rc4.h>
+#include <osl.h>
+
#include "server.cmdline.h"
#include "para.h"
#include "error.h"
+#include "crypt.h"
#include "string.h"
#include "afh.h"
#include "afs.h"
#include "sched.h"
#include "signal.h"
#include "fd.h"
+#include "mood.h"
/** The osl tables used by afs. \sa blob.c. */
enum afs_table_num {
};
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},
+ [TBLNUM_AUDIO_FILES] = {.init = aft_init, .name = "audio_files"},
+ [TBLNUM_ATTRIBUTES] = {.init = attribute_init, .name = "attributes"},
+ [TBLNUM_SCORES] = {.init = score_init, .name = "scores"},
+ [TBLNUM_MOODS] = {.init = moods_init, .name = "moods"},
+ [TBLNUM_LYRICS] = {.init = lyrics_init, .name = "lyrics"},
+ [TBLNUM_IMAGES] = {.init = images_init, .name = "images"},
+ [TBLNUM_PLAYLIST] = {.init = playlists_init, .name = "playlists"},
};
struct command_task {
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.
*
size_t result_size;
};
+static int dispatch_result(int result_shmid, callback_result_handler *handler,
+ void *private_result_data)
+{
+ struct osl_object result;
+ void *result_shm;
+ int ret2, ret = shm_attach(result_shmid, ATTACH_RO, &result_shm);
+ struct callback_result *cr = result_shm;
+
+ if (ret < 0) {
+ PARA_ERROR_LOG("attach failed: %s\n", para_strerror(-ret));
+ return ret;
+ }
+ result.size = cr->result_size;
+ result.data = result_shm + sizeof(*cr);
+ if (result.size) {
+ assert(handler);
+ ret = handler(&result, private_result_data);
+ if (ret < 0)
+ PARA_NOTICE_LOG("result handler error: %s\n",
+ para_strerror(-ret));
+ }
+ ret2 = shm_detach(result_shm);
+ if (ret2 < 0) {
+ PARA_ERROR_LOG("detach failed: %s\n", para_strerror(-ret2));
+ if (ret >= 0)
+ ret = ret2;
+ }
+ return ret;
+}
+
/**
* Ask the afs process to call a given function.
*
* shmid are passed to that function as an osl object. The private_result_data
* pointer is passed as the second argument to \a result_handler.
*
- * \return Negative, on errors, the return value of the callback function
- * otherwise.
+ * \return Standard.
*
* \sa send_option_arg_callback_request(), send_standard_callback_request().
*/
void *private_result_data)
{
struct callback_query *cq;
- int num_results = 0, ret, fd = -1, query_shmid, result_shmid;
- void *query_shm, *result_shm;
+ int ret, fd = -1, query_shmid, result_shmid;
+ void *query_shm;
char buf[sizeof(afs_socket_cookie) + sizeof(int)];
size_t query_shm_size = sizeof(*cq);
+ int dispatch_error = 0;
if (query)
query_shm_size += query->size;
*(uint32_t *) buf = afs_socket_cookie;
*(int *) (buf + sizeof(afs_socket_cookie)) = query_shmid;
- ret = create_remote_socket(conf.afs_socket_arg);
+ ret = connect_local_socket(conf.afs_socket_arg);
if (ret < 0)
goto out;
fd = ret;
ret = send_bin_buffer(fd, buf, sizeof(buf));
if (ret < 0)
goto out;
+ /*
+ * Read all shmids from afs.
+ *
+ * Even if the dispatcher returns an error we _must_ continue to read
+ * shmids from fd so that we can destroy all shared memory areas that
+ * have been created for us by the afs process.
+ */
for (;;) {
ret = recv_bin_buffer(fd, buf, sizeof(int));
if (ret <= 0)
goto out;
- if (ret != sizeof(int)) {
- ret = -E_AFS_SHORT_READ;
- goto out;
- }
+ assert(ret == sizeof(int));
ret = *(int *) buf;
- if (ret <= 0)
- goto out;
+ assert(ret > 0);
result_shmid = ret;
- ret = shm_attach(result_shmid, ATTACH_RO, &result_shm);
- if (ret >= 0) {
- struct callback_result *cr = result_shm;
- struct osl_object result;
- num_results++;
- result.size = cr->result_size;
- result.data = result_shm + sizeof(*cr);
- if (result.size) {
- assert(result_handler);
- ret = result_handler(&result, private_result_data);
- if (shm_detach(result_shm) < 0)
- PARA_ERROR_LOG("can not detach result\n");
- }
- } else
- PARA_ERROR_LOG("attach result failed: %d\n", ret);
- if (shm_destroy(result_shmid) < 0)
- PARA_ERROR_LOG("destroy result failed\n");
+ if (!dispatch_error) {
+ ret = dispatch_result(result_shmid, result_handler,
+ private_result_data);
+ if (ret < 0)
+ dispatch_error = 1;
+ }
+ ret = shm_destroy(result_shmid);
if (ret < 0)
- break;
+ PARA_CRIT_LOG("destroy result failed: %s\n",
+ para_strerror(-ret));
}
out:
if (shm_destroy(query_shmid) < 0)
- PARA_ERROR_LOG("%s\n", "shm destroy error");
+ PARA_CRIT_LOG("shm destroy error\n");
if (fd >= 0)
close(fd);
- if (ret >= 0)
- ret = num_results;
// PARA_DEBUG_LOG("callback_ret: %d\n", ret);
return ret;
}
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);
+ int ret = osl(osl_get_object(pmd->table, row, pmd->match_col_num, &name_obj));
const char *pattern_txt = (const char *)pmd->patterns.data;
if (ret < 0)
*
* \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().
+ * \return Standard.
*/
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);
+ return osl(osl_rbtree_loop_reverse(pmd->table, pmd->loop_col_num, pmd,
+ action_if_pattern_matches));
+ return osl(osl_rbtree_loop(pmd->table, pmd->loop_col_num, pmd,
+ action_if_pattern_matches));
}
/**
return strncmp(str1, str2, PARA_MIN(obj1->size, obj2->size));
}
-/*
- * write input from fd to dynamically allocated buffer,
- * but maximal max_size byte.
- */
-static int fd2buf(int fd, unsigned max_size, struct osl_object *obj)
-{
- const size_t chunk_size = 1024;
- size_t size = 2048, received = 0;
- int ret;
- char *buf = para_malloc(size);
-
- for (;;) {
- ret = recv_bin_buffer(fd, buf + received, chunk_size);
- if (ret <= 0)
- break;
- received += ret;
- if (received + chunk_size >= size) {
- size *= 2;
- ret = -E_INPUT_TOO_LARGE;
- if (size > max_size)
- break;
- buf = para_realloc(buf, size);
- }
- }
- obj->data = buf;
- obj->size = received;
- if (ret < 0)
- free(buf);
- return ret;
-}
-
-/**
- * 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.
- * \param result_handler See \ref send_callback_request.
- * \param private_result_data See \ref send_callback_request.
- *
- * 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 \a fd, the result
- * is concatenated with the buffer given by \a arg_obj, and the combined buffer
- * is made available to the afs process via the callback method. See \ref
- * send_callback_request for details.
- *
- * \return Negative on errors, the return value of the underlying call to
- * send_callback_request() otherwise.
- */
-int stdin_command(int fd, struct osl_object *arg_obj, callback_function *f,
- unsigned max_len, callback_result_handler *result_handler,
- void *private_result_data)
-{
- struct osl_object query, stdin_obj;
- int ret;
-
- ret = send_buffer(fd, AWAITING_DATA_MSG);
- if (ret < 0)
- return ret;
- 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_obj.data, stdin_obj.size);
- free(stdin_obj.data);
- ret = send_callback_request(f, &query, result_handler, private_result_data);
- free(query.data);
- return ret;
-}
-
static int pass_afd(int fd, char *buf, size_t size)
{
struct msghdr msg = {.msg_iov = NULL};
* Result handler for sending data to the para_client process.
*
* \param result The data to be sent.
- * \param fd_ptr Pointer to the file descriptor.
+ * \param private Pointer to rc4 context.
*
- * \return The return value of the underlying call to send_bin_buffer().
+ * \return The return value of the underlying call to rc4_send_bin_buffer().
*
- * \sa \ref callback_result_handler.
+ * \sa \ref callback_result_handler, \ref rc4_send_bin_buffer().
*/
-int send_result(struct osl_object *result, void *fd_ptr)
+int rc4_send_result(struct osl_object *result, void *private)
{
- int fd = *(int *)fd_ptr;
+ struct rc4_context *rc4c = private;
+
if (!result->size)
return 1;
- return send_bin_buffer(fd, result->data, result->size);
+ return rc4_send_bin_buffer(rc4c, result->data, result->size);
}
-int com_select(int fd, int argc, char * const * const argv)
+int com_select(struct rc4_context *rc4c, int argc, char * const * const argv)
{
struct osl_object query;
query.data = argv[1];
query.size = strlen(argv[1]) + 1;
return send_callback_request(com_select_callback, &query,
- &send_result, &fd);
+ &rc4_send_result, rc4c);
}
static void init_admissible_files(char *arg)
else {
char *home = para_homedir();
database_dir = make_message(
- "%s/.paraslash/afs_database", home);
+ "%s/.paraslash/afs_database-0.4", home);
free(home);
}
}
para_fd_set(st->fd, &s->rfds, &s->max_fileno);
}
-static void signal_post_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();
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;
{
struct signal_task *st = &signal_task_struct;
- if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) {
- PARA_EMERG_LOG("failed to ignore SIGPIPE\n");
- exit(EXIT_FAILURE);
- }
- if (signal(SIGUSR1, SIG_IGN) == SIG_ERR) {
- PARA_EMERG_LOG("failed to ignore SIGUSR1\n");
- exit(EXIT_FAILURE);
- }
+ para_sigaction(SIGPIPE, SIG_IGN);
st->fd = para_signal_init();
PARA_INFO_LOG("signal pipe: fd %d\n", st->fd);
para_install_sighandler(SIGINT);
para_install_sighandler(SIGHUP);
st->task.pre_select = signal_pre_select;
- st->task.post_select = signal_post_select;
+ st->task.post_select = afs_signal_post_select;
sprintf(st->task.status, "signal task");
register_task(&st->task);
}
return shm_detach(query_shm);
}
-static int execute_server_command(void)
+static int execute_server_command(fd_set *rfds)
{
char buf[8];
- int ret = recv_bin_buffer(server_socket, buf, sizeof(buf) - 1);
+ size_t n;
+ int ret = read_nonblock(server_socket, buf, sizeof(buf) - 1, rfds, &n);
- if (ret <= 0) {
- if (!ret)
- ret = -ERRNO_TO_PARA_ERROR(ECONNRESET);
- goto err;
- }
- buf[ret] = '\0';
- PARA_DEBUG_LOG("received: %s\n", buf);
- ret = -E_BAD_CMD;
+ if (ret < 0 || n == 0)
+ return ret;
+ buf[n] = '\0';
if (strcmp(buf, "new"))
- goto err;
- ret = open_next_audio_file();
-err:
- return ret;
+ return -E_BAD_CMD;
+ return open_next_audio_file();
}
-static void execute_afs_command(int fd, uint32_t expected_cookie)
+/* returns 0 if no data available, 1 else */
+static int execute_afs_command(int fd, fd_set *rfds, 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));
+ size_t n;
+ int ret = read_nonblock(fd, buf, sizeof(buf), rfds, &n);
if (ret < 0)
goto err;
- if (ret != sizeof(buf)) {
+ if (n == 0)
+ return 0;
+ if (n != sizeof(buf)) {
PARA_NOTICE_LOG("short read (%d bytes, expected %lu)\n",
ret, (long unsigned) sizeof(buf));
- return;
+ return 1;
}
cookie = *(uint32_t *)buf;
if (cookie != expected_cookie) {
- PARA_NOTICE_LOG("received invalid cookie(got %u, expected %u)\n",
+ PARA_NOTICE_LOG("received invalid cookie (got %u, expected %u)\n",
(unsigned)cookie, (unsigned)expected_cookie);
- return;
+ return 1;
}
query_shmid = *(int *)(buf + sizeof(cookie));
if (query_shmid < 0) {
PARA_WARNING_LOG("received invalid query shmid %d)\n",
query_shmid);
- return;
+ return 1;
}
ret = call_callback(fd, query_shmid);
if (ret >= 0)
- return;
+ return 1;
err:
PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
+ return 1;
}
/** Shutdown connection if query has not arrived until this many seconds. */
struct afs_client *client, *tmp;
int fd, ret;
- if (FD_ISSET(server_socket, &s->rfds)) {
- ret = execute_server_command();
- if (ret < 0) {
- PARA_EMERG_LOG("%s\n", para_strerror(-ret));
- sched_shutdown();
- return;
- }
+ ret = execute_server_command(&s->rfds);
+ if (ret < 0) {
+ PARA_EMERG_LOG("%s\n", para_strerror(-ret));
+ sched_shutdown();
+ return;
}
-
/* 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 */
+ ret = execute_afs_command(client->fd, &s->rfds, ct->cookie);
+ if (ret == 0) { /* prevent bogus connection flooding */
struct timeval diff;
tv_diff(now, &client->connect_time, &diff);
if (diff.tv_sec < AFS_CLIENT_TIMEOUT)
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));
{
uint32_t table_mask = *(uint32_t *)query->data;
int i, ret;
- char *buf;
+ struct para_buffer pb = {.buf = NULL};
close_afs_tables();
for (i = 0; i < NUM_AFS_TABLES; i++) {
ret = t->create(database_dir);
if (ret < 0)
goto out;
+ para_printf(&pb, "successfully created %s table\n", t->name);
}
ret = open_afs_tables();
out:
- if (ret >= 0)
- buf = make_message("successfully created afs table(s)\n");
- else
- buf = make_message("%s\n", para_strerror(-ret));
- pass_buffer_as_shm(buf, strlen(buf), &fd);
- free(buf);
+ if (ret < 0)
+ para_printf(&pb, "%s\n", para_strerror(-ret));
+ if (pb.buf)
+ pass_buffer_as_shm(pb.buf, pb.offset, &fd);
+ free(pb.buf);
}
-int com_init(int fd, int argc, char * const * const argv)
+int com_init(struct rc4_context *rc4c, int argc, char * const * const argv)
{
int i, j, ret;
uint32_t table_mask = (1 << (NUM_AFS_TABLES + 1)) - 1;
return -E_BAD_TABLE_NAME;
}
}
- ret = send_callback_request(create_tables_callback, &query, &send_result, &fd);
+ ret = send_callback_request(create_tables_callback, &query,
+ rc4_send_result, rc4c);
if (ret < 0)
- return send_va_buffer(fd, "%s\n", para_strerror(-ret));
+ return rc4_send_va_buffer(rc4c, "%s\n", para_strerror(-ret));
return ret;
}
CHECK_PLAYLISTS = 4
};
-int com_check(int fd, int argc, char * const * const argv)
+int com_check(struct rc4_context *rc4c, int argc, char * const * const argv)
{
unsigned flags = 0;
int i, ret;
if (!flags)
flags = ~0U;
if (flags & CHECK_AFT) {
- ret = send_callback_request(aft_check_callback, NULL, send_result, &fd);
+ ret = send_callback_request(aft_check_callback, NULL,
+ rc4_send_result, rc4c);
if (ret < 0)
return ret;
}
if (flags & CHECK_PLAYLISTS) {
- ret = send_callback_request(playlist_check_callback, NULL, send_result, &fd);
+ ret = send_callback_request(playlist_check_callback,
+ NULL, rc4_send_result, rc4c);
if (ret < 0)
return ret;
}
if (flags & CHECK_MOODS) {
- ret = send_callback_request(mood_check_callback, NULL, send_result, &fd);
+ ret = send_callback_request(mood_check_callback, NULL,
+ rc4_send_result, rc4c);
if (ret < 0)
return ret;
}
}
}
+/**
+ * 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)
{
projects / paraslash.git / blobdiff