X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=9098ad3c21d257c02b90e7a5ca1eee8c3d6b1759;hp=5d785f5ce92f66618dafc877beb454bb2c0062e9;hb=27638103f249ffbe9768603b9baff199950fd9f6;hpb=db34194eaab9819772bd55ea1ab08c719ed8f1c8

diff --git a/command.c b/command.c
index 5d785f5c..9098ad3c 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_handler 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
 	);
@@ -1074,12 +1069,14 @@ static void init_rc4_keys(void)
 	RC4_set_key(&rc4_send_key, RC4_KEY_LEN, rc4_buf + RC4_KEY_LEN);
 }
 
-static void rc4_recv(unsigned long len, const unsigned char *indata, unsigned char *outdata)
+static void rc4_recv(unsigned long len, const unsigned char *indata,
+		unsigned char *outdata, __a_unused void *private_data)
 {
 	RC4(&rc4_recv_key, len, indata, outdata);
 }
 
-static void rc4_send(unsigned long len, const unsigned char *indata, unsigned char *outdata)
+static void rc4_send(unsigned long len, const unsigned char *indata,
+		unsigned char *outdata, __a_unused void *private_data)
 {
 	RC4(&rc4_send_key, len, indata, outdata);
 }
@@ -1172,11 +1169,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 encryption activated\n");
-	}
+	if (use_rc4)
+		enable_crypt(fd, rc4_recv, rc4_send, NULL);
 	/* read command */
 	while ((numbytes = recv_buffer(fd, buf, sizeof(buf))) > 0) {
 //		PARA_INFO_LOG("recvd: %s (%d)\n", buf, numbytes);