X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=1ca54da90191fd270c98b3001d16a4b5f5c04c53;hp=bfa58e400e1cc5d62a3eb5d2a3264b26d562a964;hb=7ad440cc721a097ecff7aa3f38f22806c644a497;hpb=2a1a8d48bb089e4d1fbf26670c53a3524c422ff8

diff --git a/command.c b/command.c
index bfa58e40..1ca54da9 100644
--- a/command.c
+++ b/command.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -20,15 +20,18 @@
 #include "afs.h"
 #include "server.h"
 #include "vss.h"
+#include "list.h"
 #include "send.h"
 #include "rc4.h"
 #include "net.h"
 #include "daemon.h"
 #include "fd.h"
-#include "list.h"
+#include "ipc.h"
 #include "user_list.h"
 #include "server_command_list.h"
 #include "afs_command_list.h"
+#include "sched.h"
+#include "signal.h"
 
 /** Commands including options must be shorter than this. */
 #define MAX_COMMAND_LEN 32768
@@ -37,31 +40,36 @@ static RC4_KEY rc4_recv_key;
 static RC4_KEY rc4_send_key;
 static unsigned char rc4_buf[2 * RC4_KEY_LEN];
 
+extern int mmd_mutex;
 extern struct misc_meta_data *mmd;
 extern struct sender senders[];
 
 static void dummy(__a_unused int s)
-{}
+{
+}
 
 static void mmd_dup(struct misc_meta_data *new_mmd)
 {
-	mmd_lock();
+	mutex_lock(mmd_mutex);
 	*new_mmd = *mmd;
-	mmd_unlock();
+	mutex_unlock(mmd_mutex);
 }
 
 /*
- * compute human readable string containing
- * vss status for given integer value
+ * Compute human readable string containing vss status for given integer value.
+ *
+ * We don't want to use vss_playing() and friends here because we take a
+ * snapshot of the mmd struct and use the copy for computing the state of the
+ * vss. If the real data were used, we would take the mmd lock for a rather
+ * long time or risk to get an inconsistent view.
  */
 static char *vss_status_tohuman(unsigned int flags)
 {
 	if (flags & VSS_PLAYING)
 		return para_strdup("playing");
-	else if (flags & VSS_NEXT)
+	if (flags & VSS_NEXT)
 		return para_strdup("stopped");
-	else
-		return para_strdup("paused");
+	return para_strdup("paused");
 }
 
 /*
@@ -100,7 +108,7 @@ static char *get_status(struct misc_meta_data *nmmd)
 	char *status, *flags; /* vss status info */
 	char *ut = uptime_str();
 	long offset = (nmmd->offset + 500) / 1000;
-	struct timeval now;
+	struct timeval current_time;
 	struct tm mtime_tm;
 
 	/* report real status */
