X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=135888a7fc632e6760d2aba4e1b4b2b4738af618;hp=c87fdf78fb9bf60d413503f557cac34573b50edf;hb=1cccf6fa93c251f8f2805aa5fb163741d851c051;hpb=d2a4829af865fb5ad698dfda5796e74c2e4e9f76

diff --git a/afs.c b/afs.c
index c87fdf78..135888a7 100644
--- a/afs.c
+++ b/afs.c
@@ -6,10 +6,15 @@
 
 /** \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 <osl.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
 
 #include "server.cmdline.h"
 #include "para.h"
@@ -565,10 +570,7 @@ int afs_cb_result_handler(struct osl_object *result, uint8_t band,
 	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);
+	return send_sb(&cc->scc, result->data, result->size, band, true);
 }
 
 static void com_select_callback(int fd, const struct osl_object *query)
@@ -807,7 +809,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;
@@ -1068,9 +1070,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;
 }