X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=077c159d571240815072a34c426f230f21a0c897;hp=d7b68a45d99807f3029749609df90b92ebaba9c3;hb=594aec07b3b0511754129be74a8d643c38e1ae77;hpb=b3f6c5fa7f0fe78e825ecc83f3b9f9893c0427c6

diff --git a/command.c b/command.c
index d7b68a45..077c159d 100644
--- a/command.c
+++ b/command.c
@@ -17,12 +17,12 @@
 #include <netdb.h>
 #include <lopsub.h>
 
+#include "server.lsg.h"
 #include "para.h"
 #include "error.h"
 #include "crypt.h"
 #include "sideband.h"
 #include "command.h"
-#include "server.cmdline.h"
 #include "string.h"
 #include "afh.h"
 #include "afs.h"
@@ -107,8 +107,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 +227,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 +246,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])
@@ -402,7 +402,7 @@ static int com_si(struct command_context *cc,
 		mmd->active_connections,
 		mmd->num_commands,
 		mmd->num_connects,
-		conf.loglevel_arg,
+		ENUM_STRING_VAL(LOGLEVEL),
 		AUDIO_FORMAT_HANDLERS
 	);
 	mutex_unlock(mmd_mutex);
@@ -457,10 +457,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)
 {
@@ -763,7 +762,7 @@ static void reset_signals(void)
 }
 
 struct connection_features {
-	bool aes_ctr128_requested;
+	int dummy; /* none at the moment */
 };
 
 static int parse_auth_request(char *buf, int len, struct user **u,
@@ -792,7 +791,7 @@ static int parse_auth_request(char *buf, int len, struct user **u,
 			if (strcmp(features[i], "sideband") == 0)
 				continue;
 			if (strcmp(features[i], "aes_ctr128") == 0)
-				cf->aes_ctr128_requested = true;
+				continue;
 			else {
 				ret = -E_BAD_FEATURE;
 				goto out;
@@ -812,8 +811,8 @@ out:
 static int run_command(struct command_context *cc, struct iovec *iov,
 		const char *peername)
 {
-	int ret, i;
-	char *p, *end;
+	int ret, i, argc;
+	char *p, *end, **argv;
 	const struct lls_command *lcmd = NULL;
 	unsigned perms;
 	struct lls_parse_result *lpr;
@@ -836,23 +835,23 @@ static int run_command(struct command_context *cc, struct iovec *iov,
 	end = iov->iov_base + iov->iov_len;
 	for (i = 0; p < end; i++)
 		p += strlen(p) + 1;
-	cc->argc = i;
-	cc->argv = para_malloc((cc->argc + 1) * sizeof(char *));
+	argc = i;
+	argv = para_malloc((argc + 1) * sizeof(char *));
 	for (i = 0, p = iov->iov_base; p < end; i++) {
-		cc->argv[i] = para_strdup(p);
+		argv[i] = para_strdup(p);
 		p += strlen(p) + 1;
 	}
-	cc->argv[cc->argc] = NULL;
+	argv[argc] = NULL;
 	PARA_NOTICE_LOG("calling com_%s() for %s@%s\n", lls_command_name(lcmd),
 		cc->u->name, peername);
-	ret = lls(lls_parse(cc->argc, cc->argv, lcmd, &lpr, &errctx));
+	ret = lls(lls_parse(argc, argv, lcmd, &lpr, &errctx));
 	if (ret >= 0) {
 		const struct server_cmd_user_data *ud = lls_user_data(lcmd);
 		ret = ud->handler(cc, lpr);
 		lls_free_parse_result(lpr, lcmd);
 	} else
 		send_errctx(cc, errctx);
-	free_argv(cc->argv);
+	free_argv(argv);
 	mutex_lock(mmd_mutex);
 	mmd->num_commands++;
 	if (ret >= 0 && (perms & AFS_WRITE))
@@ -884,7 +883,7 @@ 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)
 {
@@ -893,7 +892,7 @@ __noreturn void handle_connect(int fd, const char *peername)
 	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;
 
@@ -963,10 +962,9 @@ __noreturn void handle_connect(int fd, const char *peername)
 	alarm(0);
 	PARA_INFO_LOG("good auth for %s\n", cc->u->name);
 	/* init stream cipher keys with the second part of the random buffer */
-	cc->scc.recv = sc_new(rand_buf + CHALLENGE_SIZE, SESSION_KEY_LEN,
-		cf.aes_ctr128_requested);
+	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, cf.aes_ctr128_requested);
+		SESSION_KEY_LEN);
 	ret = send_sb(&cc->scc, NULL, 0, SBD_PROCEED, false);
 	if (ret < 0)
 		goto net_err;