X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=295933ec545d7eb60673e8dd002257347730e686;hp=20f2455e30a3d1fe940d84d9d5616fd97e5ee30d;hb=8c6ad492bee7eeec2bc667ce983c47f57fa45104;hpb=a5b65db9da1cd81c25494429ea8adb5d76e5b32a

diff --git a/afs.c b/afs.c
index 20f2455e..295933ec 100644
--- a/afs.c
+++ b/afs.c
@@ -164,7 +164,6 @@ int send_callback_request(callback_function *f, struct osl_object *query,
 	int ret, fd = -1, query_shmid, result_shmid;
 	void *query_shm, *result_shm;
 	char buf[sizeof(afs_socket_cookie) + sizeof(int)];
-	struct sockaddr_un unix_addr;
 	size_t query_shm_size = sizeof(*cq);
 
 	if (query)
@@ -189,16 +188,10 @@ int send_callback_request(callback_function *f, struct osl_object *query,
 	*(uint32_t *) buf = afs_socket_cookie;
 	*(int *) (buf + sizeof(afs_socket_cookie)) = query_shmid;
 
-	ret = get_stream_socket(PF_UNIX);
+	ret = create_remote_socket(conf.afs_socket_arg);
 	if (ret < 0)
 		goto out;
 	fd = ret;
-	ret = init_unix_addr(&unix_addr, conf.afs_socket_arg);
-	if (ret < 0)
-		goto out;
-	ret = PARA_CONNECT(fd, &unix_addr);
-	if (ret < 0)
-		goto out;
 	ret = send_bin_buffer(fd, buf, sizeof(buf));
 	if (ret < 0)
 		goto out;
@@ -206,7 +199,7 @@ int send_callback_request(callback_function *f, struct osl_object *query,
 	if (ret < 0)
 		goto out;
 	if (ret != sizeof(int)) {
-		ret = -E_RECV;
+		ret = -E_AFS_SHORT_READ;
 		goto out;
 	}
 	ret = *(int *) buf;
@@ -486,17 +479,27 @@ int open_next_audio_file(void)
 	struct audio_file_data afd;
 	int ret, shmid;
 	char buf[8];
-
+	long score;
+again:
 	PARA_NOTICE_LOG("getting next audio file\n");
-	ret = score_get_best(&aft_row, &afd.score);
-	if (ret < 0)
-		return ret;
-	ret = open_and_update_audio_file(aft_row, &afd);
-	if (ret < 0)
-		return ret;
+	ret = score_get_best(&aft_row, &score);
+	if (ret < 0) {
+		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+		goto no_admissible_files;
+	}
+	ret = open_and_update_audio_file(aft_row, score, &afd);
+	if (ret < 0) {
+		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+		ret = score_delete(aft_row);
+		if (ret < 0) {
+			PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+			goto no_admissible_files;
+		}
+		goto again;
+	}
 	shmid = ret;
 	if (!write_ok(server_socket)) {
-		PARA_EMERG_LOG("afs_socket not writable\n");
+		ret = -E_AFS_SOCKET;
 		goto destroy;
 	}
 	*(uint32_t *)buf = NEXT_AUDIO_FILE;
@@ -505,10 +508,13 @@ int open_next_audio_file(void)
 	close(afd.fd);
 	if (ret >= 0)
 		return ret;
-	PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
 destroy:
 	shm_destroy(shmid);
 	return ret;
+no_admissible_files:
+	*(uint32_t *)buf = NO_ADMISSIBLE_FILES;
+	*(uint32_t *)(buf + 4) = (uint32_t)0;
+	return send_bin_buffer(server_socket, buf, 8);
 }
 
 /* Never fails if arg == NULL */
@@ -521,14 +527,14 @@ static int activate_mood_or_playlist(char *arg, int *num_admissible)
 		ret = change_current_mood(NULL); /* always successful */
 		mode = PLAY_MODE_MOOD;
 	} else {
-		if (!strncmp(arg, "p:", 2)) {
+		if (!strncmp(arg, "p/", 2)) {
 			ret = playlist_open(arg + 2);
 			mode = PLAY_MODE_PLAYLIST;
-		} else if (!strncmp(arg, "m:", 2)) {
+		} else if (!strncmp(arg, "m/", 2)) {
 			ret = change_current_mood(arg + 2);
 			mode = PLAY_MODE_MOOD;
 		} else
-			ret = -E_AFS_SYNTAX;
+			return -E_AFS_SYNTAX;
 		if (ret < 0)
 			return ret;
 	}
@@ -628,7 +634,7 @@ static int setup_command_socket_or_die(void)
 		PARA_EMERG_LOG("can not listen on socket\n");
 		exit(EXIT_FAILURE);
 	}
-	ret = mark_fd_nonblock(socket_fd);
+	ret = mark_fd_nonblocking(socket_fd);
 	if (ret < 0) {
 		close(socket_fd);
 		return ret;
@@ -845,8 +851,10 @@ static void execute_server_command(void)
 	PARA_DEBUG_LOG("received: %s\n", buf);
 	if (!strcmp(buf, "new")) {
 		ret = open_next_audio_file();
-		if (ret < 0)
-			PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
+		if (ret < 0) {
+			PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
+			unregister_tasks();
+		}
 		return;
 	}
 	PARA_ERROR_LOG("unknown command\n");
@@ -921,7 +929,7 @@ static void command_post_select(struct sched *s, struct task *t)
 		goto out;
 	}
 	fd = t->ret;
-	t->ret = mark_fd_nonblock(fd);
+	t->ret = mark_fd_nonblocking(fd);
 	if (t->ret < 0) {
 		PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
 		close(fd);
@@ -975,7 +983,7 @@ __noreturn void afs_init(uint32_t cookie, int socket_fd)
 		exit(EXIT_FAILURE);
 	}
 	server_socket = socket_fd;
-	ret = mark_fd_nonblock(server_socket);
+	ret = mark_fd_nonblocking(server_socket);
 	if (ret < 0)
 		exit(EXIT_FAILURE);
 	PARA_INFO_LOG("server_socket: %d, afs_socket_cookie: %u\n",
@@ -984,7 +992,7 @@ __noreturn void afs_init(uint32_t cookie, int socket_fd)
 	register_tasks(cookie);
 	s.default_timeout.tv_sec = 0;
 	s.default_timeout.tv_usec = 999 * 1000;
-	ret = sched(&s);
+	ret = schedule(&s);
 	if (ret < 0)
 		PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
 	close_afs_tables();