X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=ab948b09b129546da1d62a515059deb013e6f50d;hp=219e19a520a5314fd69f669dbc0372001c0df338;hb=ddb2a14f84ace45a0faec7c3cf378751ea4ac7d8;hpb=58b83584e38da0c5043497320f90e166cc4aff38

diff --git a/command.c b/command.c
index 219e19a5..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[];
 
@@ -113,16 +112,15 @@ static char *get_status(struct misc_meta_data *nmmd)
 	}
 	gettimeofday(&now, NULL);
 	ret = make_message(
-		"%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:%s\n" /* server uptime */
-		"%s:%lu.%lu\n" /* stream start */
-		"%s:%lu.%lu\n" /* current server time */
-		"%s\n", /* afs status info */
+		"%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_STATUS], status,
@@ -131,7 +129,6 @@ static char *get_status(struct misc_meta_data *nmmd)
 		status_item_list[SI_OFFSET], offset,
 		status_item_list[SI_AFS_MODE], mmd->afs_mode_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,
@@ -466,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;
 }
@@ -700,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 "