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

diff --git a/command.c b/command.c
index d7b68a45..d0aeea3d 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"
@@ -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;
@@ -812,8 +812,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 +836,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))
@@ -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;