X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=00f8dc31cdd8f0be3fbebfd9a9bf0e25650844f0;hp=1f94bbc25cc634d4b889e975106e32bb67c0c69f;hb=c075e867311c77dfb7171241597e613290d1f62b;hpb=e0e5a7c1a04c6a2ee4a475e823657e06e6df2f99

diff --git a/command.c b/command.c
index 1f94bbc2..00f8dc31 100644
--- a/command.c
+++ b/command.c
@@ -18,7 +18,6 @@
 
 /** \file command.c does client authentication and executes server commands */
 
-#include <malloc.h> /* mallinfo */
 #include <sys/time.h> /* gettimeofday */
 #include "crypt.h"
 #include "server.cmdline.h"
@@ -33,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];
@@ -45,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;
@@ -434,9 +428,12 @@ static char *get_status(struct misc_meta_data *nmmd)
 		nmmd->audio_file_info,
 
 		status_item_list[SI_UPTIME], ut,
-		status_item_list[SI_STREAM_START], nmmd->stream_start.tv_sec,
-			nmmd->stream_start.tv_usec,
-		status_item_list[SI_CURRENT_TIME], now.tv_sec, now.tv_usec
+		status_item_list[SI_STREAM_START],
+			(long unsigned)nmmd->stream_start.tv_sec,
+			(long unsigned)nmmd->stream_start.tv_usec,
+		status_item_list[SI_CURRENT_TIME],
+			(long unsigned)now.tv_sec,
+			(long unsigned)now.tv_usec
 
 	);
 	free(bar);
@@ -559,7 +556,6 @@ static int com_si(int fd, int argc, __a_unused char **argv)
 	int i, ret;
 	char *ut;
 	char *selector_string = NULL, *sender_info = NULL, *sender_list = NULL;
-	struct mallinfo mi = mallinfo();
 
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
@@ -578,7 +574,6 @@ static int com_si(int fd, int argc, __a_unused char **argv)
 	ut = uptime_str();
 	ret = send_va_buffer(fd, "up: %s\nplayed: %u\n"
 		"pid: %d\n"
-		"mallinfo: %d\n"
 		"connections (active/accepted/total): %u/%u/%u\n"
 		"current loglevel: %i\n"
 		"supported audio file selectors: %s\n"
@@ -587,13 +582,12 @@ static int com_si(int fd, int argc, __a_unused char **argv)
 		"%s",
 		ut, mmd->num_played,
 		getppid(),
-		mi.arena / 1024,
 		mmd->active_connections,
 		mmd->num_commands,
 		mmd->num_connects,
 		conf.loglevel_arg,
 		selector_string,
-		SUPPORTED_AUDIO_FORMATS,
+		supported_audio_formats(),
 		sender_list,
 		sender_info
 	);
@@ -1173,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);