X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=fee817b005f69c7325760238725700d04046a25e;hp=74141b9e3b5dc14d4a2ab70ed9138f2645e4debe;hb=9ae0041ae0dd073657862c4abdf3886a66035ee9;hpb=152ea84aba06555f8b828fce19d9531e97ff0b21;ds=sidebyside

diff --git a/command.c b/command.c
index 74141b9e..fee817b0 100644
--- a/command.c
+++ b/command.c
@@ -37,12 +37,19 @@ 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[];
 
-static void dummy(__a_unused int s)
-{}
+static void dummy(int s)
+{
+	/*
+	 * At least on Solaris, SIGUSR1 is one-shot, i.e. the signal action is
+	 * restored to the default state once the signal handler has been
+	 * called.
+	 */
+	if (s == SIGUSR1)
+		signal(SIGUSR1, dummy);
+}
 
 static void mmd_dup(struct misc_meta_data *new_mmd)
 {
@@ -97,51 +104,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;
 
-	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, "%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:%s\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->afd.afhi.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->afd.afsi.audio_format_id),
 		status_item_list[SI_AFS_MODE], mmd->afs_mode_string,
-		nmmd->afd.afhi.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,
-		status_item_list[SI_ATTRIBUTES], mmd->afd.attributes_string
+
+		nmmd->afd.verbose_ls_output
 
 	);
-	free(bar);
 	free(flags);
 	free(status);
 	free(ut);
@@ -281,7 +286,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,
@@ -304,7 +309,7 @@ int com_version(int fd, int argc, __a_unused char * const * argv)
 		return -E_COMMAND_SYNTAX;
 	return send_buffer(fd, VERSION_TEXT("server")
 		"built: " BUILD_DATE "\n"
-		SYSTEM ", " CC_VERSION "\n"
+		UNAME_RS ", " CC_VERSION "\n"
 	);
 }
 
@@ -366,13 +371,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;
 }
 
@@ -463,10 +471,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;
 }
@@ -589,17 +598,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]);
@@ -658,8 +662,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
  *
@@ -684,7 +688,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,8 +704,11 @@ int handle_connect(int fd, struct sockaddr_in *addr)
 	signal(SIGINT, SIG_DFL);
 	signal(SIGTERM, SIG_DFL);
 	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 "
@@ -741,15 +748,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;
@@ -767,12 +774,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)
@@ -788,16 +797,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:
-	PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-ret));
-	if (ret != -E_SEND && ret != -E_RECV)
-		send_va_buffer(fd, "%s\n", PARA_STRERROR(-ret));
+	send_va_buffer(fd, "%s\n", para_strerror(-ret));
+net_err:
+	PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
 	ret = EXIT_FAILURE;
 out:
 	free(command);