X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=0b06e5c00d852206df6971d52c8d06c2e357d99e;hp=fcae6da58382bb82f301ac191396037c14bc8ae2;hb=463b82370e584a8b871311583bf9657cadd1b6cc;hpb=e9dd7df880c68a2d664ea10d167e6667707f9fd5

diff --git a/command.c b/command.c
index fcae6da5..0b06e5c0 100644
--- a/command.c
+++ b/command.c
@@ -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])
@@ -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;
@@ -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)
 {
@@ -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;