X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=2f9df84581ee53685bbdb2282b6398a133fbf37f;hp=5939cbe69cc46c1095d7cb82ffc98a741d3f6505;hb=b3644a3f5de245609dc608a947ed71e2f75b2fd5;hpb=f0e41e36c3f1a3a5bb6ff66d92d2814391d8f908

diff --git a/afs.c b/afs.c
index 5939cbe6..2f9df845 100644
--- a/afs.c
+++ b/afs.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -26,6 +26,7 @@
 #include "signal.h"
 #include "fd.h"
 #include "mood.h"
+#include "sideband.h"
 #include "command.h"
 
 /** The osl tables used by afs. \sa blob.c. */
@@ -86,7 +87,7 @@ static struct command_task command_task_struct;
 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 */
+static char *current_mop; /* mode or playlist specifier. NULL means dummy mood */
 
 /**
  * A random number used to "authenticate" the connection.
@@ -112,7 +113,7 @@ 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
@@ -132,7 +133,7 @@ struct callback_query {
 /**
  * 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.
  *
@@ -141,6 +142,8 @@ 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,
@@ -148,7 +151,8 @@ static int dispatch_result(int result_shmid, callback_result_handler *handler,
 {
 	struct osl_object result;
 	void *result_shm;
-	int ret2, ret = shm_attach(result_shmid, ATTACH_RO, &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) {
@@ -159,7 +163,7 @@ static int dispatch_result(int result_shmid, callback_result_handler *handler,
 	result.data = result_shm + sizeof(*cr);
 	if (result.size) {
 		assert(handler);
-		ret = handler(&result, private_result_data);
+		ret = handler(&result, cr->band, private_result_data);
 		if (ret < 0)
 			PARA_NOTICE_LOG("result handler error: %s\n",
 				para_strerror(-ret));
@@ -542,12 +546,37 @@ static int activate_mood_or_playlist(char *arg, int *num_admissible)
 	return 1;
 }
 
+/**
+ * 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 command_context *cc = private;
+
+	assert(cc);
+	if (!result->size)
+		return 1;
+	return send_sb(&cc->scc, result->data, result->size, band, true);
+}
+
 static void com_select_callback(int fd, const struct osl_object *query)
 {
 	struct para_buffer pb = {
 		.max_size = shm_get_shmmax(),
-		.private_data = &fd,
-		.max_size_handler = pass_buffer_as_shm
+		.private_data = &(struct afs_max_size_handler_data) {
+			.fd = fd,
+			.band = SBD_OUTPUT
+		},
+		.max_size_handler = afs_max_size_handler,
 	};
 	char *arg = query->data;
 	int num_admissible, ret, ret2;
@@ -577,33 +606,10 @@ static void com_select_callback(int fd, const struct osl_object *query)
 			current_mop : "dummy mood", num_admissible);
 out:
 	if (ret2 >= 0 && pb.offset)
-		pass_buffer_as_shm(pb.buf, pb.offset, &fd);
+		pass_buffer_as_shm(fd, SBD_OUTPUT, pb.buf, pb.offset);
 	free(pb.buf);
 }
 
-/**
- * Result handler for sending data to the para_client process.
- *
- * \param result The data to be sent.
- * \param private Pointer to the context.
- *
- * \return The return value of the underlying call to sc_send_bin_buffer().
- *
- * \sa \ref callback_result_handler, \ref sc_send_bin_buffer().
- */
-int sc_send_result(struct osl_object *result, void *private)
-{
-	struct command_context *cc = private;
-	int ret;
-
-	if (!result->size)
-		return 1;
-	ret = sc_send_bin_buffer(&cc->scc, result->data, result->size);
-	if (ret < 0 || ret == result->size)
-		return ret;
-	return -E_SHORT_WRITE;
-}
-
 int com_select(struct command_context *cc)
 {
 	struct osl_object query;
@@ -613,7 +619,7 @@ int com_select(struct command_context *cc)
 	query.data = cc->argv[1];
 	query.size = strlen(cc->argv[1]) + 1;
 	return send_callback_request(com_select_callback, &query,
-		&sc_send_result, cc);
+		&afs_cb_result_handler, cc);
 }
 
 static void init_admissible_files(char *arg)
@@ -714,9 +720,9 @@ static void signal_pre_select(struct sched *s, struct task *t)
 	para_fd_set(st->fd, &s->rfds, &s->max_fileno);
 }
 