@@ -108,9 +116,9 @@ 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);
+	gettimeofday(&current_time, NULL);
 	ret = make_message(
 		"%s: %zu\n" /* file size */
 		"%s: %s\n" /* mtime */
@@ -120,7 +128,7 @@ static char *get_status(struct misc_meta_data *nmmd)
 		"%s: %s\n" /* afs mode */
 		"%s: %lu.%lu\n" /* stream start */
 		"%s: %lu.%lu\n" /* current server time */
-		"%s\n", /* afs status info */
+		"%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,
@@ -133,8 +141,8 @@ static char *get_status(struct misc_meta_data *nmmd)
 			(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)current_time.tv_sec,
+			(long unsigned)current_time.tv_usec,
 
 		nmmd->afd.verbose_ls_output
 
@@ -167,12 +175,8 @@ static int check_sender_args(int argc, char * const * argv, struct sender_comman
 	if (!subcmds[i])
 		return -E_COMMAND_SYNTAX;
 	scd->cmd_num = i;
-	mmd_lock();
-	if (!senders[scd->sender_num].client_cmds[scd->cmd_num]) {
-		mmd_unlock();
+	if (!senders[scd->sender_num].client_cmds[scd->cmd_num])
 		return -E_SENDER_CMD;
-	}
-	mmd_unlock();
 	switch (scd->cmd_num) {
 	case SENDER_ON:
 	case SENDER_OFF:
@@ -183,7 +187,7 @@ static int check_sender_args(int argc, char * const * argv, struct sender_comman
 	case SENDER_ALLOW:
 		if (argc != 4 && argc != 5)
 			return -E_COMMAND_SYNTAX;
-		if (!inet_pton(AF_INET, argv[3], &scd->addr))
+		if (!is_valid_ipv4_address(argv[3]))
 			return -E_COMMAND_SYNTAX;
 		scd->netmask = 32;
 		if (argc == 5) {
@@ -191,20 +195,13 @@ static int check_sender_args(int argc, char * const * argv, struct sender_comman
 			if (scd->netmask < 0 || scd->netmask > 32)
 				return -E_COMMAND_SYNTAX;
 		}
+		strncpy(scd->host, argv[3], sizeof(scd->host));
 		break;
 	case SENDER_ADD:
 	case SENDER_DELETE:
-		if (argc != 4 && argc != 5)
-			return -E_COMMAND_SYNTAX;
-		if (!inet_pton(AF_INET, argv[3], &scd->addr))
+		if (argc != 4)
 			return -E_COMMAND_SYNTAX;
-		scd->port = -1;
-		if (argc == 5) {
-			scd->port = atoi(argv[4]);
-			if (scd->port < 0 || scd->port > 65535)
-				return -E_COMMAND_SYNTAX;
-		}
-		break;
+		return parse_fec_url(argv[3], scd);
 	default:
 		return -E_COMMAND_SYNTAX;
 	}
@@ -234,19 +231,19 @@ int com_sender(int fd, int argc, char * const * argv)
 		if (scd.sender_num < 0)
 			return ret;
 		msg = senders[scd.sender_num].help();
-		send_buffer(fd, msg);
+		ret = send_buffer(fd, msg);
 		free(msg);
-		return 1;
+		return ret;
 	}
 	for (i = 0; i < 10; i++) {
-		mmd_lock();
+		mutex_lock(mmd_mutex);
 		if (mmd->sender_cmd_data.cmd_num >= 0) {
-			mmd_unlock();
+			mutex_unlock(mmd_mutex);
 			usleep(100 * 1000);
 			continue;
 		}
-		mmd->sender_cmd_data = scd;
-		mmd_unlock();
+		memcpy(&mmd->sender_cmd_data, &scd, sizeof(scd));
+		mutex_unlock(mmd_mutex);
 		break;
 	}
 	return (i < 10)? 1 : -E_LOCK;
@@ -261,7 +258,7 @@ int com_si(int fd, int argc, __a_unused char * const * argv)
 
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
-	mmd_lock();
+	mutex_lock(mmd_mutex);
 	for (i = 0; senders[i].name; i++) {
 		char *info = senders[i].info();
 		sender_info = para_strcat(sender_info, info);
@@ -271,14 +268,16 @@ int com_si(int fd, int argc, __a_unused char * const * argv)
 	}
 	ut = uptime_str();
 	ret = send_va_buffer(fd, "up: %s\nplayed: %u\n"
-		"pid: %d\n"
+		"server_pid: %d\n"
+		"afs_pid: %d\n"
 		"connections (active/accepted/total): %u/%u/%u\n"
-		"current loglevel: %i\n"
+		"current loglevel: %s\n"
 		"supported audio formats: %s\n"
 		"supported senders: %s\n"
 		"%s",
 		ut, mmd->num_played,
-		getppid(),
+		(int)getppid(),
+		(int)mmd->afs_pid,
 		mmd->active_connections,
 		mmd->num_commands,
 		mmd->num_connects,
@@ -287,7 +286,7 @@ int com_si(int fd, int argc, __a_unused char * const * argv)
 		sender_list,
 		sender_info
 	);
-	mmd_unlock();
+	mutex_unlock(mmd_mutex);
 	free(ut);
 	free(sender_list);
 	free(sender_info);
@@ -301,7 +300,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"
 	);
 }
 
@@ -314,7 +313,7 @@ int com_stat(int fd, int argc, char * const * argv)
 	struct misc_meta_data tmp, *nmmd = &tmp;
 	char *s;
 
-	signal(SIGUSR1, dummy);
+	para_sigaction(SIGUSR1, dummy);
 
 	if (argc > 1)
 		num = atoi(argv[1]);
@@ -327,7 +326,7 @@ int com_stat(int fd, int argc, char * const * argv)
 		if (ret < 0)
 			goto out;
 		ret = 1;
-		if (num == 1)
+		if (num > 0 && !--num)
 			goto out;
 		sleep(50);
 		if (getppid() == 1)
@@ -436,10 +435,10 @@ int com_play(__a_unused int fd, int argc, __a_unused char * const * argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
-	mmd_lock();
+	mutex_lock(mmd_mutex);
 	mmd->new_vss_status_flags |= VSS_PLAYING;
 	mmd->new_vss_status_flags &= ~VSS_NOMORE;
-	mmd_unlock();
+	mutex_unlock(mmd_mutex);
 	return 1;
 
 }
@@ -449,11 +448,11 @@ int com_stop(__a_unused int fd, int argc, __a_unused char * const * argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
-	mmd_lock();
+	mutex_lock(mmd_mutex);
 	mmd->new_vss_status_flags &= ~VSS_PLAYING;
 	mmd->new_vss_status_flags &= ~VSS_REPOS;
 	mmd->new_vss_status_flags |= VSS_NEXT;
-	mmd_unlock();
+	mutex_unlock(mmd_mutex);
 	return 1;
 }
 
@@ -462,12 +461,13 @@ 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())
+	mutex_lock(mmd_mutex);
+	if (!vss_paused() && !vss_stopped()) {
 		mmd->events++;
-	mmd->new_vss_status_flags &= ~VSS_PLAYING;
-	mmd->new_vss_status_flags &= ~VSS_NEXT;
-	mmd_unlock();
+		mmd->new_vss_status_flags &= ~VSS_PLAYING;
+		mmd->new_vss_status_flags &= ~VSS_NEXT;
+	}
+	mutex_unlock(mmd_mutex);
 	return 1;
 }
 
