X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afs.c;h=538606add432aef4710c09d5b2826df3d123c933;hp=5623d7e995743dccbfa5ddfa782930d7b63c37cb;hb=62f16302b6cdb35de8b33894858cec81b34639be;hpb=177ea8ea46918a925c0d2d8a07e7fbe9f478a40c

diff --git a/afs.c b/afs.c
index 5623d7e9..538606ad 100644
--- a/afs.c
+++ b/afs.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2007 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2007 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file afs.c Paraslash's audio file selector. */
 
@@ -26,8 +22,8 @@
 #include "string.h"
 #include "afh.h"
 #include "afs.h"
-#include "server.h"
 #include "net.h"
+#include "server.h"
 #include "ipc.h"
 #include "list.h"
 #include "sched.h"
@@ -78,11 +74,6 @@ static struct afs_table afs_tables[NUM_AFS_TABLES] = {
 struct command_task {
 	/** The file descriptor for the local socket. */
 	int fd;
-	/**
-	 * Value sent by the command handlers to identify themselves as
-	 * children of the running para_server.
-	 */
-	uint32_t cookie;
 	/** The associated task structure. */
 	struct task *task;
 };
@@ -97,15 +88,6 @@ static struct signal_task *signal_task;
 static enum play_mode current_play_mode;
 static char *current_mop; /* mode or playlist specifier. NULL means dummy mood */
 
-/**
- * A random number used to "authenticate" the connection.
- *
- * para_server picks this number by random before it forks the afs process. The
- * command handlers know this number as well and write it to the afs socket,
- * together with the id of the shared memory area which contains the payload of
- * the afs command. A local process has to know this number to abuse the afs
- * service provided by the local socket.
- */
 extern uint32_t afs_socket_cookie;
 
 /**
@@ -703,8 +685,7 @@ static int open_afs_tables(void)
 		ret = afs_tables[i].open(database_dir);
 		if (ret >= 0)
 			continue;
-		PARA_ERROR_LOG("%s init: %s\n", afs_tables[i].name,
-			para_strerror(-ret));
+		PARA_ERROR_LOG("could not open %s\n", afs_tables[i].name);
 		break;
 	}
 	if (ret >= 0)
@@ -884,7 +865,7 @@ static int execute_server_command(fd_set *rfds)
 }
 
 /* returns 0 if no data available, 1 else */
-static int execute_afs_command(int fd, fd_set *rfds, uint32_t expected_cookie)
+static int execute_afs_command(int fd, fd_set *rfds)
 {
 	uint32_t cookie;
 	int query_shmid;
@@ -902,9 +883,9 @@ static int execute_afs_command(int fd, fd_set *rfds, uint32_t expected_cookie)
 		return 1;
 	}
 	cookie = *(uint32_t *)buf;
-	if (cookie != expected_cookie) {
+	if (cookie != afs_socket_cookie) {
 		PARA_NOTICE_LOG("received invalid cookie (got %u, expected %u)\n",
-			(unsigned)cookie, (unsigned)expected_cookie);
+			(unsigned)cookie, (unsigned)afs_socket_cookie);
 		return 1;
 	}
 	query_shmid = *(int *)(buf + sizeof(cookie));
@@ -942,7 +923,7 @@ static int command_post_select(struct sched *s, void *context)
 	}
 	/* Check the list of connected clients. */
 	list_for_each_entry_safe(client, tmp, &afs_client_list, node) {
-		ret = execute_afs_command(client->fd, &s->rfds, ct->cookie);
+		ret = execute_afs_command(client->fd, &s->rfds);
 		if (ret == 0) { /* prevent bogus connection flooding */
 			struct timeval diff;
 			tv_diff(now, &client->connect_time, &diff);
@@ -973,11 +954,10 @@ static int command_post_select(struct sched *s, void *context)
 	return 0;
 }
 
-static void register_command_task(uint32_t cookie, struct sched *s)
+static void register_command_task(struct sched *s)
 {
 	struct command_task *ct = &command_task_struct;
 	ct->fd = setup_command_socket_or_die();
-	ct->cookie = cookie;
 
 	ct->task = task_register(&(struct task_info) {
 		.name = "afs command",
@@ -990,10 +970,9 @@ static void register_command_task(uint32_t cookie, struct sched *s)
 /**
  * Initialize the audio file selector process.
  *
- * \param cookie The value used for "authentication".
  * \param socket_fd File descriptor used for communication with the server.
  */
-__noreturn void afs_init(uint32_t cookie, int socket_fd)
+__noreturn void afs_init(int socket_fd)
 {
 	static struct sched s;
 	int i, ret;
@@ -1009,10 +988,9 @@ __noreturn void afs_init(uint32_t cookie, int socket_fd)
 	ret = mark_fd_nonblocking(server_socket);
 	if (ret < 0)
 		goto out_close;
-	PARA_INFO_LOG("server_socket: %d, afs_socket_cookie: %u\n",
-		server_socket, (unsigned) cookie);
+	PARA_INFO_LOG("server_socket: %d\n", server_socket);
 	init_admissible_files(OPT_STRING_VAL(AFS_INITIAL_MODE));
-	register_command_task(cookie, &s);
+	register_command_task(&s);
 	s.default_timeout.tv_sec = 0;
 	s.default_timeout.tv_usec = 999 * 1000;
 	ret = write(socket_fd, "\0", 1);