X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=ab948b09b129546da1d62a515059deb013e6f50d;hp=92fe18f07591f134270035c2845040efc3b070b8;hb=ddb2a14f84ace45a0faec7c3cf378751ea4ac7d8;hpb=17d2533cafc67dd0509860fa2b59ec98b23d7be7

diff --git a/command.c b/command.c
index 92fe18f0..ab948b09 100644
--- a/command.c
+++ b/command.c
@@ -37,7 +37,6 @@ static RC4_KEY rc4_recv_key;
 static RC4_KEY rc4_send_key;
 static unsigned char rc4_buf[2 * RC4_KEY_LEN];
 
-extern const char *status_item_list[NUM_STAT_ITEMS];
 extern struct misc_meta_data *mmd;
 extern struct sender senders[];
 
@@ -97,52 +96,49 @@ static char *vss_get_status_flags(unsigned int flags)
 
 static char *get_status(struct misc_meta_data *nmmd)
 {
-	char *bar, *ret, mtime[30] = "";
+	char *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);
+	if (nmmd->size) { /* parent currently has an audio file open */
+		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\n" "%s"
-		"%s:%s\n"	"%s:%lu.%lu\n"	"%s:%lu.%lu\n",
+		"%s: %zu\n" /* file size */
+		"%s: %s\n" /* mtime */
+		"%s: %s\n" /* status */
+		"%s: %s\n" /* status flags */
+		"%s: %li\n" /* offset */
+		"%s: %s\n" /* afs mode */
+		"%s: %lu.%lu\n" /* stream start */
+		"%s: %lu.%lu\n" /* current server time */
+		"%s", /* afs status info */
 		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_STATUS_BAR], bar ? bar : "(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),
 		status_item_list[SI_AFS_MODE], mmd->afs_mode_string,
-		nmmd->afi.info_string,
 
-		status_item_list[SI_UPTIME], ut,
 		status_item_list[SI_STREAM_START],
 			(long unsigned)nmmd->stream_start.tv_sec,
 			(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,
+
+		nmmd->afd.verbose_ls_output
 
 	);
-	free(bar);
 	free(flags);
 	free(status);
 	free(ut);
@@ -367,13 +363,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;
 }
 
@@ -464,10 +463,11 @@ int com_pause(__a_unused int fd, int argc, __a_unused char * const * argv)
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
 	mmd_lock();
-	if (!vss_paused())
+	if (!vss_paused() && !vss_stopped()) {
 		mmd->events++;
-	mmd->new_vss_status_flags &= ~VSS_PLAYING;
-	mmd->new_vss_status_flags &= ~VSS_NEXT;
+		mmd->new_vss_status_flags &= ~VSS_PLAYING;
+		mmd->new_vss_status_flags &= ~VSS_NEXT;
+	}
 	mmd_unlock();
 	return 1;
 }
@@ -512,20 +512,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++;
@@ -547,12 +547,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;
@@ -590,17 +590,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]);
@@ -703,6 +698,10 @@ int handle_connect(int fd, struct sockaddr_in *addr)
 	signal(SIGHUP, SIG_DFL);
 	signal(SIGUSR1, SIG_IGN);
 
+	/* we need a blocking fd here as recv() might return EAGAIN otherwise. */
+	ret = mark_fd_blocking(fd);
+	if (ret < 0)
+		goto err_out;
 	challenge_nr = random();
 	/* send Welcome message */
 	ret = send_va_buffer(fd, "This is para_server, version "