X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=837c49cf3976b6bb7d8a1c5b7284e53d4ba51257;hp=52f4153bbafa216671e5d624bb81965e41648f35;hb=23af03dbfb283045ff952267ee83c2b7f2ef6380;hpb=13ba5f96e64bd0f3157a6fe73ed7b950ec9c5ea7

diff --git a/command.c b/command.c
index 52f4153b..837c49cf 100644
--- a/command.c
+++ b/command.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 1997 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file command.c Client authentication and server commands. */
 
@@ -107,8 +103,8 @@ static unsigned get_status(struct misc_meta_data *nmmd, bool parser_friendly,
 	clock_get_realtime(&current_time);
 	/*
 	 * The calls to WRITE_STATUS_ITEM() below never fail because
-	 * b->max_size is zero (unlimited), see para_printf(). However, clang
-	 * is not smart enough to prove this and complains nevertheless.
+	 * b->max_size is zero (unlimited), see \ref para_printf(). However,
+	 * clang is not smart enough to prove this and complains nevertheless.
 	 * Casting the return value to void silences clang.
 	 */
 	(void)WRITE_STATUS_ITEM(&b, SI_status, "%s\n", status);
@@ -227,7 +223,7 @@ static int check_sender_args(struct command_context *cc,
 		struct lls_parse_result *lpr, struct sender_command_data *scd)
 {
 	int i, ret;
-	const char *subcmds[] = {SENDER_SUBCOMMANDS};
+	const char * const subcmds[] = {SENDER_SUBCOMMANDS};
 	const char *arg;
 	char *errctx;
 	unsigned num_inputs = lls_num_inputs(lpr);
@@ -246,10 +242,10 @@ static int check_sender_args(struct command_context *cc,
 		return -E_COMMAND_SYNTAX;
 	scd->sender_num = i;
 	arg = lls_input(1, lpr);
-	for (i = 0; subcmds[i]; i++)
+	for (i = 0; i < NUM_SENDER_CMDS; i++)
 		if (!strcmp(subcmds[i], arg))
 			break;
-	if (!subcmds[i])
+	if (i == NUM_SENDER_CMDS)
 		return -E_COMMAND_SYNTAX;
 	scd->cmd_num = i;
 	if (!senders[scd->sender_num].client_cmds[scd->cmd_num])
@@ -398,7 +394,7 @@ static int com_si(struct command_context *cc,
 		"supported audio formats: %s\n",
 		ut, mmd->num_played,
 		(int)getppid(),
-		(int)mmd->afs_pid,
+		(int)afs_pid,
 		mmd->active_connections,
 		mmd->num_commands,
 		mmd->num_connects,
@@ -457,10 +453,9 @@ EXPORT_SERVER_CMD_HANDLER(version);
 	ITEM(num_chunks) \
 	ITEM(amplification) \
 
-/**
- * Write a list of audio-file related status items with empty values.
- *
- * This is used by vss when currently no audio file is open.
+/*
+ * Create a set of audio-file related status items with empty values. These are
+ * written to stat clients when no audio file is open.
  */
 static unsigned empty_status_items(bool parser_friendly, char **result)
 {
@@ -745,12 +740,11 @@ out:
 }
 EXPORT_SERVER_CMD_HANDLER(jmp);
 
-static int com_tasks(struct command_context *cc,
+/* deprecated, does nothing */
+static int com_tasks(__a_unused struct command_context *cc,
 		__a_unused struct lls_parse_result *lpr)
 {
-	char *tl = server_get_tasks();
-	assert(tl);
-	return send_sb(&cc->scc, tl, strlen(tl), SBD_OUTPUT, false);
+	return 1;
 }
 EXPORT_SERVER_CMD_HANDLER(tasks);
 
@@ -809,8 +803,7 @@ out:
 
 #define HANDSHAKE_BUFSIZE 4096
 
-static int run_command(struct command_context *cc, struct iovec *iov,
-		const char *peername)
+static int run_command(struct command_context *cc, struct iovec *iov)
 {
 	int ret, i, argc;
 	char *p, *end, **argv;
@@ -843,8 +836,8 @@ static int run_command(struct command_context *cc, struct iovec *iov,
 		p += strlen(p) + 1;
 	}
 	argv[argc] = NULL;
-	PARA_NOTICE_LOG("calling com_%s() for %s@%s\n", lls_command_name(lcmd),
-		cc->u->name, peername);
+	PARA_NOTICE_LOG("calling com_%s() for user %s\n",
+		lls_command_name(lcmd), cc->u->name);
 	ret = lls(lls_parse(argc, argv, lcmd, &lpr, &errctx));
 	if (ret >= 0) {
 		const struct server_cmd_user_data *ud = lls_user_data(lcmd);
@@ -865,7 +858,6 @@ static int run_command(struct command_context *cc, struct iovec *iov,
  * Perform user authentication and execute a command.
  *
  * \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 calls this function.
@@ -884,16 +876,16 @@ static int run_command(struct command_context *cc, struct iovec *iov,
  * the function if the connection was not authenticated when the timeout
  * expires.
  *
- * \sa alarm(2), crypt.c, crypt.h
+ * \sa alarm(2), \ref crypt.c, \ref crypt.h.
  */
-__noreturn void handle_connect(int fd, const char *peername)
+__noreturn void handle_connect(int fd)
 {
 	int ret;
 	unsigned char rand_buf[CHALLENGE_SIZE + 2 * SESSION_KEY_LEN];
 	unsigned char challenge_hash[HASH_SIZE];
 	char *command = NULL, *buf = para_malloc(HANDSHAKE_BUFSIZE) /* must be on the heap */;
 	size_t numbytes;
-	struct command_context cc_struct = {.peer = peername}, *cc = &cc_struct;
+	struct command_context cc_struct = {.u = NULL}, *cc = &cc_struct;
 	struct iovec iov;
 	struct connection_features cf;
 
@@ -972,7 +964,7 @@ __noreturn void handle_connect(int fd, const char *peername)
 	ret = recv_sb(&cc->scc, SBD_COMMAND, MAX_COMMAND_LEN, &iov);
 	if (ret < 0)
 		goto net_err;
-	ret = run_command(cc, &iov, peername);
+	ret = run_command(cc, &iov);
 	free(iov.iov_base);
 	if (ret < 0)
 		goto err_out;