X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=55070a3d7a89950051a1374c400511527c19b7a9;hp=9098ad3c21d257c02b90e7a5ca1eee8c3d6b1759;hb=d42af6d28fa44d085b048cb064e20c79189b88b2;hpb=4b16f9ed84133d5c475eaeb887df6475ab0091bc

diff --git a/command.c b/command.c
index 9098ad3c..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;
@@ -1101,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 */