X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=2f9df84581ee53685bbdb2282b6398a133fbf37f;hp=71b8b87e7dde2649ad6e0ad23f6a8bdf25a58e07;hb=081c8921f827c1ed482c45ba22bd8bb97db2838b;hpb=12f683937d03eb69034a3752fb0fddb749e506c5

diff --git a/afs.c b/afs.c
index 71b8b87e..2f9df845 100644
--- a/afs.c
+++ b/afs.c
@@ -546,6 +546,28 @@ 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 = {
@@ -588,31 +610,6 @@ out:
 	free(pb.buf);
 }
 
-/**
- * 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;
-	if (cc->use_sideband)
-		return send_sb(&cc->scc, result->data, result->size, band,
-			true);
-	return sc_send_bin_buffer(&cc->scc, result->data, result->size);
-}
-
 int com_select(struct command_context *cc)
 {
 	struct osl_object query;
@@ -761,8 +758,7 @@ static void register_signal_task(struct sched *s)
 	para_install_sighandler(SIGHUP);
 
 	st->task.pre_select = signal_pre_select;
-	st->task.new_post_select = afs_signal_post_select;
-	st->task.post_select = NULL;
+	st->task.post_select = afs_signal_post_select;
 	sprintf(st->task.status, "signal task");
 	register_task(s, &st->task);
 }
@@ -808,7 +804,7 @@ static void command_pre_select(struct sched *s, struct task *t)
  * \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, char *buf, size_t size)
+int pass_buffer_as_shm(int fd, uint8_t band, const char *buf, size_t size)
 {
 	int ret, shmid;
 	void *shm;
@@ -916,7 +912,7 @@ 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;
@@ -924,16 +920,13 @@ static void command_post_select(struct sched *s, struct task *t)
 	int fd, ret;
 
 	ret = task_get_notification(t);
-	if (ret < 0) {
-		t->error = ret;
-		return;
-	}
+	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);
-		t->error = ret;
-		return;
+		return ret;
 	}
 	/* Check the list of connected clients. */
 	list_for_each_entry_safe(client, tmp, &afs_client_list, node) {
@@ -954,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)
@@ -1071,9 +1065,6 @@ int com_init(struct command_context *cc)
 	}
 	ret = send_callback_request(create_tables_callback, &query,
 		afs_cb_result_handler, cc);
-	if (ret < 0 && !cc->use_sideband)
-		/* ignore return value */
-		sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret));
 	return ret;
 }