-static void afs_signal_post_select(struct sched *s, struct task *t)
+static int afs_signal_post_select(struct sched *s, __a_unused struct task *t)
 {
-	int signum;
+	int signum, ret;
 
 	if (getppid() == 1) {
 		PARA_EMERG_LOG("para_server died\n");
@@ -724,20 +730,20 @@ static void afs_signal_post_select(struct sched *s, struct task *t)
 	}
 	signum = para_next_signal(&s->rfds);
 	if (signum == 0)
-		return;
+		return 0;
 	if (signum == SIGHUP) {
 		close_afs_tables();
 		parse_config_or_die(1);
-		t->error = open_afs_tables();
-		if (t->error < 0)
-			return;
+		ret = open_afs_tables();
+		if (ret < 0)
+			return ret;
 		init_admissible_files(current_mop);
-		return;
+		return 0;
 	}
 	PARA_EMERG_LOG("terminating on signal %d\n", signum);
 shutdown:
-	sched_shutdown(s);
-	t->error = -E_AFS_SIGNAL;
+	task_notify_all(s, E_AFS_SIGNAL);
+	return -E_AFS_SIGNAL;
 }
 
 static void register_signal_task(struct sched *s)
@@ -783,30 +789,30 @@ static void command_pre_select(struct sched *s, struct task *t)
 /**
  * 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.
- * \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.
+ * 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(char *buf, size_t size, void *fd_ptr)
+int pass_buffer_as_shm(int fd, uint8_t band, const char *buf, size_t size)
 {
-	int ret, shmid, fd = *(int *)fd_ptr;
+	int ret, shmid;
 	void *shm;
 	struct callback_result *cr;
 
 	if (!buf || !size)
 		return 0;
-	ret = shm_new(size + sizeof(struct callback_result));
+	ret = shm_new(size + sizeof(*cr));
 	if (ret < 0)
 		return ret;
 	shmid = ret;
@@ -815,6 +821,7 @@ int pass_buffer_as_shm(char *buf, size_t size, void *fd_ptr)
 		goto err;
 	cr = shm;
 	cr->result_size = size;
+	cr->band = band;
 	memcpy(shm + sizeof(*cr), buf, size);
 	ret = shm_detach(shm);
 	if (ret < 0)
@@ -905,18 +912,21 @@ err:
 /** 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, struct task *t)
 {
 	struct command_task *ct = container_of(t, struct command_task, task);
 	struct sockaddr_un unix_addr;
 	struct afs_client *client, *tmp;
 	int fd, ret;
 
+	ret = task_get_notification(t);
+	if (ret < 0)
+		return ret;
 	ret = execute_server_command(&s->rfds);
 	if (ret < 0) {
 		PARA_EMERG_LOG("%s\n", para_strerror(-ret));
-		sched_shutdown(s);
-		return;
+		task_notify_all(s, -ret);
+		return ret;
 	}
 	/* Check the list of connected clients. */
 	list_for_each_entry_safe(client, tmp, &afs_client_list, node) {
@@ -937,17 +947,18 @@ static void command_post_select(struct sched *s, struct task *t)
 	if (ret < 0)
 		PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
 	if (ret <= 0)
-		return;
+		return 0;
 	ret = mark_fd_nonblocking(fd);
 	if (ret < 0) {
 		PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
 		close(fd);
-		return;
+		return 0;
 	}
 	client = para_malloc(sizeof(*client));
 	client->fd = fd;
 	client->connect_time = *now;
 	para_list_add(&client->node, &afs_client_list);
+	return 0;
 }
 
 static void register_command_task(uint32_t cookie, struct sched *s)
@@ -1023,7 +1034,7 @@ out:
 	if (ret < 0)
 		para_printf(&pb, "%s\n", para_strerror(-ret));
 	if (pb.buf)
-		pass_buffer_as_shm(pb.buf, pb.offset, &fd);
+		pass_buffer_as_shm(fd, SBD_OUTPUT, pb.buf, pb.offset);
 	free(pb.buf);
 }
 
@@ -1053,10 +1064,7 @@ int com_init(struct command_context *cc)
 		}
 	}
 	ret = send_callback_request(create_tables_callback, &query,
-		sc_send_result, cc);
-	if (ret < 0)
-		/* ignore return value */
-		sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret));
+		afs_cb_result_handler, cc);
 	return ret;
 }
 
@@ -1107,19 +1115,19 @@ int com_check(struct command_context *cc)
 		flags = ~0U;
 	if (flags & CHECK_AFT) {
 		ret = send_callback_request(aft_check_callback, NULL,
-			sc_send_result, cc);
+			afs_cb_result_handler, cc);
 		if (ret < 0)
 			return ret;
 	}
 	if (flags & CHECK_PLAYLISTS) {
 		ret = send_callback_request(playlist_check_callback,
-			NULL, sc_send_result, cc);
+			NULL, afs_cb_result_handler, cc);
 		if (ret < 0)
 			return ret;
 	}
 	if (flags & CHECK_MOODS) {
 		ret = send_callback_request(mood_check_callback, NULL,
-			sc_send_result, cc);
+			afs_cb_result_handler, cc);
 		if (ret < 0)
 			return ret;
 	}