X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=afs.c;h=b74cb45c715adc34a1be87c32b2a251fc5dfdd86;hb=0e75bc32026c5c43fa36e93e82d8b34f89342170;hp=96621e4b62aa52b575f8881e1f5ba826f44259d7;hpb=30741f9f15db7c4681755c1234d8c4335013a487;p=paraslash.git

diff --git a/afs.c b/afs.c
index 96621e4b..b74cb45c 100644
--- a/afs.c
+++ b/afs.c
@@ -195,7 +195,7 @@ static int dispatch_result(int result_shmid, callback_result_handler *handler,
  * 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
@@ -236,8 +236,8 @@ int send_callback_request(callback_function *f, struct osl_object *query,
 	if (ret < 0)
 		goto out;
 
-	*(uint32_t *) buf = afs_socket_cookie;
-	*(int *) (buf + sizeof(afs_socket_cookie)) = query_shmid;
+	*(uint32_t *)buf = afs_socket_cookie;
+	*(int *)(buf + sizeof(afs_socket_cookie)) = query_shmid;
 
 	ret = connect_local_socket(conf.afs_socket_arg);
 	if (ret < 0)
@@ -607,8 +607,9 @@ static void com_select_callback(int fd, const struct osl_object *query)
 			activate_mood_or_playlist(NULL, &num_admissible);
 		}
 	} else
-		ret2 = para_printf(&pb, "activated %s (%d admissible files)\n", current_mop?
-			current_mop : "dummy mood", num_admissible);
+		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(fd, SBD_OUTPUT, pb.buf, pb.offset);
@@ -637,25 +638,19 @@ static int setup_command_socket_or_die(void)
 {
 	int ret, socket_fd;
 	char *socket_name = conf.afs_socket_arg;
-	struct sockaddr_un unix_addr;
 
 	unlink(socket_name);
-	ret = create_local_socket(socket_name, &unix_addr,
-		S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWOTH);
+	ret = create_local_socket(socket_name, 0);
 	if (ret < 0) {
-		PARA_EMERG_LOG("%s: %s\n", para_strerror(-ret), socket_name);
-		exit(EXIT_FAILURE);
+		ret = create_local_socket(socket_name,
+			S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IWOTH);
+		if (ret < 0) {
+			PARA_EMERG_LOG("%s: %s\n", para_strerror(-ret),
+				socket_name);
+			exit(EXIT_FAILURE);
+		}
 	}
 	socket_fd = ret;
-	if (listen(socket_fd , 5) < 0) {
-		PARA_EMERG_LOG("can not listen on socket\n");
-		exit(EXIT_FAILURE);
-	}
-	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,
 		socket_fd);
 	return socket_fd;
@@ -1016,7 +1011,13 @@ static void create_tables_callback(int fd, const struct osl_object *query)
 {
 	uint32_t table_mask = *(uint32_t *)query->data;
 	int i, ret;
-	struct para_buffer pb = {.buf = NULL};
+	struct para_buffer pb = {
+		.max_size = shm_get_shmmax(),
+		.private_data = &(struct afs_max_size_handler_data) {
+			.fd = fd,
+			.band = SBD_OUTPUT
+		}
+	};
 
 	close_afs_tables();
 	for (i = 0; i < NUM_AFS_TABLES; i++) {