X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=afs.c;h=2cbb010dcc8f7d9b35ab2c0ef45ac8a1f5ce7140;hb=cccdce2d0550ff9d6f2f044dc07f9df43f39e5ec;hp=48faeb17fdd153c735105a80a67aa27b1bd216e3;hpb=d4fdb9dc8a431d514a953fcaa6ba31f93ab29b87;p=paraslash.git

diff --git a/afs.c b/afs.c
index 48faeb17..2cbb010d 100644
--- a/afs.c
+++ b/afs.c
@@ -75,6 +75,8 @@ struct command_task {
 	struct task task;
 };
 
+extern struct misc_meta_data *mmd;
+
 static int server_socket;
 static struct command_task command_task_struct;
 static struct signal_task signal_task_struct;
@@ -536,10 +538,17 @@ static int activate_mood_or_playlist(char *arg, int *num_admissible)
 	current_play_mode = mode;
 	if (arg != current_mop) {
 		free(current_mop);
-		if (arg)
+		if (arg) {
 			current_mop = para_strdup(arg);
-		else
+			mmd_lock();
+			strcpy(mmd->afs_mode_string, arg); /* FIXME: check length */
+			mmd_unlock();
+		} else {
+			mmd_lock();
+			strcpy(mmd->afs_mode_string, "dummy");
+			mmd_unlock();
 			current_mop = NULL;
+		}
 	}
 	return 1;
 }
@@ -594,16 +603,10 @@ int com_select(int fd, int argc, char * const * const argv)
 	return ret;
 }
 
-static void init_admissible_files(void)
+static void init_admissible_files(char *arg)
 {
-	int ret = 0;
-	char *arg = conf.afs_initial_mode_arg;
-	ret = activate_mood_or_playlist(arg, NULL);
-	if (ret >= 0)
-		return;
-	PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
-	PARA_NOTICE_LOG("defaulting to dummy mood\n");
-	activate_mood_or_playlist(NULL, NULL); /* always successful */
+	if (activate_mood_or_playlist(arg, NULL) < 0)
+		activate_mood_or_playlist(NULL, NULL); /* always successful */
 }
 
 static int setup_command_socket_or_die(void)
@@ -675,12 +678,12 @@ static int open_afs_tables(void)
 			continue;
 		PARA_ERROR_LOG("%s init: %s\n", afs_tables[i].name,
 			PARA_STRERROR(-ret));
+		break;
 	}
 	if (ret >= 0)
 		return ret;
-	do
-		afs_tables[i].close();
-	while (i--);
+	while (i)
+		afs_tables[--i].close();
 	return ret;
 }
 
@@ -700,6 +703,9 @@ static void signal_pre_select(struct sched *s, struct task *t)
 static void signal_post_select(struct sched *s, struct task *t)
 {
 	struct signal_task *st = t->private_data;
+	t->ret = -E_AFS_PARENT_DIED;
+	if (getppid() == 1)
+		goto err;
 	t->ret = 1;
 	if (!FD_ISSET(st->fd, &s->rfds))
 		return;
@@ -710,10 +716,14 @@ static void signal_post_select(struct sched *s, struct task *t)
 	if (st->signum == SIGHUP) {
 		close_afs_tables();
 		t->ret = open_afs_tables();
+		/* FIXME: Restore current mood or playlist */
+		if (t->ret < 0)
+			goto err;
 		return;
 	}
-	PARA_NOTICE_LOG("caught signal %d\n", st->signum);
 	t->ret = -E_AFS_SIGNAL;
+err:
+	PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-t->ret));
 	unregister_tasks();
 }
 
@@ -950,10 +960,10 @@ __noreturn void afs_init(uint32_t cookie, int socket_fd)
 		exit(EXIT_FAILURE);
 	PARA_INFO_LOG("server_socket: %d, afs_socket_cookie: %u\n",
 		server_socket, (unsigned) cookie);
-	init_admissible_files();
+	init_admissible_files(conf.afs_initial_mode_arg);
 	register_tasks(cookie);
 	s.default_timeout.tv_sec = 0;
-	s.default_timeout.tv_usec = 99 * 1000;
+	s.default_timeout.tv_usec = 999 * 1000;
 	ret = sched(&s);
 	if (ret < 0)
 		PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));