@@ -476,10 +476,10 @@ int com_next(__a_unused int fd, int argc, __a_unused char * const * argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
-	mmd_lock();
+	mutex_lock(mmd_mutex);
 	mmd->events++;
 	mmd->new_vss_status_flags |= VSS_NEXT;
-	mmd_unlock();
+	mutex_unlock(mmd_mutex);
 	return 1;
 }
 
@@ -488,10 +488,10 @@ int com_nomore(__a_unused int fd, int argc, __a_unused char * const * argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
-	mmd_lock();
+	mutex_lock(mmd_mutex);
 	if (vss_playing() || vss_paused())
 		mmd->new_vss_status_flags |= VSS_NOMORE;
-	mmd_unlock();
+	mutex_unlock(mmd_mutex);
 	return 1;
 }
 
@@ -509,7 +509,7 @@ int com_ff(__a_unused int fd, int argc, char * const * argv)
 		return -E_COMMAND_SYNTAX;
 	if (ret > 1 && c == '-')
 		backwards = 1; /* jmp backwards */
-	mmd_lock();
+	mutex_lock(mmd_mutex);
 	ret = -E_NO_AUDIO_FILE;
 	if (!mmd->afd.afhi.chunks_total || !mmd->afd.afhi.seconds_total)
 		goto out;
@@ -530,7 +530,7 @@ int com_ff(__a_unused int fd, int argc, char * const * argv)
 	mmd->events++;
 	ret = 1;
 out:
