X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=4a464ebf88c56ab4ed0257e39ae5767709819811;hp=4aa262ce36f2f07c026e8453bfc2364f4684884f;hb=d0d27cfa56d05eaa0e5567c75adfe606eab2957e;hpb=748d1368bc96dd7e1af879df1ea41b4d52842f7e

diff --git a/command.c b/command.c
index 4aa262ce..4a464ebf 100644
--- a/command.c
+++ b/command.c
@@ -41,7 +41,7 @@
 extern int mmd_mutex;
 extern struct misc_meta_data *mmd;
 extern struct sender senders[];
-int send_afs_status(struct stream_cipher_context *scc, int parser_friendly);
+int send_afs_status(struct command_context *cc, int parser_friendly);
 
 const char *status_item_list[] = {STATUS_ITEM_ARRAY};
 
@@ -193,29 +193,29 @@ static int check_sender_args(int argc, char * const * argv, struct sender_comman
 	return 1;
 }
 
-int com_sender(struct stream_cipher_context *scc, int argc, char * const * argv)
+int com_sender(struct command_context *cc)
 {
 	int i, ret;
 	char *msg = NULL;
 	struct sender_command_data scd;
 
-	if (argc < 2) {
+	if (cc->argc < 2) {
 		for (i = 0; senders[i].name; i++) {
 			char *tmp = make_message("%s%s\n",
 				msg? msg : "", senders[i].name);
 			free(msg);
 			msg = tmp;
 		}
-		ret = sc_send_buffer(scc, msg);
+		ret = sc_send_buffer(&cc->scc, msg);
 		free(msg);
 		return ret;
 	}
-	ret = check_sender_args(argc, argv, &scd);
+	ret = check_sender_args(cc->argc, cc->argv, &scd);
 	if (ret < 0) {
 		if (scd.sender_num < 0)
 			return ret;
 		msg = senders[scd.sender_num].help();
-		ret = sc_send_buffer(scc, msg);
+		ret = sc_send_buffer(&cc->scc, msg);
 		free(msg);
 		return ret;
 	}
@@ -224,7 +224,7 @@ int com_sender(struct stream_cipher_context *scc, int argc, char * const * argv)
 	case SENDER_ADD:
 	case SENDER_DELETE:
 		assert(senders[scd.sender_num].resolve_target);
-		ret = senders[scd.sender_num].resolve_target(argv[3], &scd);
+		ret = senders[scd.sender_num].resolve_target(cc->argv[3], &scd);
 		if (ret < 0)
 			return ret;
 	}
@@ -244,13 +244,13 @@ int com_sender(struct stream_cipher_context *scc, int argc, char * const * argv)
 }
 
 /* server info */
