X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=5802d37ab7a7353c545bc5dbc9c998f297a2f576;hp=89a6aeaf775c76d4448df964ba29317a42af97e5;hb=34d4086123256e31003aaddd76a0cb27fa7d0306;hpb=7e9cc63d2f6539585d47221e75031ba8bc172dec

diff --git a/command.c b/command.c
index 89a6aeaf..5802d37a 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);
@@ -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);
@@ -763,7 +763,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 +792,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 +884,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 +963,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;