X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod_command.c;h=98dba3b32dfcaee1a7532d8e3021947102d98f89;hp=df8f3936faf89a2c5b5550901d2e6e9bcf12ebdb;hb=95fa2283a02218120c784834cca98dc9fb1982b9;hpb=2cbca80137dd7b4229ba984080ac5410da546c71

diff --git a/audiod_command.c b/audiod_command.c
index df8f3936..98dba3b3 100644
--- a/audiod_command.c
+++ b/audiod_command.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2014 Andre Noll <maan@tuebingen.mpg.de>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -216,46 +216,6 @@ __malloc static char *audiod_status_string(void)
 	return para_strdup(status);
 }
 
-static int get_play_time_slot_num(void)
-{
-	int i, oldest_slot = -1;
-	struct timeval oldest_wstime = {0, 0};
-
-	FOR_EACH_SLOT(i) {
-		struct slot_info *s = &slot[i];
-		struct timeval wstime;
-		if (!s->wns || !s->wns[0].btrn)
-			continue;
-		btr_get_node_start(s->wns[0].btrn, &wstime);
-		if (oldest_slot >= 0 && tv_diff(&wstime, &oldest_wstime, NULL) > 0)
-			continue;
-		oldest_wstime = wstime;
-		oldest_slot = i;
-	}
-	//PARA_CRIT_LOG("oldest slot: %d\n", oldest_slot);
-	return oldest_slot;
-}
-
-__malloc static char *decoder_flags(void)
-{
-	int i;
-	char flags[MAX_STREAM_SLOTS + 1];
-
-	FOR_EACH_SLOT(i) {
-		struct slot_info *s = &slot[i];
-		char flag = '0';
-		if (s->receiver_node)
-			flag += 1;
-		if (s->fns)
-			flag += 2;
-		if (s->wns)
-			flag += 4;
-		flags[i] = flag;
-	}
-	flags[MAX_STREAM_SLOTS] = '\0';
-	return para_strdup(flags);
-}
-
 static int dump_commands(int fd)
 {
 	char *buf = para_strdup(""), *tmp = NULL;
@@ -436,14 +396,14 @@ static int com_version(int fd, int argc, char **argv)
 	return ret;
 }
 
-static int check_perms(uid_t uid)
+static int check_perms(uid_t uid, uid_t *whitelist)
 {
 	int i;
 
 	if (!conf.user_allow_given)
 		return 1;
 	for (i = 0; i < conf.user_allow_given; i++)
-		if (uid == conf.user_allow_arg[i])
+		if (uid == whitelist[i])
 			return 1;
 	return -E_UCRED_PERM;
 }
@@ -453,6 +413,7 @@ static int check_perms(uid_t uid)
  *
  * \param accept_fd The fd to accept connections on.
  * \param rfds If \a accept_fd is not set in \a rfds, do nothing.
+ * \param uid_whitelist Array of UIDs which are allowed to connect.
  *
  * This is called in each iteration of the select loop. If there is an incoming
  * connection on \a accept_fd, this function reads the command sent by the peer,
@@ -465,7 +426,7 @@ static int check_perms(uid_t uid)
  *
  * \sa para_accept(), recv_cred_buffer()
  * */
-int handle_connect(int accept_fd, fd_set *rfds)
+int handle_connect(int accept_fd, fd_set *rfds, uid_t *uid_whitelist)
 {
 	int i, argc, ret, clifd;
 	char buf[MAXLINE], **argv = NULL;
@@ -480,7 +441,7 @@ int handle_connect(int accept_fd, fd_set *rfds)
 		goto out;
 	uid = ret;
 	PARA_INFO_LOG("connection from user %i, buf: %s\n",  ret, buf);
-	ret = check_perms(uid);
+	ret = check_perms(uid, uid_whitelist);
 	if (ret < 0)
 		goto out;
 	ret = create_argv(buf, "\n", &argv);
@@ -513,11 +474,10 @@ out:
  */
 void audiod_status_dump(bool force)
 {
-	int slot_num = get_play_time_slot_num();
 	char *old, *new;
 
 	old = stat_item_values[SI_PLAY_TIME];
-	new = get_time_string(slot_num);
+	new = get_time_string();
 	if (new) {
 		if (force || !old || strcmp(old, new)) {
 			free(old);
@@ -546,7 +506,7 @@ void audiod_status_dump(bool force)
 		free(new);
 
 	old = stat_item_values[SI_DECODER_FLAGS];
-	new = decoder_flags();
+	new = audiod_get_decoder_flags();
 	if (force || !old || strcmp(old, new)) {
 		free(old);
 		stat_item_values[SI_DECODER_FLAGS] = new;