X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=command.c;h=6f6fad7c4028e0f10833cc30033402e126731d66;hb=c6d61cae8b5f71ae658dc254c6ee38a14f34dae2;hp=21131248c29cd894c8bb74cb13801cd54205e066;hpb=731b2298eec3f9a60d41457377b2fa374c15c320;p=paraslash.git

diff --git a/command.c b/command.c
index 21131248..6f6fad7c 100644
--- a/command.c
+++ b/command.c
@@ -34,6 +34,9 @@
 #include "user_list.h"
 #include "server_command_list.h"
 
+/** commands including options must be shorter than this */
+#define MAX_COMMAND_LEN 4096
+
 static RC4_KEY rc4_recv_key;
 static RC4_KEY rc4_send_key;
 static unsigned char rc4_buf[2 * RC4_KEY_LEN];
@@ -341,20 +344,18 @@ int com_si(int fd, int argc, __a_unused char **argv)
 }
 
 /* version */
-int com_version(int socket_fd, int argc, __a_unused char **argv)
+int com_version(int fd, int argc, __a_unused char **argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
-	return send_buffer(socket_fd, "para_server-" PACKAGE_VERSION ", \""
-			CODENAME "\"\n"
-			COPYRIGHT "\n"
-			"built: " BUILD_DATE "\n"
-			SYSTEM ", " CC_VERSION "\n"
-		);
+	return send_buffer(fd, VERSION_TEXT("server")
+		"built: " BUILD_DATE "\n"
+		SYSTEM ", " CC_VERSION "\n"
+	);
 }
 
 /* sc */
-int com_sc(int socket_fd, int argc, char **argv)
+int com_sc(int fd, int argc, char **argv)
 {
 	char *name = NULL;
 	int ret, old = 0, count = -1; /* print af change forever */
@@ -369,7 +370,7 @@ repeat:
 	}
 	mmd_unlock();
 	if (name) {
-		ret = send_va_buffer(socket_fd, "%s\n", name);
+		ret = send_va_buffer(fd, "%s\n", name);
 		free(name);
 		name = NULL;
 		if (ret < 0)
@@ -382,7 +383,7 @@ repeat:
 }
 
 /* sb */
-int com_sb(int socket_fd, int argc, char **argv)
+int com_sb(int fd, int argc, char **argv)
 {
 	char *sb;
 	int ret, nr = -1;	/* status bar will be printed that many
@@ -395,7 +396,7 @@ int com_sb(int socket_fd, int argc, char **argv)
 		mmd_lock();
 		sb = get_sb_string(mmd);
 		mmd_unlock();
-		ret = send_va_buffer(socket_fd, "%s\n", sb);
+		ret = send_va_buffer(fd, "%s\n", sb);
 		free(sb);
 		if (ret < 0)
 			return ret;
@@ -409,7 +410,7 @@ int com_sb(int socket_fd, int argc, char **argv)
 }
 
 /* stat */
-int com_stat(int socket_fd, int argc, char **argv)
+int com_stat(int fd, int argc, char **argv)
 {
 	int ret, num = 0;/* status will be printed that many
 			  * times. num <= 0 means: print forever
@@ -425,7 +426,7 @@ int com_stat(int socket_fd, int argc, char **argv)
 
 		mmd_dup(nmmd);
 		s = get_status(nmmd);
-		ret = send_buffer(socket_fd, s);
+		ret = send_buffer(fd, s);
 		free(s);
 		if (ret < 0)
 			goto out;
@@ -527,7 +528,7 @@ int com_help(int fd, int argc, char **argv)
 }
 
 /* hup */
-int com_hup(__a_unused int socket_fd, int argc, __a_unused char **argv)
+int com_hup(__a_unused int fd, int argc, __a_unused char **argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
@@ -536,7 +537,7 @@ int com_hup(__a_unused int socket_fd, int argc, __a_unused char **argv)
 }
 
 /* term */
-int com_term(__a_unused int socket_fd, int argc, __a_unused char **argv)
+int com_term(__a_unused int fd, int argc, __a_unused char **argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
@@ -544,7 +545,7 @@ int com_term(__a_unused int socket_fd, int argc, __a_unused char **argv)
 	return 1;
 }
 
-int com_play(__a_unused int socket_fd, int argc, __a_unused char **argv)
+int com_play(__a_unused int fd, int argc, __a_unused char **argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
@@ -557,7 +558,7 @@ int com_play(__a_unused int socket_fd, int argc, __a_unused char **argv)
 }
 
 /* stop */
-int com_stop(__a_unused int socket_fd, int argc, __a_unused char **argv)
+int com_stop(__a_unused int fd, int argc, __a_unused char **argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
@@ -570,7 +571,7 @@ int com_stop(__a_unused int socket_fd, int argc, __a_unused char **argv)
 }
 
 /* pause */
-int com_pause(__a_unused int socket_fd, int argc, __a_unused char **argv)
+int com_pause(__a_unused int fd, int argc, __a_unused char **argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
@@ -609,7 +610,7 @@ int com_chs(int fd, int argc, char **argv)
 }
 
 /* next */
-int com_next(__a_unused int socket_fd, int argc, __a_unused char **argv)
+int com_next(__a_unused int fd, int argc, __a_unused char **argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
@@ -621,7 +622,7 @@ int com_next(__a_unused int socket_fd, int argc, __a_unused char **argv)
 }
 
 /* nomore */
-int com_nomore(__a_unused int socket_fd, int argc, __a_unused char **argv)
+int com_nomore(__a_unused int fd, int argc, __a_unused char **argv)
 {
 	if (argc != 1)
 		return -E_COMMAND_SYNTAX;
@@ -633,7 +634,7 @@ int com_nomore(__a_unused int socket_fd, int argc, __a_unused char **argv)
 }
 
 /* ff */
-int com_ff(__a_unused int socket_fd, int argc, char **argv)
+int com_ff(__a_unused int fd, int argc, char **argv)
 {
 	long promille;
 	int ret, backwards = 0;
@@ -672,7 +673,7 @@ out:
 }
 
 /* jmp */
-int com_jmp(__a_unused int socket_fd, int argc, char **argv)
+int com_jmp(__a_unused int fd, int argc, char **argv)
 {
 	long unsigned int i;
 	int ret;
@@ -790,7 +791,7 @@ static void rc4_send(unsigned long len, const unsigned char *indata,
 int handle_connect(int fd, struct sockaddr_in *addr)
 {
 	int numbytes, ret, argc, use_rc4 = 0;
-	char buf[STRINGSIZE];
+	char buf[4096];
 	unsigned char crypt_buf[MAXLINE];
 	struct user u;
 	struct server_command *cmd = NULL;
@@ -874,7 +875,7 @@ int handle_connect(int fd, struct sockaddr_in *addr)
 	while ((numbytes = recv_buffer(fd, buf, sizeof(buf))) > 0) {
 //		PARA_INFO_LOG("recvd: %s (%d)\n", buf, numbytes);
 		ret = -E_COMMAND_SYNTAX;
-		if (command && numbytes + strlen(command) > STRINGSIZE) /* DOS */
+		if (command && numbytes + strlen(command) > MAX_COMMAND_LEN) /* DOS */
 			goto err_out;
 		command = para_strcat(command, buf);
 		if ((p = strstr(command, EOC_MSG))) {