X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=c7283106d4423757c8236e5299a2e0dacc19b1d9;hp=9d902bafbfbc64148bfaa473c63412fe1c016c57;hb=05382250dd4d68b4fa32c229104f613c455f5ea6;hpb=8978f426314b107c55a652e0151397fdab2f003e

diff --git a/command.c b/command.c
index 9d902baf..c7283106 100644
--- a/command.c
+++ b/command.c
@@ -4,7 +4,7 @@
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
-/** \file command.c does client authentication and executes server commands */
+/** \file command.c Client authentication and server commands. */
 
 #include <signal.h>
 #include <sys/time.h>
@@ -30,7 +30,7 @@
 #include "server_command_list.h"
 #include "afs_command_list.h"
 
-/** commands including options must be shorter than this */
+/** Commands including options must be shorter than this. */
 #define MAX_COMMAND_LEN 32768
 
 static RC4_KEY rc4_recv_key;
@@ -95,74 +95,41 @@ static char *vss_get_status_flags(unsigned int flags)
 	return msg;
 }
 
-/*
- * compute status bar string. Never returns NULL
- */
-static char *get_sb_string(struct misc_meta_data *nmmd)
-{
-	char *base, *ret;
-	long long unsigned secs = 0, rsecs = 0, percent = 0;
-
-	base = para_basename(nmmd->filename);
-	if (!base)
-		return para_strdup("");
-	if (!base[0])
-		return base;
-	if (nmmd->afi.chunks_total) {
-		secs = (long long) nmmd->afi.seconds_total * nmmd->chunks_sent
-			/ nmmd->afi.chunks_total;
-		rsecs = (long long) nmmd->afi.seconds_total *
-			(nmmd->afi.chunks_total - nmmd->chunks_sent)
-			/ nmmd->afi.chunks_total;
-		percent = 100 * ((nmmd->chunks_sent + 5) / 10)
-			/ ((nmmd->afi.chunks_total + 5) / 10);
-	}
-	ret = make_message("%llu:%02llu [%llu:%02llu] (%llu%%) %s",
-		secs / 60, secs % 60,
-		rsecs / 60, rsecs % 60,
-		percent,
-		base
-	);
-	free(base);
-	return ret;
-}
-
 static char *get_status(struct misc_meta_data *nmmd)
 {
-	char *bar, *ret, mtime[30] = "";
+	char *basename, *dirname, *ret, mtime[30] = "";
 	char *status, *flags; /* vss status info */
 	char *ut = uptime_str();
 	long offset = (nmmd->offset + 500) / 1000;
 	struct timeval now;
 	struct tm mtime_tm;
 
-	if (nmmd->audio_format >= 0) {
-		localtime_r(&nmmd->mtime, &mtime_tm);
-		strftime(mtime, 29, "%a %b %d %Y", &mtime_tm);
-	}
 	/* report real status */
 	status = vss_status_tohuman(nmmd->vss_status_flags);
 	flags = vss_get_status_flags(nmmd->vss_status_flags);
-	bar = para_basename(nmmd->filename);
+	basename = para_basename(nmmd->afd.path);
+	dirname = para_dirname(nmmd->afd.path);
+	if (basename) {
+		localtime_r(&nmmd->mtime, &mtime_tm);
+		strftime(mtime, 29, "%a %b %d %Y", &mtime_tm);
+	}
 	gettimeofday(&now, NULL);
 	ret = make_message(
-		"%s:%zu\n"	"%s:%s\n"		"%s:%lu\n"	"%s:%u\n"
-		"%s:%s\n"	"%s:%s\n"	"%s:%s\n"	"%s:%s\n"
-		"%s:%li\n" 	"%s:%s\n"	"%s"
-		"%s:%s\n"	"%s:%lu.%lu\n"	"%s:%lu.%lu\n",
+		"%s:%zu\n"	"%s:%s\n"		"%s:%lu\n"
+		"%s:%s\n"	"%s:%s\n"	"%s:%s\n"
+		"%s:%li\n" 	"%s:%s\n"
+		"%s:%s\n"	"%s:%lu.%lu\n"	"%s:%lu.%lu\n"
+		"%s:%s\n"	"%s\n",
 		status_item_list[SI_FILE_SIZE], nmmd->size / 1024,
 		status_item_list[SI_MTIME], mtime,
-		status_item_list[SI_LENGTH], nmmd->afi.seconds_total,
-		status_item_list[SI_NUM_PLAYED], nmmd->num_played,
+		status_item_list[SI_LENGTH], nmmd->afd.afhi.seconds_total,
 
-		status_item_list[SI_STATUS_BAR], bar ? bar : "(none)",
+		status_item_list[SI_BASENAME], basename ? basename : "(none)",
 		status_item_list[SI_STATUS], status,
 		status_item_list[SI_STATUS_FLAGS], flags,
-		status_item_list[SI_SELECTOR], "FIXME",
 
 		status_item_list[SI_OFFSET], offset,
-		status_item_list[SI_FORMAT], audio_format_name(nmmd->audio_format),
-		nmmd->afi.info_string,
+		status_item_list[SI_AFS_MODE], mmd->afs_mode_string,
 
 		status_item_list[SI_UPTIME], ut,
 		status_item_list[SI_STREAM_START],
@@ -170,10 +137,14 @@ static char *get_status(struct misc_meta_data *nmmd)
 			(long unsigned)nmmd->stream_start.tv_usec,
 		status_item_list[SI_CURRENT_TIME],
 			(long unsigned)now.tv_sec,
-			(long unsigned)now.tv_usec
+			(long unsigned)now.tv_usec,
+
+		status_item_list[SI_DIRECTORY], dirname? dirname : "(none)",
+		nmmd->afd.afs_status_info
 
 	);
-	free(bar);
+	free(basename);
+	free(dirname);
 	free(flags);
 	free(status);
 	free(ut);
@@ -340,61 +311,6 @@ int com_version(int fd, int argc, __a_unused char * const * argv)
 	);
 }
 
