-/*
- * Copyright (C) 2007-2008 Andre Noll <maan@systemlinux.org>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2007 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
/** \file afs.c Paraslash's audio file selector. */
+#include <netinet/in.h>
+#include <sys/socket.h>
+#include <regex.h>
#include <signal.h>
#include <fnmatch.h>
-#include "server.cmdline.h"
+#include <osl.h>
+#include <lopsub.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
+#include <lopsub.h>
+
+#include "server.lsg.h"
+#include "server_cmd.lsg.h"
#include "para.h"
#include "error.h"
+#include "crypt.h"
#include "string.h"
#include "afh.h"
#include "afs.h"
-#include "server.h"
-#include <dirent.h> /* readdir() */
-#include <sys/mman.h>
-#include <sys/time.h>
#include "net.h"
+#include "server.h"
#include "ipc.h"
#include "list.h"
#include "sched.h"
-#include "signal.h"
#include "fd.h"
+#include "signal.h"
+#include "mood.h"
+#include "sideband.h"
+#include "command.h"
-/** The osl tables used by afs. \sa blob.c. */
+/** The osl tables used by afs. \sa \ref blob.c. */
enum afs_table_num {
- /** Contains audio file information. See aft.c. */
+ /** Contains audio file information. See \ref aft.c. */
TBLNUM_AUDIO_FILES,
- /** The table for the paraslash attributes. See attribute.c. */
+ /** The table for the paraslash attributes. See \ref attribute.c. */
TBLNUM_ATTRIBUTES,
/**
* Paraslash's scoring system is based on Gaussian normal
* distributions, and the relevant data is stored in the rbtrees of an
- * osl table containing only volatile columns. See score.c for
+ * osl table containing only volatile columns. See \ref score.c for
* details.
*/
TBLNUM_SCORES,
/**
* A standard blob table containing the mood definitions. For details
- * see mood.c.
+ * see \ref mood.c.
*/
TBLNUM_MOODS,
/** A blob table containing lyrics on a per-song basis. */
};
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 {
/** The file descriptor for the local socket. */
int fd;
- /**
- * Value sent by the command handlers to identify themselves as
- * children of the running para_server.
- */
- uint32_t cookie;
/** The associated task structure. */
- struct task task;
+ struct task *task;
};
+extern int mmd_mutex;
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 struct signal_task *signal_task;
static enum play_mode current_play_mode;
-static char *current_mop; /* mode or playlist specifier. NULL means dummy mooe */
-
+static char *current_mop; /* mode or playlist specifier. NULL means dummy mood */
-/**
- * A random number used to "authenticate" the connection.
- *
- * para_server picks this number by random before forking the afs process. The
- * command handlers write this number together with the id of the shared memory
- * area containing the query. This way, a malicious local user has to know this
- * number to be able to cause the afs process to crash by sending fake queries.
- */
extern uint32_t afs_socket_cookie;
/**
* area is written to the command socket.
*
* The afs process accepts connections on the command socket and reads the
- * shared memory id, attaches the corresponing area, calls the given handler to
+ * shared memory id, attaches the corresponding area, calls the given handler to
* perform the desired action and to optionally compute a result.
*
* The result and a \p callback_result structure is then written to another
* command socket, so that the handler process can read the id, attach the
* shared memory area and use the result.
*
- * \sa struct callback_result.
+ * \sa \ref struct callback_result.
*/
struct callback_query {
/** The function to be called. */
- callback_function *handler;
+ afs_callback *handler;
/** The number of bytes of the query */
size_t query_size;
};
/**
* Structure embedded in the result of a callback.
*
- * If the callback produced a result, an instance of that structure is embeeded
+ * If the callback produced a result, an instance of that structure is embedded
* into the shared memory area holding the result, mainly to let the command
* handler know the size of the result.
*
- * \sa struct callback_query.
+ * \sa \ref struct callback_query.
*/
struct callback_result {
/** The number of bytes of the result. */
size_t result_size;
+ /** The band designator (loglevel for the result). */
+ uint8_t band;
};
+static int dispatch_result(int result_shmid, callback_result_handler *handler,
+ void *private_result_data)
+{
+ struct osl_object result;
+ void *result_shm;
+ /* must attach r/w as result.data might get encrypted in-place. */
+ int ret2, ret = shm_attach(result_shmid, ATTACH_RW, &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);
+ assert(handler);
+ ret = handler(&result, cr->band, private_result_data);
+ 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.
*
* \param f The function to be called.
* \param query Pointer to arbitrary data for the callback.
- * \param result Callback result will be stored here.
+ * \param result_handler Called for each shm area sent by the callback.
+ * \param private_result_data Passed verbatim to \a result_handler.
*
- * This function creates a shared memory area, copies the buffer pointed to by
- * query to that area and notifies the afs process that \a f should be
- * called ASAP.
+ * This function creates a socket for communication with the afs process and a
+ * shared memory area (sma) to which the buffer pointed to by \a query is
+ * copied. It then notifies the afs process that the callback function \a f
+ * should be executed by sending the shared memory identifier (shmid) to the
+ * socket.
*
- * \return Negative, on errors, the return value of the callback function
- * otherwise.
+ * If the callback produces a result, it sends any number of shared memory
+ * identifiers back via the socket. For each such identifier received, \a
+ * result_handler is called. The contents of the sma identified by the received
+ * 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.
*
- * \sa send_option_arg_callback_request(), send_standard_callback_request().
+ * \return Number of shared memory areas dispatched on success, negative on
+ * errors.
*/
-int send_callback_request(callback_function *f, struct osl_object *query,
- struct osl_object *result)
+int send_callback_request(afs_callback *f, struct osl_object *query,
+ callback_result_handler *result_handler,
+ void *private_result_data)
{
struct callback_query *cq;
- struct callback_result *cr;
int ret, fd = -1, query_shmid, result_shmid;
- void *query_shm, *result_shm;
+ void *query_shm;
char buf[sizeof(afs_socket_cookie) + sizeof(int)];
size_t query_shm_size = sizeof(*cq);
+ int dispatch_error = 0, num_dispatched = 0;
if (query)
query_shm_size += query->size;
if (ret < 0)
goto out;
- *(uint32_t *) buf = afs_socket_cookie;
- *(int *) (buf + sizeof(afs_socket_cookie)) = query_shmid;
+ *(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(OPT_STRING_VAL(AFS_SOCKET));
if (ret < 0)
goto out;
fd = ret;
- ret = send_bin_buffer(fd, buf, sizeof(buf));
+ ret = write_all(fd, buf, sizeof(buf));
if (ret < 0)
goto out;
- ret = recv_bin_buffer(fd, buf, sizeof(buf));
- if (ret < 0)
- goto out;
- if (ret != sizeof(int)) {
- ret = -E_AFS_SHORT_READ;
- goto out;
- }
- ret = *(int *) buf;
- if (ret <= 0)
- goto out;
- result_shmid = ret;
- ret = shm_attach(result_shmid, ATTACH_RO, &result_shm);
- if (ret >= 0) {
- assert(result);
- cr = result_shm;
- result->size = cr->result_size;
- result->data = para_malloc(result->size);
- memcpy(result->data, result_shm + sizeof(*cr), result->size);
- ret = shm_detach(result_shm);
+ /*
+ * 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;
+ assert(ret == sizeof(int));
+ ret = *(int *) buf;
+ assert(ret > 0);
+ result_shmid = ret;
+ ret = dispatch_result(result_shmid, result_handler,
+ private_result_data);
+ if (ret < 0 && dispatch_error >= 0)
+ dispatch_error = ret;
+ ret = shm_destroy(result_shmid);
if (ret < 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");
- ret = 1;
+ PARA_CRIT_LOG("destroy result failed: %s\n",
+ para_strerror(-ret));
+ num_dispatched++;
+ }
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);
-// PARA_DEBUG_LOG("callback_ret: %d\n", ret);
- return ret;
+ if (dispatch_error < 0)
+ return dispatch_error;
+ if (ret < 0)
+ return ret;
+ return num_dispatched;
}
/**
- * Send a callback request passing an options structure and an argument vector.
+ * Wrapper for send_callback_request() which passes a lopsub parse result.
*
- * \param options pointer to an arbitrary data structure.
- * \param argc Argument count.
- * \param argv Standard argument vector.
* \param f The callback function.
- * \param result The result of the query is stored here.
+ * \param cmd Needed for (de-)serialization.
+ * \param lpr Must match cmd.
+ * \param private_result_data Passed to send_callback_request().
*
- * Some commands have a couple of options that are parsed in child context for
- * syntactic correctness and are stored in a special options structure for that
- * command. This function allows to pass such a structure together with a list
- * of further arguments (often a list of audio files) to the parent process.
+ * This function serializes the parse result given by the lpr pointer into a
+ * buffer. The buffer is sent as the query to the afs process with the callback
+ * mechanism.
*
- * \sa send_standard_callback_request(), send_callback_request().
+ * \return The return value of the underlying call to send_callback_request().
*/
-int send_option_arg_callback_request(struct osl_object *options,
- int argc, char * const * const argv, callback_function *f,
- struct osl_object *result)
+int send_lls_callback_request(afs_callback *f,
+ const struct lls_command * const cmd,
+ struct lls_parse_result *lpr, void *private_result_data)
{
- char *p;
- int i, ret;
- struct osl_object query = {.size = options? options->size : 0};
-
- for (i = 0; i < argc; i++)
- query.size += strlen(argv[i]) + 1;
- query.data = para_malloc(query.size);
- p = query.data;
- if (options) {
- memcpy(query.data, options->data, options->size);
- p += options->size;
- }
- for (i = 0; i < argc; i++) {
- strcpy(p, argv[i]); /* OK */
- p += strlen(argv[i]) + 1;
- }
- ret = send_callback_request(f, &query, result);
- free(query.data);
+ struct osl_object query;
+ char *buf = NULL;
+ int ret = lls_serialize_parse_result(lpr, cmd, &buf, &query.size);
+
+ assert(ret >= 0);
+ query.data = buf;
+ ret = send_callback_request(f, &query, afs_cb_result_handler,
+ private_result_data);
+ free(buf);
return ret;
}
-/**
- * Send a callback request with an argument vector only.
- *
- * \param argc The same meaning as in send_option_arg_callback_request().
- * \param argv The same meaning as in send_option_arg_callback_request().
- * \param f The same meaning as in send_option_arg_callback_request().
- * \param result The same meaning as in send_option_arg_callback_request().
- *
- * This is similar to send_option_arg_callback_request(), but no options buffer
- * is passed to the parent process.
- *
- * \return The return value of the underlying call to
- * send_option_arg_callback_request().
- */
-int send_standard_callback_request(int argc, char * const * const argv,
- callback_function *f, struct osl_object *result)
-{
- 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;
+ int i, ret;
+ ret = osl(osl_get_object(pmd->table, row, pmd->match_col_num,
+ &name_obj));
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) {
+ if (lls_num_inputs(pmd->lpr) == 0) {
+ if (pmd->pm_flags & PM_NO_PATTERN_MATCHES_EVERYTHING) {
+ pmd->num_matches++;
+ return pmd->action(pmd->table, row, name, pmd->data);
+ }
+ }
+ i = pmd->input_skip;
+ for (;;) {
+ if (i >= lls_num_inputs(pmd->lpr))
+ break;
+ p = lls_input(i, pmd->lpr);
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);
+ if (ret != FNM_NOMATCH) {
+ if (ret != 0)
+ return -E_FNMATCH;
+ ret = pmd->action(pmd->table, row, name, pmd->data);
+ if (ret >= 0)
+ pmd->num_matches++;
+ return ret;
+
+ }
+ i++;
}
return 1;
}
*
* \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));
}
/**
* \a obj1 is found, respectively, to be less than, to match, or be greater than
* obj2.
*
- * \sa strcmp(3), strncmp(3), osl_compare_func.
+ * \sa strcmp(3), strncmp(3).
*/
int string_compare(const struct osl_object *obj1, const struct osl_object *obj2)
{
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 The result of the query is stored here.
- *
- * 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 parent process via shared memory.
- *
- * \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, struct osl_object *result)
-{
- 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);
- 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];
+ char control[255] __a_aligned(8);
int ret;
struct iovec iov;
}
/**
- * Open the audio file with highest score.
+ * Pass the fd of the next audio file to the server process.
*
* 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
*
* \return Standard.
*
- * \sa open_and_update_audio_file().
+ * \sa \ref open_and_update_audio_file().
*/
-int open_next_audio_file(void)
+static int open_next_audio_file(void)
{
- struct osl_row *aft_row;
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);
+
+ ret = open_and_update_audio_file(&afd);
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;
no_admissible_files:
*(uint32_t *)buf = NO_ADMISSIBLE_FILES;
*(uint32_t *)(buf + 4) = (uint32_t)0;
- return send_bin_buffer(server_socket, buf, 8);
+ return write_all(server_socket, buf, 8);
}
/* Never fails if arg == NULL */
-static int activate_mood_or_playlist(char *arg, int *num_admissible)
+static int activate_mood_or_playlist(const char *arg, int *num_admissible,
+ char **errmsg)
{
enum play_mode mode;
int ret;
if (!arg) {
- ret = change_current_mood(NULL); /* always successful */
+ ret = change_current_mood(NULL, NULL); /* always successful */
mode = PLAY_MODE_MOOD;
} else {
if (!strncmp(arg, "p/", 2)) {
ret = playlist_open(arg + 2);
+ if (ret < 0 && errmsg)
+ *errmsg = make_message( "could not open %s",
+ arg);
mode = PLAY_MODE_PLAYLIST;
} else if (!strncmp(arg, "m/", 2)) {
- ret = change_current_mood(arg + 2);
+ ret = change_current_mood(arg + 2, errmsg);
mode = PLAY_MODE_MOOD;
- } else
- return -E_AFS_SYNTAX;
+ } else {
+ if (errmsg)
+ *errmsg = make_message("%s: parse error", arg);
+ return -ERRNO_TO_PARA_ERROR(EINVAL);
+ }
if (ret < 0)
return ret;
}
free(current_mop);
if (arg) {
current_mop = para_strdup(arg);
- mmd_lock();
+ mutex_lock(mmd_mutex);
strncpy(mmd->afs_mode_string, arg,
sizeof(mmd->afs_mode_string));
mmd->afs_mode_string[sizeof(mmd->afs_mode_string) - 1] = '\0';
- mmd_unlock();
+ mmd->events++;
+ mutex_unlock(mmd_mutex);
} else {
- mmd_lock();
+ mutex_lock(mmd_mutex);
strcpy(mmd->afs_mode_string, "dummy");
- mmd_unlock();
+ mmd->events++;
+ mutex_unlock(mmd_mutex);
current_mop = NULL;
}
}
return 1;
}
-static int com_select_callback(const struct osl_object *query,
- struct osl_object *result)
+/**
+ * Result handler for sending data to the para_client process.
+ *
+ * \param result The data to be sent.
+ * \param band The band designator.
+ * \param private Pointer to the command context.
+ *
+ * \return The return value of the underlying call to \ref command.c::send_sb.
+ *
+ * \sa \ref callback_result_handler, \ref command.c::send_sb.
+ */
+int afs_cb_result_handler(struct osl_object *result, uint8_t band,
+ void *private)
{
- struct para_buffer pb = {.buf = NULL};
- char *arg = query->data;
+ struct command_context *cc = private;
+
+ assert(cc);
+ switch (band) {
+ case SBD_OUTPUT:
+ case SBD_DEBUG_LOG:
+ case SBD_INFO_LOG:
+ case SBD_NOTICE_LOG:
+ case SBD_WARNING_LOG:
+ case SBD_ERROR_LOG:
+ case SBD_CRIT_LOG:
+ case SBD_EMERG_LOG:
+ assert(result->size > 0);
+ return send_sb(&cc->scc, result->data, result->size, band, true);
+ case SBD_AFS_CB_FAILURE:
+ return *(int *)(result->data);
+ default:
+ return -E_BAD_BAND;
+ }
+}
+
+static void flush_and_free_pb(struct para_buffer *pb)
+{
+ int ret;
+ struct afs_max_size_handler_data *amshd = pb->private_data;
+
+ if (pb->buf && pb->size > 0) {
+ ret = pass_buffer_as_shm(amshd->fd, amshd->band, pb->buf,
+ pb->offset);
+ if (ret < 0)
+ PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+ }
+ free(pb->buf);
+}
+
+static int com_select_callback(struct afs_callback_arg *aca)
+{
+ const struct lls_command *cmd = SERVER_CMD_CMD_PTR(SELECT);
+ const char *arg;
int num_admissible, ret;
+ char *errmsg;
+ ret = lls_deserialize_parse_result(aca->query.data, cmd, &aca->lpr);
+ assert(ret >= 0);
+ arg = lls_input(0, aca->lpr);
ret = clear_score_table();
- if (ret < 0)
- return ret;
+ if (ret < 0) {
+ para_printf(&aca->pbout, "could not clear score table\n");
+ goto free_lpr;
+ }
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_printf(&pb, "failed, switching to dummy\n");
- activate_mood_or_playlist(NULL, &num_admissible);
- }
+ ret = activate_mood_or_playlist(arg, &num_admissible, &errmsg);
+ if (ret >= 0)
+ goto out;
+ /* ignore subsequent errors (but log them) */
+ para_printf(&aca->pbout, "%s\n", errmsg);
+ free(errmsg);
+ para_printf(&aca->pbout, "could not activate %s\n", arg);
+ if (current_mop && strcmp(current_mop, arg) != 0) {
+ int ret2;
+ para_printf(&aca->pbout, "switching back to %s\n", current_mop);
+ ret2 = activate_mood_or_playlist(current_mop, &num_admissible,
+ &errmsg);
+ if (ret2 >= 0)
+ goto out;
+ para_printf(&aca->pbout, "%s\n", errmsg);
+ free(errmsg);
+ para_printf(&aca->pbout, "could not reactivate %s: %s\n",
+ current_mop, para_strerror(-ret2));
}
- 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;
+ para_printf(&aca->pbout, "activating dummy mood\n");
+ activate_mood_or_playlist(NULL, &num_admissible, NULL);
+out:
+ para_printf(&aca->pbout, "activated %s (%d admissible files)\n",
+ current_mop? current_mop : "dummy mood", num_admissible);
+free_lpr:
+ lls_free_parse_result(aca->lpr, cmd);
+ return ret;
}
-int com_select(int fd, int argc, char * const * const argv)
+static int com_select(struct command_context *cc, struct lls_parse_result *lpr)
{
- int ret;
- 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);
+ const struct lls_command *cmd = SERVER_CMD_CMD_PTR(SELECT);
+ char *errctx;
+ int ret = lls(lls_check_arg_count(lpr, 1, 1, &errctx));
+
+ if (ret < 0) {
+ send_errctx(cc, errctx);
+ return ret;
}
- return ret;
+ return send_lls_callback_request(com_select_callback, cmd, lpr, cc);
}
+EXPORT_SERVER_CMD_HANDLER(select);
-static void init_admissible_files(char *arg)
+static void init_admissible_files(const char *arg)
{
- if (activate_mood_or_playlist(arg, NULL) < 0)
- activate_mood_or_playlist(NULL, NULL); /* always successful */
+ int ret = activate_mood_or_playlist(arg, NULL, NULL);
+ if (ret < 0) {
+ assert(arg);
+ PARA_WARNING_LOG("could not activate %s: %s\n", arg,
+ para_strerror(-ret));
+ activate_mood_or_playlist(NULL, NULL, NULL);
+ }
}
static int setup_command_socket_or_die(void)
{
int ret, socket_fd;
- char *socket_name = conf.afs_socket_arg;
- struct sockaddr_un unix_addr;
+ const char *socket_name = OPT_STRING_VAL(AFS_SOCKET);
unlink(socket_name);
- ret = create_local_socket(socket_name, &unix_addr,
- S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWOTH);
+ ret = create_local_socket(socket_name);
if (ret < 0) {
PARA_EMERG_LOG("%s: %s\n", para_strerror(-ret), socket_name);
exit(EXIT_FAILURE);
}
socket_fd = ret;
- if (listen(socket_fd , 5) < 0) {
- PARA_EMERG_LOG("can not listen on socket\n");
- exit(EXIT_FAILURE);
- }
- 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,
socket_fd);
return socket_fd;
}
+static char *database_dir;
+
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();
+ free(database_dir);
+ database_dir = NULL;
}
-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);
+ if (OPT_GIVEN(AFS_DATABASE_DIR))
+ database_dir = para_strdup(OPT_STRING_VAL(AFS_DATABASE_DIR));
else {
char *home = para_homedir();
database_dir = make_message(
- "%s/.paraslash/afs_database", home);
+ "%s/.paraslash/afs_database-0.4", home);
free(home);
}
}
get_database_dir();
ret = para_mkdir(database_dir, 0777);
- if (ret >= 0 || is_errno(-ret, EEXIST))
+ if (ret >= 0 || ret == -ERRNO_TO_PARA_ERROR(EEXIST))
return 1;
return ret;
}
int i, ret;
get_database_dir();
- PARA_NOTICE_LOG("opening %u osl tables in %s\n", NUM_AFS_TABLES,
+ PARA_NOTICE_LOG("opening %d 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));
+ PARA_ERROR_LOG("could not open %s\n", afs_tables[i].name);
break;
}
if (ret >= 0)
return ret;
}
-static void unregister_tasks(void)
+static int afs_signal_post_select(struct sched *s, __a_unused void *context)
{
- unregister_task(&command_task_struct.task);
- unregister_task(&signal_task_struct.task);
-}
+ int signum, ret;
-static void signal_pre_select(struct sched *s, struct task *t)
-{
- struct signal_task *st = t->private_data;
- t->ret = 1;
- para_fd_set(st->fd, &s->rfds, &s->max_fileno);
-}
-
-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();
- t->ret = 1;
- if (st->signum == SIGUSR1)
- return; /* ignore SIGUSR1 */
- if (st->signum == SIGHUP) {
+ if (getppid() == 1) {
+ PARA_EMERG_LOG("para_server died\n");
+ goto shutdown;
+ }
+ signum = para_next_signal(&s->rfds);
+ if (signum == 0)
+ return 0;
+ if (signum == SIGHUP) {
close_afs_tables();
- t->ret = open_afs_tables();
- if (t->ret < 0)
- goto err;
+ parse_config_or_die(1);
+ ret = open_afs_tables();
+ if (ret < 0)
+ return ret;
init_admissible_files(current_mop);
- return;
+ return 0;
}
- t->ret = -E_AFS_SIGNAL;
-err:
- PARA_NOTICE_LOG("%s\n", para_strerror(-t->ret));
- unregister_tasks();
+ PARA_EMERG_LOG("terminating on signal %d\n", signum);
+shutdown:
+ task_notify_all(s, E_AFS_SIGNAL);
+ return -E_AFS_SIGNAL;
}
-static void register_signal_task(void)
+static void register_signal_task(struct sched *s)
{
- struct signal_task *st = &signal_task_struct;
- st->fd = para_signal_init();
- PARA_INFO_LOG("signal pipe: fd %d\n", st->fd);
+ para_sigaction(SIGPIPE, SIG_IGN);
+ signal_task = signal_init_or_die();
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;
- st->task.private_data = st;
- sprintf(st->task.status, "signal task");
- register_task(&st->task);
+ signal_task->task = task_register(&(struct task_info) {
+ .name = "signal",
+ .pre_select = signal_pre_select,
+ .post_select = afs_signal_post_select,
+ .context = signal_task,
+
+ }, s);
}
static struct list_head afs_client_list;
-/** Describes on connected afs client. */
+/** Describes one connected afs client. */
struct afs_client {
/** Position in the afs client list. */
struct list_head node;
struct timeval connect_time;
};
-static void command_pre_select(struct sched *s, struct task *t)
+static void command_pre_select(struct sched *s, void *context)
{
- struct command_task *ct = t->private_data;
+ struct command_task *ct = context;
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;
}
-/*
- * On errors, negative value is written to fd.
- * On success: If query produced a result, the result_shmid is written to fd.
- * Otherwise, zero is written.
+/**
+ * Send data as shared memory to a file descriptor.
+ *
+ * \param fd File descriptor to send the shmid to.
+ * \param band The band designator for this data.
+ * \param buf The buffer holding the data to be sent.
+ * \param size The size of \a buf.
+ *
+ * This function creates a shared memory area large enough to hold
+ * the content given by \a buf and \a size and sends the identifier
+ * of this area to the file descriptor \a fd.
+ *
+ * It is called by the AFS max_size handler as well as directly by the AFS
+ * command callbacks to send command output to the command handlers.
+ *
+ * \return Zero if \a buf is \p NULL or \a size is zero. Negative on errors,
+ * and positive on success.
*/
+int pass_buffer_as_shm(int fd, uint8_t band, const char *buf, size_t size)
+{
+ int ret, shmid;
+ void *shm;
+ struct callback_result *cr;
+
+ if (size == 0)
+ assert(band != SBD_OUTPUT);
+ ret = shm_new(size + sizeof(*cr));
+ if (ret < 0)
+ return ret;
+ shmid = ret;
+ ret = shm_attach(shmid, ATTACH_RW, &shm);
+ if (ret < 0)
+ goto err;
+ cr = shm;
+ cr->result_size = size;
+ cr->band = band;
+ if (size > 0)
+ memcpy(shm + sizeof(*cr), buf, size);
+ ret = shm_detach(shm);
+ if (ret < 0)
+ goto err;
+ ret = write_all(fd, (char *)&shmid, sizeof(int));
+ if (ret >= 0)
+ return ret;
+err:
+ if (shm_destroy(shmid) < 0)
+ PARA_ERROR_LOG("destroy result failed\n");
+ return ret;
+}
+
static int call_callback(int fd, int query_shmid)
{
- void *query_shm, *result_shm;
+ void *query_shm;
struct callback_query *cq;
- struct callback_result *cr;
- struct osl_object query, result = {.data = NULL};
- int result_shmid = -1, ret, ret2;
+ int ret, ret2;
+ struct afs_callback_arg aca = {.fd = fd};
ret = shm_attach(query_shmid, ATTACH_RW, &query_shm);
if (ret < 0)
- goto out;
+ return ret;
cq = query_shm;
- query.data = (char *)query_shm + sizeof(*cq);
- query.size = cq->query_size;
- ret = cq->handler(&query, &result);
+ aca.query.data = (char *)query_shm + sizeof(*cq);
+ aca.query.size = cq->query_size;
+ aca.pbout.max_size = shm_get_shmmax();
+ aca.pbout.max_size_handler = afs_max_size_handler;
+ aca.pbout.private_data = &(struct afs_max_size_handler_data) {
+ .fd = fd,
+ .band = SBD_OUTPUT
+ };
+ ret = cq->handler(&aca);
ret2 = shm_detach(query_shm);
- if (ret2 < 0 && ret >= 0)
- ret = ret2;
- if (ret < 0)
- goto out;
- ret = 0;
- if (!result.data || !result.size)
- goto out;
- ret = shm_new(result.size + sizeof(struct callback_result));
- if (ret < 0)
- goto out;
- result_shmid = ret;
- ret = shm_attach(result_shmid, ATTACH_RW, &result_shm);
- if (ret < 0)
- goto out;
- cr = result_shm;
- cr->result_size = result.size;
- memcpy(result_shm + sizeof(*cr), result.data, result.size);
- ret = shm_detach(result_shm);
- if (ret < 0)
- goto out;
- ret = result_shmid;
-out:
- free(result.data);
- ret2 = send_bin_buffer(fd, (char *)&ret, sizeof(int));
- if (ret < 0 || ret2 < 0) {
- if (result_shmid >= 0)
- if (shm_destroy(result_shmid) < 0)
- PARA_ERROR_LOG("destroy result failed\n");
- if (ret >= 0)
+ if (ret2 < 0) {
+ if (ret < 0) /* ignore (but log) detach error */
+ PARA_ERROR_LOG("could not detach sma: %s\n",
+ para_strerror(-ret2));
+ else
ret = ret2;
}
+ flush_and_free_pb(&aca.pbout);
+ if (ret < 0) {
+ ret2 = pass_buffer_as_shm(fd, SBD_AFS_CB_FAILURE,
+ (const char *)&ret, sizeof(ret));
+ if (ret2 < 0)
+ PARA_ERROR_LOG("could not pass cb failure packet: %s\n",
+ para_strerror(-ret));
+ }
return ret;
}
-static void 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);
-
- if (ret <= 0) {
- if (ret < 0)
- PARA_ERROR_LOG("%s\n", para_strerror(-ret));
- return;
- }
- 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;
- }
- PARA_ERROR_LOG("unknown command\n");
+ size_t n;
+ int ret = read_nonblock(server_socket, buf, sizeof(buf) - 1, rfds, &n);
+ if (ret < 0 || n == 0)
+ return ret;
+ buf[n] = '\0';
+ if (strcmp(buf, "new"))
+ return -ERRNO_TO_PARA_ERROR(EINVAL);
+ 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 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) {
- PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
- return;
- }
- if (ret != sizeof(buf)) {
+ if (ret < 0)
+ goto err;
+ 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",
- (unsigned)cookie, (unsigned)expected_cookie);
- return;
+ if (cookie != afs_socket_cookie) {
+ PARA_NOTICE_LOG("received invalid cookie (got %u, expected %u)\n",
+ (unsigned)cookie, (unsigned)afs_socket_cookie);
+ 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;
}
- /* Ignore return value: Errors might be OK here. */
- call_callback(fd, query_shmid);
+ ret = call_callback(fd, query_shmid);
+ if (ret >= 0)
+ return 1;
+err:
+ PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
+ return 1;
}
/** 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)
+static int command_post_select(struct sched *s, void *context)
{
- struct command_task *ct = t->private_data;
+ struct command_task *ct = context;
struct sockaddr_un unix_addr;
struct afs_client *client, *tmp;
- int fd;
- if (FD_ISSET(server_socket, &s->rfds))
- execute_server_command();
+ int fd, ret;
+ ret = task_get_notification(ct->task);
+ if (ret < 0)
+ return ret;
+ ret = execute_server_command(&s->rfds);
+ if (ret < 0) {
+ PARA_EMERG_LOG("%s\n", para_strerror(-ret));
+ task_notify_all(s, -ret);
+ return ret;
+ }
/* 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);
+ 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))
- 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));
+ 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 0;
+ ret = mark_fd_nonblocking(fd);
+ if (ret < 0) {
+ PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
close(fd);
- goto out;
+ return 0;
}
client = para_malloc(sizeof(*client));
client->fd = fd;
client->connect_time = *now;
para_list_add(&client->node, &afs_client_list);
-out:
- t->ret = 1;
+ return 0;
}
-static void register_command_task(uint32_t cookie)
+static void register_command_task(struct sched *s)
{
struct command_task *ct = &command_task_struct;
ct->fd = setup_command_socket_or_die();
- ct->cookie = cookie;
- ct->task.pre_select = command_pre_select;
- ct->task.post_select = command_post_select;
- ct->task.private_data = ct;
- sprintf(ct->task.status, "command task");
- register_task(&ct->task);
-}
-
-static void register_tasks(uint32_t cookie)
-{
- register_signal_task();
- register_command_task(cookie);
+ ct->task = task_register(&(struct task_info) {
+ .name = "afs command",
+ .pre_select = command_pre_select,
+ .post_select = command_post_select,
+ .context = ct,
+ }, s);
}
/**
* 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)
+__noreturn void afs_init(int socket_fd)
{
- struct sched s;
+ static struct sched s;
int i, ret;
+ register_signal_task(&s);
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));
- exit(EXIT_FAILURE);
- }
+ if (ret < 0)
+ goto out;
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);
- init_admissible_files(conf.afs_initial_mode_arg);
- register_tasks(cookie);
+ goto out_close;
+ PARA_INFO_LOG("server_socket: %d\n", server_socket);
+ init_admissible_files(OPT_STRING_VAL(AFS_INITIAL_MODE));
+ register_command_task(&s);
s.default_timeout.tv_sec = 0;
s.default_timeout.tv_usec = 999 * 1000;
+ ret = write(socket_fd, "\0", 1);
+ if (ret != 1) {
+ if (ret == 0)
+ errno = EINVAL;
+ ret = -ERRNO_TO_PARA_ERROR(errno);
+ goto out_close;
+ }
ret = schedule(&s);
+ sched_shutdown(&s);
+ close_current_mood();
+out_close:
+ close_afs_tables();
+out:
+ signal_shutdown(signal_task);
+ free_status_items();
+ free(current_mop);
+ free_lpr();
if (ret < 0)
PARA_EMERG_LOG("%s\n", para_strerror(-ret));
- close_afs_tables();
exit(EXIT_FAILURE);
}
-static int create_tables_callback(const struct osl_object *query,
- __a_unused struct osl_object *result)
+static int com_init_callback(struct afs_callback_arg *aca)
{
- uint32_t table_mask = *(uint32_t *)query->data;
+ uint32_t table_mask = *(uint32_t *)aca->query.data;
int i, ret;
close_afs_tables();
+ get_database_dir();
for (i = 0; i < NUM_AFS_TABLES; i++) {
struct afs_table *t = &afs_tables[i];
if (!t->create)
continue;
ret = t->create(database_dir);
- if (ret < 0)
- return ret;
+ if (ret < 0) {
+ para_printf(&aca->pbout, "cannot create table %s\n",
+ t->name);
+ goto out;
+ }
+ para_printf(&aca->pbout, "successfully created %s table\n",
+ t->name);
}
ret = open_afs_tables();
- return ret < 0? ret: 0;
+ if (ret < 0)
+ para_printf(&aca->pbout, "cannot open afs tables\n");
+out:
+ return ret;
}
-int com_init(int fd, int argc, char * const * const argv)
+static int com_init(struct command_context *cc, struct lls_parse_result *lpr)
{
int i, j, ret;
uint32_t table_mask = (1 << (NUM_AFS_TABLES + 1)) - 1;
struct osl_object query = {.data = &table_mask,
.size = sizeof(table_mask)};
+ unsigned num_inputs = lls_num_inputs(lpr);
ret = make_database_dir();
if (ret < 0)
return ret;
- if (argc != 1) {
+ if (num_inputs > 0) {
table_mask = 0;
- for (i = 1; i < argc; i++) {
+ for (i = 0; i < num_inputs; i++) {
for (j = 0; j < NUM_AFS_TABLES; j++) {
struct afs_table *t = &afs_tables[j];
- if (strcmp(argv[i], t->name))
+ if (strcmp(lls_input(i, lpr), t->name))
continue;
table_mask |= (1 << j);
break;
return -E_BAD_TABLE_NAME;
}
}
- ret = send_callback_request(create_tables_callback, &query, NULL);
- if (ret < 0)
- return ret;
- return send_va_buffer(fd, "successfully created afs table(s)\n");
+ return send_callback_request(com_init_callback, &query,
+ afs_cb_result_handler, cc);
}
+EXPORT_SERVER_CMD_HANDLER(init);
-/**
- * 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)
+static int com_check(struct command_context *cc, struct lls_parse_result *lpr)
{
- unsigned flags = 0;
- int i, ret;
- struct osl_object result;
+ const struct lls_opt_result *r_a = SERVER_CMD_OPT_RESULT(CHECK, AFT, lpr);
+ const struct lls_opt_result *r_A = SERVER_CMD_OPT_RESULT(CHECK, ATTRIBUTE, lpr);
+ const struct lls_opt_result *r_m = SERVER_CMD_OPT_RESULT(CHECK, MOOD, lpr);
+ const struct lls_opt_result *r_p = SERVER_CMD_OPT_RESULT(CHECK, PLAYLIST, lpr);
+ bool noopt = !lls_opt_given(r_a) && !lls_opt_given(r_A)
+ && !lls_opt_given(r_m) && !lls_opt_given(r_p);
+ int ret;
- 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 (noopt || lls_opt_given(r_a)) {
+ ret = send_callback_request(aft_check_callback, NULL,
+ afs_cb_result_handler, cc);
+ if (ret < 0)
+ return ret;
}
- 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 (noopt || lls_opt_given(r_A)) {
+ ret = send_callback_request(attribute_check_callback, NULL,
+ afs_cb_result_handler, cc);
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 (noopt || lls_opt_given(r_p)) {
+ ret = send_callback_request(playlist_check_callback,
+ NULL, afs_cb_result_handler, cc);
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 (noopt || lls_opt_given(r_m)) {
+ ret = send_callback_request(mood_check_callback, NULL,
+ afs_cb_result_handler, cc);
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;
}
+EXPORT_SERVER_CMD_HANDLER(check);
-void afs_event(enum afs_events event, struct para_buffer *pb,
+/**
+ * The afs event dispatcher.
+ *
+ * \param event Type of the event.
+ * \param pb May be \p NULL.
+ * \param data Type depends on \a event.
+ *
+ * This function calls each table event handler, passing \a pb and \a data
+ * verbatim. It's up to the handlers to interpret the \a data pointer. If a
+ * handler returns negative, the loop is aborted.
+ *
+ * \return The (negative) error code of the first handler that failed, or non-negative
+ * if all handlers succeeded.
+ */
+__must_check int afs_event(enum afs_events event, struct para_buffer *pb,
void *data)
{
int i, ret;
if (!t->event_handler)
continue;
ret = t->event_handler(event, pb, data);
- if (ret < 0)
- PARA_CRIT_LOG("%s\n", para_strerror(-ret));
+ if (ret < 0) {
+ PARA_CRIT_LOG("table %s, event %u: %s\n", t->name,
+ event, para_strerror(-ret));
+ return ret;
+ }
}
+ return 1;
}
-int images_event_handler(__a_unused enum afs_events event,
+/**
+ * Dummy event handler for the images table.
+ *
+ * \param event Unused.
+ * \param pb Unused.
+ * \param data Unused.
+ *
+ * \return The images table does not honor events, so this handler always
+ * returns success.
+ */
+__a_const 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,
+/**
+ * Dummy event handler for the lyrics table.
+ *
+ * \param event Unused.
+ * \param pb Unused.
+ * \param data Unused.
+ *
+ * \return The lyrics table does not honor events, so this handler always
+ * returns success.
+ */
+__a_const int lyrics_event_handler(__a_unused enum afs_events event,
__a_unused struct para_buffer *pb, __a_unused void *data)
{
return 1;