+/*
+ * Copyright (C) 1997-2007 Andre Noll <maan@systemlinux.org>
+ *
+ * Licensed under the GPL v2. For licencing details see COPYING.
+ */
+
+/** \file afs.c Paraslash's audio file selector. */
+
+#include "server.cmdline.h"
#include "para.h"
#include "afh.h"
+#include "server.h"
#include "error.h"
#include <dirent.h> /* readdir() */
#include <sys/mman.h>
#include <sys/time.h>
-//#include <inttypes.h>
-
#include "net.h"
#include "afs.h"
#include "ipc.h"
#include "signal.h"
#include "fd.h"
-/** \file afs.c Paraslash's audio file selector. */
+extern uint32_t afs_socket_cookie;
/**
* Compare two osl objects of string type.
* \param result Callback result will be stored here.
*
* This function creates a shared memory area, copies the buffer pointed to by
- * \a buf to that area and notifies the parent process that \a f should be
- * called ASAP. It provides proper locking via semaphores to protect against
- * concurent access to the shared memory area and against concurrent access by
- * another child process that asks to call the same function.
+ * \a buf to that area and notifies the afs process that \a f should be
+ * called ASAP.
*
- * \return Negative, if the shared memory area could not be set up. The return
- * value of the callback function otherwise.
+ * \return Negative, on errors, the return value of the callback function
+ * otherwise.
*
- * \sa shm_new(), shm_attach(), shm_detach(), mutex_lock(), mutex_unlock(),
- * shm_destroy(), struct callback_data, send_option_arg_callback_request(),
- * send_standard_callback_request().
+ * \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)
{
- struct callback_data cbd = {.handler = f};
- int ret;
- void *query_sma;
+ struct callback_query *cq;
+ struct callback_result *cr;
+ int ret, fd = -1, query_shmid, result_shmid;
+ void *query_shm, *result_shm;
+ char buf[sizeof(afs_socket_cookie) + sizeof(int)];
+// char *tmpsocket_name;
+ struct sockaddr_un unix_addr;
assert(query->data && query->size);
- ret = shm_new(query->size);
+ ret = shm_new(query->size + sizeof(*cq));
if (ret < 0)
return ret;
- cbd.query_shmid = ret;
- cbd.query_size = query->size;
- ret = shm_attach(cbd.query_shmid, ATTACH_RW, &query_sma);
+ query_shmid = ret;
+ ret = shm_attach(query_shmid, ATTACH_RW, &query_shm);
+ if (ret < 0)
+ goto out;
+ cq = query_shm;
+ cq->handler = f;
+ cq->query_size = query->size;
+
+ memcpy(query_shm + sizeof(*cq), query->data, query->size);
+ ret = shm_detach(query_shm);
if (ret < 0)
goto out;
- memcpy(query_sma, query->data, query->size);
- ret = shm_detach(query_sma);
+
+ *(uint32_t *) buf = afs_socket_cookie;
+ *(int *) (buf + sizeof(afs_socket_cookie)) = query_shmid;
+
+ ret = get_stream_socket(PF_UNIX);
if (ret < 0)
goto out;
- /* prevent other children from interacting */
- mutex_lock(child_mutex);
- /* prevent parent from messing with shm_callback_data. */
- mutex_lock(callback_mutex);
- /* all three mutexes are locked, set parameters for callback */
- *shm_callback_data = cbd;
- /* unblock parent */
- mutex_unlock(callback_mutex);
- kill(getppid(), SIGUSR1); /* wake up parent */
- /*
- * At this time only the parent can run. It will execute our callback
- * and unlock the result_mutex when ready to indicate that the child
- * may use the result. So let's sleep on this mutex.
- */
- mutex_lock(result_mutex);
- /* No need to aquire the callback mutex again */
- ret = shm_callback_data->sma_ret;
- if (ret < 0) /* sma problem, callback might not have been executed */
- goto unlock_child_mutex;
- if (shm_callback_data->result_shmid >= 0) { /* parent provided a result */
- void *sma;
- ret = shm_attach(shm_callback_data->result_shmid, ATTACH_RO,
- &sma);
- if (ret >= 0) {
- if (result) { /* copy result */
- result->size = shm_callback_data->result_size;
- result->data = para_malloc(result->size);
- memcpy(result->data, sma, result->size);
- ret = shm_detach(sma);
- if (ret < 0)
- PARA_ERROR_LOG("can not detach result\n");
- } else
- PARA_WARNING_LOG("no result pointer\n");
- } else
- PARA_ERROR_LOG("attach result failed: %d\n", ret);
- if (shm_destroy(shm_callback_data->result_shmid) < 0)
- PARA_ERROR_LOG("destroy result failed\n");
- } else { /* no result from callback */
- if (result) {
- PARA_WARNING_LOG("callback has no result\n");
- result->data = NULL;
- result->size = 0;
- }
+ fd = ret;
+ ret = init_unix_addr(&unix_addr, conf.afs_socket_arg);
+ if (ret < 0)
+ goto out;
+ ret = -E_CONNECT;
+ if (connect(fd, (struct sockaddr *)&unix_addr, sizeof(unix_addr)) < 0) /* FIXME: Use para_connect() */
+ goto out;
+ ret = send_bin_buffer(fd, buf, sizeof(buf));
+ PARA_NOTICE_LOG("bin buffer ret: %d\n", ret);
+ if (ret < 0)
+ goto out;
+ ret = recv_bin_buffer(fd, buf, sizeof(buf));
+ PARA_NOTICE_LOG("ret: %d\n", ret);
+ if (ret < 0)
+ goto out;
+ if (ret != sizeof(int)) {
+ ret = -E_RECV;
+ goto out;
}
- ret = shm_callback_data->callback_ret;
-unlock_child_mutex:
- /* give other children a chance */
- mutex_unlock(child_mutex);
+ ret = *(int *) buf;
+ PARA_NOTICE_LOG("result_shmid: %d\n", ret);
+ 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);
+ 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;
out:
- if (shm_destroy(cbd.query_shmid) < 0)
+ if (shm_destroy(query_shmid) < 0)
PARA_ERROR_LOG("%s\n", "shm destroy error");
+ if (fd >= 0)
+ close(fd);
PARA_DEBUG_LOG("callback_ret: %d\n", ret);
return ret;
}
static int setup_command_socket_or_die(void)
{
int ret;
- char *socket_name = "/tmp/afs_command_socket";
+ char *socket_name = conf.afs_socket_arg;
struct sockaddr_un unix_addr;
unlink(socket_name);
struct osl_object query, result = {.data = NULL};
int result_shmid = -1, ret, ret2;
- ret = shm_attach(query_shmid, ATTACH_RO, &query_shm);
+ ret = shm_attach(query_shmid, ATTACH_RW, &query_shm);
if (ret < 0)
goto out;
cq = query_shm;
ret = result_shmid;
out:
free(result.data);
- ret2 = send_bin_buffer(fd, (char *)ret, sizeof(int));
+ ret2 = send_bin_buffer(fd, (char *)&ret, sizeof(int));
if (ret < 0 || ret2 < 0) {
if (result_shmid >= 0)
if (shm_destroy(result_shmid) < 0)
* and para_server.
*/
fd = t->ret;
- t->ret = recv_bin_buffer(ct->fd, buf, sizeof(buf));
+ /* FIXME: This is easily dosable (peer doesn't send data) */
+ t->ret = recv_bin_buffer(fd, buf, sizeof(buf));
if (t->ret < 0) {
- PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
+ PARA_NOTICE_LOG("%s (%d)\n", PARA_STRERROR(-t->ret), t->ret);
t->ret = 1;
goto out;
}
}
return 1;
}
-
-#if 0
-/** Describes a command of para_server. */
-struct command {
- /** The name of the command. */
- const char *name;
- /** The handler function. */
- int (*handler)(int fd, int argc, const char **argv);
-};
-
-static struct command afs_cmds[] = {
-{
- .name = "add",
- .handler = com_add,
-},
-{
- .name = "addlyr",
- .handler = com_addlyr,
-},
-{
- .name = "addimg",
- .handler = com_addimg,
-},
-{
- .name = "addmood",
- .handler = com_addmood,
-},
-{
- .name = "addpl",
- .handler = com_addpl,
-},
-{
- .name = "catlyr",
- .handler = com_catlyr,
-},
-{
- .name = "catimg",
- .handler = com_catimg,
-},
-{
- .name = "mvimg",
- .handler = com_mvimg,
-},
-{
- .name = "mvlyr",
- .handler = com_mvlyr,
-},
-{
- .name = "mvmood",
- .handler = com_mvmood,
-},
-{
- .name = "mvpl",
- .handler = com_mvpl,
-},
-{
- .name = "catmood",
- .handler = com_catmood,
-},
-{
- .name = "catpl",
- .handler = com_catpl,
-},
-{
- .name = "rmatt",
- .handler = com_rmatt,
-},
-{
- .name = "init",
- .handler = com_init,
-},
-{
- .name = "lsatt",
- .handler = com_lsatt,
-},
-{
- .name = "ls",
- .handler = com_afs_ls,
-},
-{
- .name = "lslyr",
- .handler = com_lslyr,
-},
-{
- .name = "lsimg",
- .handler = com_lsimg,
-},
-{
- .name = "lsmood",
- .handler = com_lsmood,
-},
-{
- .name = "lspl",
- .handler = com_lspl,
-},
-{
- .name = "setatt",
- .handler = com_setatt,
-},
-{
- .name = "addatt",
- .handler = com_addatt,
-},
-{
- .name = "rm",
- .handler = com_afs_rm,
-},
-{
- .name = "rmlyr",
- .handler = com_rmlyr,
-},
-{
- .name = "rmimg",
- .handler = com_rmimg,
-},
-{
- .name = "rmmood",
- .handler = com_rmmood,
-},
-{
- .name = "rmpl",
- .handler = com_rmpl,
-},
-{
- .name = "touch",
- .handler = com_touch,
-},
-{
- .name = NULL,
-}
-};
-
-static void call_callback(void)
-{
- struct osl_object query, result = {.data = NULL};
- int ret, ret2;
-
- shm_callback_data->result_shmid = -1; /* no result */
- ret = shm_attach(shm_callback_data->query_shmid, ATTACH_RW,
- &query.data);
- if (ret < 0)
- goto out;
- query.size = shm_callback_data->query_size;
- shm_callback_data->callback_ret = shm_callback_data->handler(&query,
- &result);
- if (result.data && result.size) {
- void *sma;
- ret = shm_new(result.size);
- if (ret < 0)
- goto detach_query;
- shm_callback_data->result_shmid = ret;
- shm_callback_data->result_size = result.size;
- ret = shm_attach(shm_callback_data->result_shmid, ATTACH_RW, &sma);
- if (ret < 0)
- goto destroy_result;
- memcpy(sma, result.data, result.size);
- ret = shm_detach(sma);
- if (ret < 0) {
- PARA_ERROR_LOG("detach result failed\n");
- goto destroy_result;
- }
- }
- ret = 1;
- goto detach_query;
-destroy_result:
- if (shm_destroy(shm_callback_data->result_shmid) < 0)
- PARA_ERROR_LOG("destroy result failed\n");
- shm_callback_data->result_shmid = -1;
-detach_query:
- free(result.data);
- ret2 = shm_detach(query.data);
- if (ret2 < 0) {
- PARA_ERROR_LOG("detach query failed\n");
- if (ret >= 0)
- ret = ret2;
- }
-out:
- if (ret < 0)
- PARA_ERROR_LOG("sma error %d\n", ret);
- shm_callback_data->sma_ret = ret;
- shm_callback_data->handler = NULL;
- mutex_unlock(result_mutex); /* wake up child */
-}
-
-static int got_sigchld;
-static void server_loop(int child_pid)
-{
-// int status;
-
- PARA_DEBUG_LOG("server pid: %d, child pid: %d\n",
- getpid(), child_pid);
- for (;;) {
- mutex_lock(callback_mutex);
- if (shm_callback_data->handler)
- call_callback();
- mutex_unlock(callback_mutex);
- usleep(100);
- if (!got_sigchld)
- continue;
- mutex_destroy(result_mutex);
- mutex_destroy(callback_mutex);
- mutex_destroy(child_mutex);
- afs_shutdown(OSL_MARK_CLEAN);
- exit(EXIT_SUCCESS);
- }
-}
-
-int main(int argc, const char **argv)
-{
- int i, ret = -E_AFS_SYNTAX;
-
- signal(SIGUSR1, dummy);
- signal(SIGCHLD, sigchld_handler);
- if (argc < 2)
- goto out;
- ret = setup();
-// ret = afs_init();
- if (ret < 0) {
- PARA_EMERG_LOG("afs_init returned %d\n", ret);
- exit(EXIT_FAILURE);
- }
- ret = fork();
- if (ret < 0) {
- ret = -E_FORK;
- goto out;
- }
- if (ret)
- server_loop(ret);
- for (i = 0; cmd[i].name; i++) {
- if (strcmp(cmd[i].name, argv[1]))
- continue;
- ret = cmd[i].handler(1, argc - 1 , argv + 1);
- goto out;
-
- }
- PARA_ERROR_LOG("unknown command: %s\n", argv[1]);
- ret = -1;
-out:
- if (ret < 0)
- PARA_ERROR_LOG("error %d\n", ret);
- else
- PARA_DEBUG_LOG("%s", "success\n");
- afs_shutdown(0);
- return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;
-}
-#endif
projects / paraslash.git / commitdiff