X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=ea42ef4318119a13b0fd077fc7500913161bbe93;hp=00f8dc31cdd8f0be3fbebfd9a9bf0e25650844f0;hb=30c2a4cdeb8e56db492536ead6cbba79c18f8497;hpb=a87d4a87ac7418084eb78f0bcb3accff1388df3a

diff --git a/command.c b/command.c
index 00f8dc31..ea42ef43 100644
--- a/command.c
+++ b/command.c
@@ -38,7 +38,6 @@ static unsigned char rc4_buf[2 * RC4_KEY_LEN];
 
 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 sender senders[];
 extern char *user_list;
@@ -1069,12 +1068,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);
 }
@@ -1168,7 +1169,7 @@ int handle_connect(int fd, struct sockaddr_in *addr)
 	if (ret < 0)
 		goto err_out;
 	if (use_rc4)
-		enable_crypt(fd, rc4_recv, rc4_send);
+		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);