X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=aed9e6a0a34ab94ea6fce7b5708ac0b6e228efd2;hp=6e2cf5633891a9dd185d5e9cbf8f270eb9a39e4a;hb=858cf06b1b89dfa8b561ba270045e8fd5112a808;hpb=51cab2aba416fc1d57336f4e72da6b76ec60174c

diff --git a/command.c b/command.c
index 6e2cf563..aed9e6a0 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[];
 
@@ -109,20 +108,19 @@ static char *get_status(struct misc_meta_data *nmmd)
 	flags = vss_get_status_flags(nmmd->vss_status_flags);
 	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);
+		strftime(mtime, 29, "%b %d %Y", &mtime_tm);
 	}
 	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,
@@ -139,7 +136,7 @@ static char *get_status(struct misc_meta_data *nmmd)
 			(long unsigned)now.tv_sec,
 			(long unsigned)now.tv_usec,
 
-		nmmd->afd.afs_status_info
+		nmmd->afd.verbose_ls_output
 
 	);
 	free(flags);
@@ -281,7 +278,7 @@ int com_si(int fd, int argc, __a_unused char * const * argv)
 		"supported senders: %s\n"
 		"%s",
 		ut, mmd->num_played,
-		getppid(),
+		(int)getppid(),
 		mmd->active_connections,
 		mmd->num_commands,
 		mmd->num_connects,
@@ -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;
 }
@@ -656,8 +654,8 @@ out:
 /**
  * perform user authentication and execute a command
  *
- * \param fd the file descriptor to send output to
- * \param addr socket address info of peer
+ * \param fd	    The file descriptor to send output to
+ * \param peername  Identifies the connecting peer.
  *
  * \return EXIT_SUCCESS or EXIT_FAILURE
  *
@@ -682,7 +680,7 @@ out:
  *
  * \sa alarm(2), rc4(3), crypt.c, crypt.h
  */
-int handle_connect(int fd, struct sockaddr_in *addr)
+int handle_connect(int fd, const char *peername)
 {
 	int ret, argc, use_rc4 = 0;
 	char buf[4096];
@@ -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 "
@@ -739,15 +741,15 @@ int handle_connect(int fd, struct sockaddr_in *addr)
 	/* We can't use send_buffer here since buf may contain null bytes */
 	ret = send_bin_buffer(fd,(char *) crypt_buf, numbytes);
 	if (ret < 0)
-		goto err_out;
+		goto net_err;
 	/* recv decrypted number */
 	ret = recv_buffer(fd, buf, sizeof(buf));
 	if (ret < 0)
-		goto err_out;
+		goto net_err;
 	numbytes = ret;
 	ret = -E_AUTH;
 	if (!numbytes)
-		goto err_out;
+		goto net_err;
 	if (sscanf(buf, CHALLENGE_RESPONSE_MSG "%lu", &chall_response) < 1
 			|| chall_response != challenge_nr)
 		goto err_out;
@@ -765,12 +767,14 @@ int handle_connect(int fd, struct sockaddr_in *addr)
 		numbytes = strlen(buf);
 	ret = send_bin_buffer(fd, buf, numbytes);
 	if (ret < 0)
-		goto err_out;
+		goto net_err;
 	if (use_rc4)
 		enable_crypt(fd, rc4_recv, rc4_send, NULL);
 	ret = read_command(fd, &command);
-	if (ret < 0)
+	if (ret == -E_COMMAND_SYNTAX)
 		goto err_out;
+	if (ret < 0)
+		goto net_err;
 	ret = -E_BAD_CMD;
 	cmd = parse_cmd(command);
 	if (!cmd)
@@ -786,16 +790,16 @@ int handle_connect(int fd, struct sockaddr_in *addr)
 	mmd->num_commands++;
 	mmd_unlock();
 	PARA_NOTICE_LOG("calling com_%s() for %s@%s\n", cmd->name, u->name,
-		inet_ntoa(addr->sin_addr));
+			peername);
 	ret = cmd->handler(fd, argc, argv);
 	if (ret >= 0) {
 		ret = EXIT_SUCCESS;
 		goto out;
 	}
 err_out:
+	send_va_buffer(fd, "%s\n", PARA_STRERROR(-ret));
+net_err:
 	PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-ret));
-	if (ret != -E_SEND && ret != -E_RECV)
-		send_va_buffer(fd, "%s\n", PARA_STRERROR(-ret));
 	ret = EXIT_FAILURE;
 out:
 	free(command);