X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=b40fe8e05c943eb503b3a2344fc1287db81b3696;hp=6c60b086c1ca2db90efef9d4a790e4ce376d93f6;hb=672e27768e31a6eaa6854d4fc75ee6885db9abd8;hpb=81e53d96523f470ac2139dc1ee4c954265b37ec7 diff --git a/afs.c b/afs.c index 6c60b086..b40fe8e0 100644 --- a/afs.c +++ b/afs.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 Andre Noll + * Copyright (C) 2007-2009 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -8,9 +8,13 @@ #include #include +#include +#include + #include "server.cmdline.h" #include "para.h" #include "error.h" +#include "crypt.h" #include "string.h" #include "afh.h" #include "afs.h" @@ -75,6 +79,7 @@ struct command_task { struct task task; }; +extern int mmd_mutex; extern struct misc_meta_data *mmd; static int server_socket; @@ -84,7 +89,6 @@ static struct signal_task signal_task_struct; static enum play_mode current_play_mode; static char *current_mop; /* mode or playlist specifier. NULL means dummy mooe */ - /** * A random number used to "authenticate" the connection. * @@ -140,32 +144,70 @@ struct callback_result { 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. * * \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. + + * 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. * - * \return Negative, on errors, the return value of the callback function - * otherwise. + * \return Standard. * * \sa send_option_arg_callback_request(), send_standard_callback_request(). */ int send_callback_request(callback_function *f, struct osl_object *query, - struct osl_object *result) + 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)]; - struct sockaddr_un unix_addr; size_t query_shm_size = sizeof(*cq); + int dispatch_error = 0; if (query) query_shm_size += query->size; @@ -189,48 +231,42 @@ int send_callback_request(callback_function *f, struct osl_object *query, *(uint32_t *) buf = afs_socket_cookie; *(int *) (buf + sizeof(afs_socket_cookie)) = query_shmid; - ret = get_stream_socket(PF_UNIX); + ret = create_remote_socket(conf.afs_socket_arg); if (ret < 0) goto out; fd = ret; - ret = init_unix_addr(&unix_addr, conf.afs_socket_arg); - if (ret < 0) - goto out; - ret = PARA_CONNECT(fd, &unix_addr); - if (ret < 0) - goto out; ret = send_bin_buffer(fd, buf, sizeof(buf)); if (ret < 0) goto out; - ret = recv_bin_buffer(fd, buf, sizeof(buf)); - if (ret < 0) - goto out; - if (ret != sizeof(int)) { - ret = -E_RECV; - 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; + 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) - 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)); + } 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); @@ -244,7 +280,8 @@ out: * \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 result_handler See \ref send_callback_request. + * \param private_result_data See \ref 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 @@ -255,7 +292,8 @@ out: */ int send_option_arg_callback_request(struct osl_object *options, int argc, char * const * const argv, callback_function *f, - struct osl_object *result) + callback_result_handler *result_handler, + void *private_result_data) { char *p; int i, ret; @@ -273,7 +311,8 @@ int send_option_arg_callback_request(struct osl_object *options, strcpy(p, argv[i]); /* OK */ p += strlen(argv[i]) + 1; } - ret = send_callback_request(f, &query, result); + ret = send_callback_request(f, &query, result_handler, + private_result_data); free(query.data); return ret; } @@ -284,7 +323,8 @@ int send_option_arg_callback_request(struct osl_object *options, * \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(). + * \param result_handler See \ref send_callback_request. + * \param private_result_data See \ref send_callback_request. * * This is similar to send_option_arg_callback_request(), but no options buffer * is passed to the parent process. @@ -293,9 +333,11 @@ int send_option_arg_callback_request(struct osl_object *options, * send_option_arg_callback_request(). */ int send_standard_callback_request(int argc, char * const * const argv, - callback_function *f, struct osl_object *result) + callback_function *f, callback_result_handler *result_handler, + void *private_result_data) { - return send_option_arg_callback_request(NULL, argc, argv, f, result); + return send_option_arg_callback_request(NULL, argc, argv, f, result_handler, + private_result_data); } static int action_if_pattern_matches(struct osl_row *row, void *data) @@ -303,7 +345,7 @@ 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); + 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) @@ -330,16 +372,15 @@ static int action_if_pattern_matches(struct osl_row *row, void *data) * * \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)); } /** @@ -364,77 +405,6 @@ 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}; @@ -480,7 +450,7 @@ static int pass_afd(int fd, char *buf, size_t size) * * \sa 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; @@ -491,15 +461,15 @@ again: PARA_NOTICE_LOG("getting next audio file\n"); ret = score_get_best(&aft_row, &score); if (ret < 0) { - PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); + 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)); + PARA_ERROR_LOG("%s\n", para_strerror(-ret)); ret = score_delete(aft_row); if (ret < 0) { - PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); + PARA_ERROR_LOG("%s\n", para_strerror(-ret)); goto no_admissible_files; } goto again; @@ -534,10 +504,10 @@ static int activate_mood_or_playlist(char *arg, int *num_admissible) ret = change_current_mood(NULL); /* always successful */ mode = PLAY_MODE_MOOD; } else { - if (!strncmp(arg, "p:", 2)) { + if (!strncmp(arg, "p/", 2)) { ret = playlist_open(arg + 2); mode = PLAY_MODE_PLAYLIST; - } else if (!strncmp(arg, "m:", 2)) { + } else if (!strncmp(arg, "m/", 2)) { ret = change_current_mood(arg + 2); mode = PLAY_MODE_MOOD; } else @@ -552,69 +522,89 @@ static int activate_mood_or_playlist(char *arg, int *num_admissible) 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(); + mutex_unlock(mmd_mutex); } else { - mmd_lock(); + mutex_lock(mmd_mutex); strcpy(mmd->afs_mode_string, "dummy"); - mmd_unlock(); + mutex_unlock(mmd_mutex); current_mop = NULL; } } return 1; } -static int com_select_callback(const struct osl_object *query, - struct osl_object *result) +static void com_select_callback(int fd, const struct osl_object *query) { - struct para_buffer pb = {.buf = NULL}; + struct para_buffer pb = { + .max_size = SHMMAX, + .private_data = &fd, + .max_size_handler = pass_buffer_as_shm + }; char *arg = query->data; - int num_admissible, ret; + int num_admissible, ret, ret2; ret = clear_score_table(); - if (ret < 0) - return ret; + if (ret < 0) { + ret2 = para_printf(&pb, "%s\n", para_strerror(-ret)); + goto out; + } 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? + ret2 = para_printf(&pb, "%s\nswitching back to %s\n", + para_strerror(-ret), 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"); + if (ret2 >= 0) + ret2 = para_printf(&pb, "failed, switching to dummy\n"); activate_mood_or_playlist(NULL, &num_admissible); } - } - 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; + } else + ret2 = para_printf(&pb, "activated %s (%d admissible files)\n", current_mop? + current_mop : "dummy mood", num_admissible); +out: + if (ret2 >= 0 && pb.offset) + pass_buffer_as_shm(pb.buf, pb.offset, &fd); + free(pb.buf); } -int com_select(int fd, int argc, char * const * const argv) +/** + * Result handler for sending data to the para_client process. + * + * \param result The data to be sent. + * \param private Pointer to rc4 context. + * + * \return The return value of the underlying call to rc4_send_bin_buffer(). + * + * \sa \ref callback_result_handler, \ref rc4_send_bin_buffer(). + */ +int rc4_send_result(struct osl_object *result, void *private) { - int ret; - struct osl_object query, result; + struct rc4_context *rc4c = private; + + if (!result->size) + return 1; + return rc4_send_bin_buffer(rc4c, result->data, result->size); +} + +int com_select(struct rc4_context *rc4c, int argc, char * const * const argv) +{ + struct osl_object query; 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); - } - return ret; + return send_callback_request(com_select_callback, &query, + &rc4_send_result, rc4c); } static void init_admissible_files(char *arg) @@ -633,7 +623,7 @@ static int setup_command_socket_or_die(void) ret = create_local_socket(socket_name, &unix_addr, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWOTH); if (ret < 0) { - PARA_EMERG_LOG("%s: %s\n", PARA_STRERROR(-ret), socket_name); + PARA_EMERG_LOG("%s: %s\n", para_strerror(-ret), socket_name); exit(EXIT_FAILURE); } socket_fd = ret; @@ -641,12 +631,13 @@ static int setup_command_socket_or_die(void) PARA_EMERG_LOG("can not listen on socket\n"); exit(EXIT_FAILURE); } - ret = mark_fd_nonblock(socket_fd); + ret = mark_fd_nonblocking(socket_fd); if (ret < 0) { close(socket_fd); return ret; } - PARA_INFO_LOG("listening on socket %s (fd %d)\n", socket_name, ret); + PARA_INFO_LOG("listening on socket %s (fd %d)\n", socket_name, + socket_fd); return socket_fd; } @@ -668,7 +659,7 @@ static void get_database_dir(void) else { char *home = para_homedir(); database_dir = make_message( - "%s/.paraslash/afs_database", home); + "%s/.paraslash/afs_database-0.4", home); free(home); } } @@ -698,7 +689,7 @@ static int open_afs_tables(void) if (ret >= 0) continue; PARA_ERROR_LOG("%s init: %s\n", afs_tables[i].name, - PARA_STRERROR(-ret)); + para_strerror(-ret)); break; } if (ret >= 0) @@ -708,59 +699,50 @@ static int open_afs_tables(void) return ret; } -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; - t->ret = 1; + struct signal_task *st = container_of(t, struct signal_task, task); 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 = t->private_data; - t->ret = -E_AFS_PARENT_DIED; - if (getppid() == 1) - goto err; - t->ret = 1; + struct signal_task *st = container_of(t, struct signal_task, task); + if (getppid() == 1) { + PARA_EMERG_LOG("para_server died\n"); + goto shutdown; + } 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) { close_afs_tables(); - t->ret = open_afs_tables(); - if (t->ret < 0) - goto err; + parse_config_or_die(1); + t->error = open_afs_tables(); + if (t->error < 0) + return; init_admissible_files(current_mop); return; } - 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", st->signum); +shutdown: + sched_shutdown(); + t->error = -E_AFS_SIGNAL; } static void register_signal_task(void) { struct signal_task *st = &signal_task_struct; + + 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(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; + st->task.post_select = afs_signal_post_select; sprintf(st->task.status, "signal task"); register_task(&st->task); } @@ -779,14 +761,61 @@ struct afs_client { static void command_pre_select(struct sched *s, struct task *t) { - struct command_task *ct = t->private_data; + struct command_task *ct = container_of(t, struct command_task, task); 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; +} + +/** + * Send data as shared memory to a file descriptor. + * + * \param buf The buffer holding the data to be sent. + * \param size The size of \a buf. + * \param fd_ptr A pointer to the file descriptor. + * + * This function is used as the \a max_size handler in a \ref para_buffer + * structure. If used this way, it is called by \ref para_printf() whenever + * the buffer passed to para_printf() is about to exceed its maximal size. + * + * 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 given by \a fd_ptr. + * + * \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(char *buf, size_t size, void *fd_ptr) +{ + int ret, shmid, fd = *(int *)fd_ptr; + void *shm; + struct callback_result *cr; + + if (!buf || !size) + return 0; + ret = shm_new(size + sizeof(struct callback_result)); + 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; + memcpy(shm + sizeof(*cr), buf, size); + ret = shm_detach(shm); + if (ret < 0) + goto err; + ret = send_bin_buffer(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; } /* @@ -796,76 +825,39 @@ static void command_pre_select(struct sched *s, struct task *t) */ 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; + struct osl_object query; + int ret; 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); - 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) - ret = ret2; - } - return ret; + cq->handler(fd, &query); + return shm_detach(query_shm); } -static void execute_server_command(void) +static int execute_server_command(void) { 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; + if (!ret) + ret = -ERRNO_TO_PARA_ERROR(ECONNRESET); + goto err; } 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"); - + ret = -E_BAD_CMD; + if (strcmp(buf, "new")) + goto err; + ret = open_next_audio_file(); +err: + return ret; } static void execute_afs_command(int fd, uint32_t expected_cookie) @@ -875,10 +867,8 @@ static void execute_afs_command(int fd, uint32_t expected_cookie) char buf[sizeof(cookie) + sizeof(query_shmid)]; int ret = recv_bin_buffer(fd, buf, sizeof(buf)); - if (ret < 0) { - PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-ret)); - return; - } + if (ret < 0) + goto err; if (ret != sizeof(buf)) { PARA_NOTICE_LOG("short read (%d bytes, expected %lu)\n", ret, (long unsigned) sizeof(buf)); @@ -896,8 +886,11 @@ static void execute_afs_command(int fd, uint32_t expected_cookie) query_shmid); return; } - /* Ignore return value: Errors might be OK here. */ - call_callback(fd, query_shmid); + ret = call_callback(fd, query_shmid); + if (ret >= 0) + return; +err: + PARA_NOTICE_LOG("%s\n", para_strerror(-ret)); } /** Shutdown connection if query has not arrived until this many seconds. */ @@ -905,12 +898,19 @@ static void execute_afs_command(int fd, uint32_t expected_cookie) static void command_post_select(struct sched *s, struct task *t) { - struct command_task *ct = t->private_data; + struct command_task *ct = container_of(t, struct command_task, task); 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; + + 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; + } + } /* Check the list of connected clients. */ list_for_each_entry_safe(client, tmp, &afs_client_list, node) { @@ -929,25 +929,23 @@ static void command_post_select(struct sched *s, struct task *t) } /* 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; + return; + ret = para_accept(ct->fd, &unix_addr, sizeof(unix_addr)); + if (ret < 0) { + PARA_NOTICE_LOG("%s\n", para_strerror(-ret)); + return; } - fd = t->ret; - t->ret = mark_fd_nonblock(fd); - if (t->ret < 0) { - PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret)); + fd = ret; + ret = mark_fd_nonblocking(fd); + if (ret < 0) { + PARA_NOTICE_LOG("%s\n", para_strerror(-ret)); close(fd); - goto out; + return; } client = para_malloc(sizeof(*client)); client->fd = fd; client->connect_time = *now; para_list_add(&client->node, &afs_client_list); -out: - t->ret = 1; } static void register_command_task(uint32_t cookie) @@ -958,17 +956,10 @@ static void register_command_task(uint32_t 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); -} - /** * Initialize the audio file selector process. * @@ -977,40 +968,40 @@ static void register_tasks(uint32_t cookie) */ __noreturn void afs_init(uint32_t cookie, int socket_fd) { - struct sched s; + static struct sched s; int i, ret; + register_signal_task(); 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_nonblock(server_socket); + ret = mark_fd_nonblocking(server_socket); if (ret < 0) - exit(EXIT_FAILURE); + goto out_close; 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); + register_command_task(cookie); s.default_timeout.tv_sec = 0; s.default_timeout.tv_usec = 999 * 1000; - ret = sched(&s); - if (ret < 0) - PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret)); + ret = schedule(&s); +out_close: close_afs_tables(); +out: + if (ret < 0) + PARA_EMERG_LOG("%s\n", para_strerror(-ret)); exit(EXIT_FAILURE); } -static int create_tables_callback(const struct osl_object *query, - __a_unused struct osl_object *result) +static void create_tables_callback(int fd, const struct osl_object *query) { uint32_t table_mask = *(uint32_t *)query->data; int i, ret; + char *buf; close_afs_tables(); for (i = 0; i < NUM_AFS_TABLES; i++) { @@ -1022,13 +1013,19 @@ static int create_tables_callback(const struct osl_object *query, continue; ret = t->create(database_dir); if (ret < 0) - return ret; + goto out; } ret = open_afs_tables(); - return ret < 0? ret: 0; +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); } -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; @@ -1053,10 +1050,11 @@ int com_init(int fd, int argc, char * const * const argv) return -E_BAD_TABLE_NAME; } } - ret = send_callback_request(create_tables_callback, &query, NULL); + ret = send_callback_request(create_tables_callback, &query, + rc4_send_result, rc4c); if (ret < 0) - return ret; - return send_va_buffer(fd, "successfully created afs table(s)\n"); + return rc4_send_va_buffer(rc4c, "%s\n", para_strerror(-ret)); + return ret; } /** @@ -1073,11 +1071,10 @@ enum com_check_flags { 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; - struct osl_object result; for (i = 1; i < argc; i++) { const char *arg = argv[i]; @@ -1106,41 +1103,36 @@ int com_check(int fd, int argc, char * const * const argv) if (!flags) flags = ~0U; if (flags & CHECK_AFT) { - ret = send_callback_request(aft_check_callback, NULL, &result); + ret = send_callback_request(aft_check_callback, NULL, + rc4_send_result, rc4c); 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); + ret = send_callback_request(playlist_check_callback, + NULL, rc4_send_result, rc4c); 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); + ret = send_callback_request(mood_check_callback, NULL, + rc4_send_result, rc4c); 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; } +/** + * 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 the table handlers of all tables and passes \a pb and \a + * data verbatim. It's up to the handlers to interpret the \a data pointer. + */ void afs_event(enum afs_events event, struct para_buffer *pb, void *data) { @@ -1152,7 +1144,8 @@ void afs_event(enum afs_events event, struct para_buffer *pb, continue; ret = t->event_handler(event, pb, data); if (ret < 0) - PARA_CRIT_LOG("%s\n", PARA_STRERROR(-ret)); + PARA_CRIT_LOG("table %s, event %d: %s\n", t->name, + event, para_strerror(-ret)); } }