X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=00f8dc31cdd8f0be3fbebfd9a9bf0e25650844f0;hp=e625990213b295b9be3577db3670dbc6d80f3427;hb=68ae99f74f658df5eb53c7ef0127a210e3defd5e;hpb=5d506faba5e49d3fc7eecb5b7d80b515241871d4

diff --git a/command.c b/command.c
index e6259902..00f8dc31 100644
--- a/command.c
+++ b/command.c
@@ -32,10 +32,6 @@
 #include "daemon.h"
 #include "string.h"
 
-void (*crypt_function_recv)(unsigned long len, const unsigned char *indata,
-	unsigned char *outdata) = NULL;
-void (*crypt_function_send)(unsigned long len, const unsigned char *indata,
-	unsigned char *outdata) = NULL;
 static RC4_KEY rc4_recv_key;
 static RC4_KEY rc4_send_key;
 static unsigned char rc4_buf[2 * RC4_KEY_LEN];
@@ -44,7 +40,6 @@ extern const char *status_item_list[NUM_STAT_ITEMS];
 extern struct misc_meta_data *mmd;
 extern struct gengetopt_args_info conf;
 extern struct audio_file_selector selectors[];
-extern struct audio_format afl[];
 extern struct sender senders[];
 extern char *user_list;
 struct sockaddr_in *in_addr;
@@ -592,7 +587,7 @@ static int com_si(int fd, int argc, __a_unused char **argv)
 		mmd->num_connects,
 		conf.loglevel_arg,
 		selector_string,
-		SUPPORTED_AUDIO_FORMATS,
+		supported_audio_formats(),
 		sender_list,
 		sender_info
 	);
@@ -1172,11 +1167,8 @@ int handle_connect(int fd, struct sockaddr_in *addr)
 	ret = send_bin_buffer(fd, buf, numbytes);
 	if (ret < 0)
 		goto err_out;
-	if (use_rc4) {
-		crypt_function_recv = rc4_recv;
-		crypt_function_send = rc4_send;
-		PARA_INFO_LOG("%s", "rc4 encrytion activated\n");
-	}
+	if (use_rc4)
+		enable_crypt(fd, rc4_recv, rc4_send);
 	/* read command */
 	while ((numbytes = recv_buffer(fd, buf, sizeof(buf))) > 0) {
 //		PARA_INFO_LOG("recvd: %s (%d)\n", buf, numbytes);