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

diff --git a/command.c b/command.c
index 00f8dc31..55070a3d 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;
@@ -604,7 +603,8 @@ static int com_version(int socket_fd, int argc, __a_unused char **argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
-	return send_buffer(socket_fd, "para_server-" VERSION ", \"" CODENAME "\"\n"
+	return send_buffer(socket_fd, "para_server-" PACKAGE_VERSION ", \""
+			CODENAME "\"\n"
 			COPYRIGHT "\n"
 			"built: " BUILD_DATE "\n"
 			SYSTEM ", " CC_VERSION "\n"
@@ -690,7 +690,9 @@ static int com_stat(int socket_fd, int argc, char **argv)
 		ret = 1;
 		if (num == 1)
 			goto out;
-		usleep(500000 * 100);
+		sleep(50);
+		if (getppid() == 1)
+			return -E_SERVER_CRASH;
 	}
 out:
 	return ret;
@@ -1069,12 +1071,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);
 }
@@ -1099,7 +1103,8 @@ int handle_connect(int fd, struct sockaddr_in *addr)
 	in_addr = addr;
 	challenge_nr = random();
 	/* send Welcome message */
-	ret = send_va_buffer(fd, "This is para_server, version " VERSION  ".\n" );
+	ret = send_va_buffer(fd, "This is para_server, version "
+		PACKAGE_VERSION  ".\n" );
 	if (ret < 0)
 		goto err_out;
 	/* recv auth request line */
@@ -1168,7 +1173,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);