-int com_si(struct stream_cipher_context *scc, int argc, __a_unused char * const * argv)
+int com_si(struct command_context *cc)
 {
 	int i, ret;
 	char *ut;
 	char *sender_info = NULL;
 
-	if (argc != 1)
+	if (cc->argc != 1)
 		return -E_COMMAND_SYNTAX;
 	mutex_lock(mmd_mutex);
 	for (i = 0; senders[i].name; i++) {
@@ -259,7 +259,7 @@ int com_si(struct stream_cipher_context *scc, int argc, __a_unused char * const
 		free(info);
 	}
 	ut = get_server_uptime_str(now);
-	ret = sc_send_va_buffer(scc, "version: " GIT_VERSION "\n"
+	ret = sc_send_va_buffer(&cc->scc, "version: " GIT_VERSION "\n"
 		"up: %s\nplayed: %u\n"
 		"server_pid: %d\n"
 		"afs_pid: %d\n"
@@ -284,11 +284,11 @@ int com_si(struct stream_cipher_context *scc, int argc, __a_unused char * const
 }
 
 /* version */
-int com_version(struct stream_cipher_context *scc, int argc, __a_unused char * const * argv)
+int com_version(struct command_context *cc)
 {
-	if (argc != 1)
+	if (cc->argc != 1)
 		return -E_COMMAND_SYNTAX;
-	return sc_send_buffer(scc, VERSION_TEXT("server")
+	return sc_send_buffer(&cc->scc, VERSION_TEXT("server")
 		"built: " BUILD_DATE "\n"
 		UNAME_RS ", " CC_VERSION "\n"
 	);
@@ -350,7 +350,7 @@ static char *empty_status_items(int parser_friendly)
 #undef EMPTY_STATUS_ITEMS
 
 /* stat */
-int com_stat(struct stream_cipher_context *scc, int argc, char * const * argv)
+int com_stat(struct command_context *cc)
 {
 	int i, ret;
 	struct misc_meta_data tmp, *nmmd = &tmp;
@@ -360,8 +360,8 @@ int com_stat(struct stream_cipher_context *scc, int argc, char * const * argv)
 
 	para_sigaction(SIGUSR1, dummy);
 
-	for (i = 1; i < argc; i++) {
-		const char *arg = argv[i];
+	for (i = 1; i < cc->argc; i++) {
+		const char *arg = cc->argv[i];
 		if (arg[0] != '-')
 			break;
 		if (!strcmp(arg, "--")) {
@@ -380,12 +380,12 @@ int com_stat(struct stream_cipher_context *scc, int argc, char * const * argv)
 		}
 		return -E_COMMAND_SYNTAX;
 	}
-	if (i != argc)
+	if (i != cc->argc)
 		return -E_COMMAND_SYNTAX;
 	for (;;) {
 		mmd_dup(nmmd);
 		s = get_status(nmmd, parser_friendly);
-		ret = sc_send_buffer(scc, s);
+		ret = sc_send_buffer(&cc->scc, s);
 		free(s);
 		if (ret < 0)
 			goto out;
@@ -393,11 +393,11 @@ int com_stat(struct stream_cipher_context *scc, int argc, char * const * argv)
 			static char *esi;
 			if (!esi)
 				esi = empty_status_items(parser_friendly);
-			ret = sc_send_buffer(scc, esi);
+			ret = sc_send_buffer(&cc->scc, esi);
 			if (ret < 0)
 				goto out;
 		} else
-			send_afs_status(scc, parser_friendly);
+			send_afs_status(cc, parser_friendly);
 		ret = 1;
 		if (num > 0 && !--num)
 			goto out;
@@ -449,30 +449,30 @@ static struct server_command *get_cmd_ptr(const char *name, char **handler)
 }
 
 /* help */
-int com_help(struct stream_cipher_context *scc, int argc, char * const * argv)
+int com_help(struct command_context *cc)
 {
 	struct server_command *cmd;
 	char *perms, *handler;
 	int ret;
 
-	if (argc < 2) {
+	if (cc->argc < 2) {
 		/* no argument given, print list of commands */
-		if ((ret = send_list_of_commands(scc, server_cmds, "server")) < 0)
+		if ((ret = send_list_of_commands(&cc->scc, server_cmds, "server")) < 0)
 			return ret;
-		return send_list_of_commands(scc, afs_cmds, "afs");
+		return send_list_of_commands(&cc->scc, afs_cmds, "afs");
 	}
 	/* argument given for help */
-	cmd = get_cmd_ptr(argv[1], &handler);
+	cmd = get_cmd_ptr(cc->argv[1], &handler);
 	if (!cmd)
 		return -E_BAD_CMD;
 	perms = cmd_perms_itohuman(cmd->perms);
-	ret = sc_send_va_buffer(scc,
+	ret = sc_send_va_buffer(&cc->scc,
 		"%s - %s\n\n"
 		"handler: %s\n"
 		"permissions: %s\n"
 		"usage: %s\n\n"
 		"%s\n",
-		argv[1],
+		cc->argv[1],
 		cmd->description,
 		handler,
 		perms,
@@ -485,39 +485,38 @@ int com_help(struct stream_cipher_context *scc, int argc, char * const * argv)
 }
 
 /* hup */
-int com_hup(__a_unused struct stream_cipher_context *scc, int argc, __a_unused char * const * argv)
+int com_hup(struct command_context *cc)
 {
-	if (argc != 1)
+	if (cc->argc != 1)
 		return -E_COMMAND_SYNTAX;
 	kill(getppid(), SIGHUP);
 	return 1;
 }
 
 /* term */
-int com_term(__a_unused struct stream_cipher_context *scc, int argc, __a_unused char * const * argv)
+int com_term(struct command_context *cc)
 {
-	if (argc != 1)
+	if (cc->argc != 1)
 		return -E_COMMAND_SYNTAX;
 	kill(getppid(), SIGTERM);
 	return 1;
 }
 
-int com_play(__a_unused struct stream_cipher_context *scc, int argc, __a_unused char * const * argv)
+int com_play(struct command_context *cc)
 {
-	if (argc != 1)
+	if (cc->argc != 1)
 		return -E_COMMAND_SYNTAX;
 	mutex_lock(mmd_mutex);
 	mmd->new_vss_status_flags |= VSS_PLAYING;
 	mmd->new_vss_status_flags &= ~VSS_NOMORE;
 	mutex_unlock(mmd_mutex);
 	return 1;
-
 }
 
 /* stop */
-int com_stop(__a_unused struct stream_cipher_context *scc, int argc, __a_unused char * const * argv)
+int com_stop(struct command_context *cc)
 {
-	if (argc != 1)
+	if (cc->argc != 1)
 		return -E_COMMAND_SYNTAX;
 	mutex_lock(mmd_mutex);
 	mmd->new_vss_status_flags &= ~VSS_PLAYING;
@@ -528,9 +527,9 @@ int com_stop(__a_unused struct stream_cipher_context *scc, int argc, __a_unused
 }
 
 /* pause */
-int com_pause(__a_unused struct stream_cipher_context *scc, int argc, __a_unused char * const * argv)
+int com_pause(struct command_context *cc)
 {
-	if (argc != 1)
+	if (cc->argc != 1)
 		return -E_COMMAND_SYNTAX;
 	mutex_lock(mmd_mutex);
 	if (!vss_paused() && !vss_stopped()) {
@@ -543,9 +542,9 @@ int com_pause(__a_unused struct stream_cipher_context *scc, int argc, __a_unused
 }
 
 /* next */
-int com_next(__a_unused struct stream_cipher_context *scc, int argc, __a_unused char * const * argv)
+int com_next(struct command_context *cc)
 {
-	if (argc != 1)
+	if (cc->argc != 1)
 		return -E_COMMAND_SYNTAX;
 	mutex_lock(mmd_mutex);
 	mmd->events++;
@@ -555,9 +554,9 @@ int com_next(__a_unused struct stream_cipher_context *scc, int argc, __a_unused
 }
 
 /* nomore */
-int com_nomore(__a_unused struct stream_cipher_context *scc, int argc, __a_unused char * const * argv)
+int com_nomore(struct command_context *cc)
 {
-	if (argc != 1)
+	if (cc->argc != 1)
 		return -E_COMMAND_SYNTAX;
 	mutex_lock(mmd_mutex);
 	if (vss_playing() || vss_paused())
@@ -567,16 +566,16 @@ int com_nomore(__a_unused struct stream_cipher_context *scc, int argc, __a_unuse
 }
 
 /* ff */
-int com_ff(__a_unused struct stream_cipher_context *scc, int argc, char * const * argv)
+int com_ff(struct command_context *cc)
 {
 	long promille;
 	int ret, backwards = 0;
 	unsigned i;
 	char c;
 
-	if (argc != 2)
+	if (cc->argc != 2)
 		return -E_COMMAND_SYNTAX;
-	if (!(ret = sscanf(argv[1], "%u%c", &i, &c)))
+	if (!(ret = sscanf(cc->argv[1], "%u%c", &i, &c)))
 		return -E_COMMAND_SYNTAX;
 	if (ret > 1 && c == '-')
 		backwards = 1; /* jmp backwards */
@@ -606,14 +605,14 @@ out:
 }
 
 /* jmp */
-int com_jmp(__a_unused struct stream_cipher_context *scc, int argc, char * const * argv)
+int com_jmp(struct command_context *cc)
 {
 	long unsigned int i;
 	int ret;
 
-	if (argc != 2)
+	if (cc->argc != 2)
 		return -E_COMMAND_SYNTAX;
-	if (sscanf(argv[1], "%lu", &i) <= 0)
+	if (sscanf(cc->argv[1], "%lu", &i) <= 0)
 		return -E_COMMAND_SYNTAX;
 	mutex_lock(mmd_mutex);
 	ret = -E_NO_AUDIO_FILE;
@@ -733,17 +732,15 @@ static void reset_signals(void)
  */
 __noreturn void handle_connect(int fd, const char *peername)
 {
-	int ret, argc;
+	int ret;
 	char buf[4096];
 	unsigned char rand_buf[CHALLENGE_SIZE + 2 * SESSION_KEY_LEN];
 	unsigned char challenge_hash[HASH_SIZE];
-	struct user *u;
-	struct server_command *cmd = NULL;
-	char **argv = NULL;
 	char *p, *command = NULL;
 	size_t numbytes;
-	struct stream_cipher_context scc = {.fd = fd};
+	struct command_context cc_struct = {.peer = peername}, *cc = &cc_struct;
 
+	cc->scc.fd = fd;
 	reset_signals();
 	/* we need a blocking fd here as recv() might return EAGAIN otherwise. */
 	ret = mark_fd_blocking(fd);
@@ -767,10 +764,10 @@ __noreturn void handle_connect(int fd, const char *peername)
 		goto net_err;
 	p = buf + strlen(AUTH_REQUEST_MSG);
 	PARA_DEBUG_LOG("received auth request for user %s\n", p);
-	u = lookup_user(p);
-	if (u) {
+	cc->u = lookup_user(p);
+	if (cc->u) {
 		get_random_bytes_or_die(rand_buf, sizeof(rand_buf));
-		ret = pub_encrypt(u->pubkey, rand_buf, sizeof(rand_buf),
+		ret = pub_encrypt(cc->u->pubkey, rand_buf, sizeof(rand_buf),
 			(unsigned char *)buf);
 		if (ret < 0)
 			goto net_err;
@@ -796,7 +793,7 @@ __noreturn void handle_connect(int fd, const char *peername)
 	numbytes = ret;
 	PARA_DEBUG_LOG("received %d bytes challenge response\n", ret);
 	ret = -E_BAD_USER;
-	if (!u)
+	if (!cc->u)
 		goto net_err;
 	/*
 	 * The correct response is the hash of the first CHALLENGE_SIZE bytes
@@ -810,50 +807,50 @@ __noreturn void handle_connect(int fd, const char *peername)
 		goto net_err;
 	/* auth successful */
 	alarm(0);
-	PARA_INFO_LOG("good auth for %s\n", u->name);
+	PARA_INFO_LOG("good auth for %s\n", cc->u->name);
 	/* init stream cipher keys with the second part of the random buffer */
-	scc.recv = sc_new(rand_buf + CHALLENGE_SIZE, SESSION_KEY_LEN);
-	scc.send = sc_new(rand_buf + CHALLENGE_SIZE + SESSION_KEY_LEN, SESSION_KEY_LEN);
-	ret = sc_send_buffer(&scc, PROCEED_MSG);
+	cc->scc.recv = sc_new(rand_buf + CHALLENGE_SIZE, SESSION_KEY_LEN);
+	cc->scc.send = sc_new(rand_buf + CHALLENGE_SIZE + SESSION_KEY_LEN, SESSION_KEY_LEN);
+	ret = sc_send_buffer(&cc->scc, PROCEED_MSG);
 	if (ret < 0)
 		goto net_err;
-	ret = read_command(&scc, &command);
+	ret = read_command(&cc->scc, &command);
 	if (ret == -E_COMMAND_SYNTAX)
 		goto err_out;
 	if (ret < 0)
 		goto net_err;
 	ret = -E_BAD_CMD;
-	cmd = parse_cmd(command);
-	if (!cmd)
+	cc->cmd = parse_cmd(command);
+	if (!cc->cmd)
 		goto err_out;
 	/* valid command, check permissions */
-	ret = check_perms(u->perms, cmd);
+	ret = check_perms(cc->u->perms, cc->cmd);
 	if (ret < 0)
 		goto err_out;
 	/* valid command and sufficient perms */
-	ret = create_argv(command, "\n", &argv);
+	ret = create_argv(command, "\n", &cc->argv);
 	if (ret < 0)
 		goto err_out;
-	argc = ret;
-	PARA_NOTICE_LOG("calling com_%s() for %s@%s\n", cmd->name, u->name,
-			peername);
-	ret = cmd->handler(&scc, argc, argv);
-	free_argv(argv);
+	cc->argc = ret;
+	PARA_NOTICE_LOG("calling com_%s() for %s@%s\n", cc->cmd->name,
+		cc->u->name, peername);
+	ret = cc->cmd->handler(cc);
+	free_argv(cc->argv);
 	mutex_lock(mmd_mutex);
 	mmd->num_commands++;
 	mutex_unlock(mmd_mutex);
 	if (ret >= 0)
 		goto out;
 err_out:
-	sc_send_va_buffer(&scc, "%s\n", para_strerror(-ret));
+	sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret));
 net_err:
 	PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
 out:
 	free(command);
-	sc_free(scc.recv);
-	sc_free(scc.send);
+	sc_free(cc->scc.recv);
+	sc_free(cc->scc.send);
 	mutex_lock(mmd_mutex);
-	if (cmd && (cmd->perms & AFS_WRITE) && ret >= 0)
+	if (cc->cmd && (cc->cmd->perms & AFS_WRITE) && ret >= 0)
 		mmd->events++;
 	mmd->active_connections--;
 	mutex_unlock(mmd_mutex);