-	mmd_unlock();
+	mutex_unlock(mmd_mutex);
 	return ret;
 }
 
@@ -544,7 +544,7 @@ int com_jmp(__a_unused int fd, int argc, char * const * argv)
 		return -E_COMMAND_SYNTAX;
 	if (sscanf(argv[1], "%lu", &i) <= 0)
 		return -E_COMMAND_SYNTAX;
-	mmd_lock();
+	mutex_lock(mmd_mutex);
 	ret = -E_NO_AUDIO_FILE;
 	if (!mmd->afd.afhi.chunks_total)
 		goto out;
@@ -559,7 +559,7 @@ int com_jmp(__a_unused int fd, int argc, char * const * argv)
 	ret = 1;
 	mmd->events++;
 out:
-	mmd_unlock();
+	mutex_unlock(mmd_mutex);
 	return ret;
 }
 
@@ -569,7 +569,7 @@ out:
  */
 static int check_perms(unsigned int perms, struct server_command *cmd_ptr)
 {
-	PARA_DEBUG_LOG("%s", "checking permissions\n");
+	PARA_DEBUG_LOG("checking permissions\n");
 	return (cmd_ptr->perms & perms) < cmd_ptr->perms ? -E_PERM : 0;
 }
 
@@ -650,13 +650,19 @@ out:
 
 }
 
+static void reset_signals(void)
+{
+	para_sigaction(SIGCHLD, SIG_IGN);
+	para_sigaction(SIGINT, SIG_DFL);
+	para_sigaction(SIGTERM, SIG_DFL);
+	para_sigaction(SIGHUP, SIG_DFL);
+}
+
 /**
- * perform user authentication and execute a command
+ * Perform user authentication and execute a command.
  *
- * \param fd the file descriptor to send output to
- * \param addr socket address info of peer
- *
- * \return EXIT_SUCCESS or EXIT_FAILURE
+ * \param fd The file descriptor to send output to.
+ * \param peername Identifies the connecting peer.
  *
  * Whenever para_server accepts an incoming tcp connection on
  * the port it listens on, it forks and the resulting child
@@ -679,7 +685,7 @@ out:
  *
  * \sa alarm(2), rc4(3), crypt.c, crypt.h
  */
-int handle_connect(int fd, struct sockaddr_in *addr)
+__noreturn void handle_connect(int fd, const char *peername)
 {
 	int ret, argc, use_rc4 = 0;
 	char buf[4096];
@@ -691,12 +697,11 @@ int handle_connect(int fd, struct sockaddr_in *addr)
 	char *p, *command = NULL;
 	size_t numbytes;
 
-	signal(SIGCHLD, SIG_IGN);
-	signal(SIGINT, SIG_DFL);
-	signal(SIGTERM, SIG_DFL);
-	signal(SIGHUP, SIG_DFL);
-	signal(SIGUSR1, SIG_IGN);
-
+	reset_signals();
+	/* 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 "
@@ -736,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;
@@ -762,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)
@@ -779,28 +786,25 @@ int handle_connect(int fd, struct sockaddr_in *addr)
 	/* valid command and sufficient perms */
 	alarm(0);
 	argc = split_args(command, &argv, "\n");
-	mmd_lock();
-	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;
+	mutex_lock(mmd_mutex);
+	mmd->num_commands++;
+	mutex_unlock(mmd_mutex);
+	if (ret >= 0)
 		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));
-	ret = EXIT_FAILURE;
+	send_va_buffer(fd, "%s\n", para_strerror(-ret));
+net_err:
+	PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
 out:
 	free(command);
 	free(argv);
-	mmd_lock();
+	mutex_lock(mmd_mutex);
 	if (cmd && (cmd->perms & AFS_WRITE) && ret >= 0)
 		mmd->events++;
 	mmd->active_connections--;
-	mmd_unlock();
-	return ret;
+	mutex_unlock(mmd_mutex);
+	exit(ret < 0? EXIT_FAILURE : EXIT_SUCCESS);
 }