-/* sc */
-int com_sc(int fd, int argc, char * const * argv)
-{
-	char *name = NULL;
-	int ret, old = 0, count = -1; /* print af change forever */
-
-	if (argc > 1)
-		count = atoi(argv[1]);
-repeat:
-	mmd_lock();
-	if (old != mmd->num_played) {
-		old = mmd->num_played;
-		name = para_strdup(mmd->filename);
-	}
-	mmd_unlock();
-	if (name) {
-		ret = send_va_buffer(fd, "%s\n", name);
-		free(name);
-		name = NULL;
-		if (ret < 0)
-			return ret;
-		if (argc > 1 && !--count)
-			return 1;
-	}
-	usleep(500000);
-	goto repeat;
-}
-
-/* sb */
-int com_sb(int fd, int argc, char * const * argv)
-{
-	char *sb;
-	int ret, nr = -1;	/* status bar will be printed that many
-				 * times. Negative value means: print
-				 * forever
-				 */
-	if (argc > 1)
-		nr = atoi(argv[1]);
-	while (nr) {
-		mmd_lock();
-		sb = get_sb_string(mmd);
-		mmd_unlock();
-		ret = send_va_buffer(fd, "%s\n", sb);
-		free(sb);
-		if (ret < 0)
-			return ret;
-		if (nr == 1)
-			return 1;
-		usleep(500000);
-		if (nr > 0)
-			nr--;
-	}
-	return 1;
-}
-
 /* stat */
 int com_stat(int fd, int argc, char * const * argv)
 {
@@ -445,7 +361,7 @@ static int send_list_of_commands(int fd, struct server_command *cmd,
 	return 1;
 }
 
-/* always returns string that must be freed by the caller in handler */
+/* returns string that must be freed by the caller */
 static struct server_command *get_cmd_ptr(const char *name, char **handler)
 {
 	struct server_command *cmd;
@@ -453,13 +369,16 @@ static struct server_command *get_cmd_ptr(const char *name, char **handler)
 	for (cmd = server_cmds; cmd->name; cmd++)
 		if (!strcmp(cmd->name, name)) {
 			if (handler)
-				*handler = para_strdup("para_server"); /* server commands */
+				*handler = para_strdup("server"); /* server commands */
 			return cmd;
 		}
 	/* not found, look for commands supported by afs */
 	for (cmd = afs_cmds; cmd->name; cmd++)
-		if (!strcmp(cmd->name, name))
+		if (!strcmp(cmd->name, name)) {
+			if (handler)
+				*handler = para_strdup("afs");
 			return cmd;
+		}
 	return NULL;
 }
 
@@ -598,20 +517,20 @@ int com_ff(__a_unused int fd, int argc, char * const * argv)
 		backwards = 1; /* jmp backwards */
 	mmd_lock();
 	ret = -E_NO_AUDIO_FILE;
-	if (!mmd->afi.chunks_total || !mmd->afi.seconds_total)
+	if (!mmd->afd.afhi.chunks_total || !mmd->afd.afhi.seconds_total)
 		goto out;
-	promille = (1000 * mmd->current_chunk) / mmd->afi.chunks_total;
+	promille = (1000 * mmd->current_chunk) / mmd->afd.afhi.chunks_total;
 	if (backwards)
-		promille -= 1000 * i / mmd->afi.seconds_total;
+		promille -= 1000 * i / mmd->afd.afhi.seconds_total;
 	else
-		promille += 1000 * i / mmd->afi.seconds_total;
+		promille += 1000 * i / mmd->afd.afhi.seconds_total;
 	if (promille < 0)
 		promille = 0;
 	if (promille >  1000) {
 		mmd->new_vss_status_flags |= VSS_NEXT;
 		goto out;
 	}
-	mmd->repos_request = (mmd->afi.chunks_total * promille) / 1000;
+	mmd->repos_request = (mmd->afd.afhi.chunks_total * promille) / 1000;
 	mmd->new_vss_status_flags |= VSS_REPOS;
 	mmd->new_vss_status_flags &= ~VSS_NEXT;
 	mmd->events++;
@@ -633,12 +552,12 @@ int com_jmp(__a_unused int fd, int argc, char * const * argv)
 		return -E_COMMAND_SYNTAX;
 	mmd_lock();
 	ret = -E_NO_AUDIO_FILE;
-	if (!mmd->afi.chunks_total)
+	if (!mmd->afd.afhi.chunks_total)
 		goto out;
 	if (i > 100)
 		i = 100;
 	PARA_INFO_LOG("jumping to %lu%%\n", i);
-	mmd->repos_request = (mmd->afi.chunks_total * i + 50)/ 100;
+	mmd->repos_request = (mmd->afd.afhi.chunks_total * i + 50)/ 100;
 	PARA_INFO_LOG("sent: %lu,  offset before jmp: %lu\n",
 		mmd->chunks_sent, mmd->offset);
 	mmd->new_vss_status_flags |= VSS_REPOS;
@@ -676,17 +595,12 @@ static struct server_command *parse_cmd(const char *cmdstr)
 	return get_cmd_ptr(buf, NULL);
 }
 
-static long int para_rand(long unsigned max)
-{
-	return (long int) ((max + 0.0) * (random() / (RAND_MAX + 1.0)));
-}
-
 static void init_rc4_keys(void)
 {
 	int i;
 
 	for (i = 0; i < 2 * RC4_KEY_LEN; i++)
-		rc4_buf[i] = para_rand(256);
+		rc4_buf[i] = para_random(256);
 	PARA_DEBUG_LOG("rc4 keys initialized (%u:%u)\n",
 		(unsigned char) rc4_buf[0],
 		(unsigned char) rc4_buf[RC4_KEY_LEN]);