X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=aa827f2b1cdc9ffd9984379b55c02223addcca1b;hp=6bb8cbed7117777fc98513a4a70b1c88e016bd28;hb=d16fe3df649cb48d5ffa26187da3dad4c3066646;hpb=15714678f57f0e8931a70d64dca43c31e693bb61

diff --git a/command.c b/command.c
index 6bb8cbed..aa827f2b 100644
--- a/command.c
+++ b/command.c
@@ -10,9 +10,7 @@
 #include <signal.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#include <dirent.h>
 #include <osl.h>
-#include <stdbool.h>
 
 #include "para.h"
 #include "error.h"
@@ -25,8 +23,8 @@
 #include "server.h"
 #include "list.h"
 #include "send.h"
+#include "sched.h"
 #include "vss.h"
-#include "rc4.h"
 #include "net.h"
 #include "daemon.h"
 #include "fd.h"
@@ -34,8 +32,8 @@
 #include "user_list.h"
 #include "server_command_list.h"
 #include "afs_command_list.h"
-#include "sched.h"
 #include "signal.h"
+#include "version.h"
 
 /** Commands including options must be shorter than this. */
 #define MAX_COMMAND_LEN 32768
@@ -109,7 +107,8 @@ static char *get_status(struct misc_meta_data *nmmd, int parser_friendly)
 {
 	char mtime[30] = "";
 	char *status, *flags; /* vss status info */
-	char *ut = uptime_str();
+	/* nobody updates our version of "now" */
+	char *ut = get_server_uptime_str(NULL);
 	long offset = (nmmd->offset + 500) / 1000;
 	struct timeval current_time;
 	struct tm mtime_tm;
@@ -123,16 +122,22 @@ static char *get_status(struct misc_meta_data *nmmd, int parser_friendly)
 		strftime(mtime, 29, "%b %d %Y", &mtime_tm);
 	}
 	gettimeofday(&current_time, NULL);
-	WRITE_STATUS_ITEM(&b, SI_FILE_SIZE, "%zu\n", nmmd->size / 1024);
-	WRITE_STATUS_ITEM(&b, SI_MTIME, "%s\n", mtime);
-	WRITE_STATUS_ITEM(&b, SI_STATUS, "%s\n", status);
-	WRITE_STATUS_ITEM(&b, SI_STATUS_FLAGS, "%s\n", flags);
-	WRITE_STATUS_ITEM(&b, SI_OFFSET, "%li\n", offset);
-	WRITE_STATUS_ITEM(&b, SI_AFS_MODE, "%s\n", mmd->afs_mode_string);
-	WRITE_STATUS_ITEM(&b, SI_STREAM_START, "%lu.%lu\n",
+	/*
+	 * The calls to WRITE_STATUS_ITEM() below never fail because
+	 * b->max_size is zero (unlimited), see para_printf(). However, clang
+	 * is not smart enough to prove this and complains nevertheless.
+	 * Casting the return value to void silences solves this.
+	 */
+	(void)WRITE_STATUS_ITEM(&b, SI_FILE_SIZE, "%zu\n", nmmd->size / 1024);
+	(void)WRITE_STATUS_ITEM(&b, SI_MTIME, "%s\n", mtime);
+	(void)WRITE_STATUS_ITEM(&b, SI_STATUS, "%s\n", status);
+	(void)WRITE_STATUS_ITEM(&b, SI_STATUS_FLAGS, "%s\n", flags);
+	(void)WRITE_STATUS_ITEM(&b, SI_OFFSET, "%li\n", offset);
+	(void)WRITE_STATUS_ITEM(&b, SI_AFS_MODE, "%s\n", mmd->afs_mode_string);
+	(void)WRITE_STATUS_ITEM(&b, SI_STREAM_START, "%lu.%lu\n",
 		(long unsigned)nmmd->stream_start.tv_sec,
 		(long unsigned)nmmd->stream_start.tv_usec);
-	WRITE_STATUS_ITEM(&b, SI_CURRENT_TIME, "%lu.%lu\n",
+	(void)WRITE_STATUS_ITEM(&b, SI_CURRENT_TIME, "%lu.%lu\n",
 		(long unsigned)current_time.tv_sec,
 		(long unsigned)current_time.tv_usec);
 	free(flags);
@@ -253,7 +258,7 @@ int com_si(struct stream_cipher_context *scc, int argc, __a_unused char * const
 		sender_info = para_strcat(sender_info, info);
 		free(info);
 	}
-	ut = uptime_str();
+	ut = get_server_uptime_str(now);
 	ret = sc_send_va_buffer(scc, "version: " GIT_VERSION "\n"
 		"up: %s\nplayed: %u\n"
 		"server_pid: %d\n"
@@ -731,7 +736,7 @@ __noreturn void handle_connect(int fd, const char *peername)
 	int ret, argc;
 	char buf[4096];
 	unsigned char rand_buf[CHALLENGE_SIZE + 2 * SESSION_KEY_LEN];
-	unsigned char challenge_sha1[HASH_SIZE];
+	unsigned char challenge_hash[HASH_SIZE];
 	struct user *u;
 	struct server_command *cmd = NULL;
 	char **argv = NULL;
@@ -757,13 +762,11 @@ __noreturn void handle_connect(int fd, const char *peername)
 		ret = -E_AUTH_REQUEST;
 		goto net_err;
 	}
-	numbytes = ret;
 	ret = -E_AUTH_REQUEST;
 	if (strncmp(buf, AUTH_REQUEST_MSG, strlen(AUTH_REQUEST_MSG)))
 		goto net_err;
 	p = buf + strlen(AUTH_REQUEST_MSG);
 	PARA_DEBUG_LOG("received auth request for user %s\n", p);
-	ret = -E_BAD_USER;
 	u = lookup_user(p);
 	if (u) {
 		get_random_bytes_or_die(rand_buf, sizeof(rand_buf));
@@ -796,14 +799,14 @@ __noreturn void handle_connect(int fd, const char *peername)
 	if (!u)
 		goto net_err;
 	/*
-	 * The correct response is the sha1 of the first CHALLENGE_SIZE bytes
+	 * The correct response is the hash of the first CHALLENGE_SIZE bytes
 	 * of the random data.
 	 */
 	ret = -E_BAD_AUTH;
 	if (numbytes != HASH_SIZE)
 		goto net_err;
-	sha1_hash((char *)rand_buf, CHALLENGE_SIZE, challenge_sha1);
-	if (memcmp(challenge_sha1, buf, HASH_SIZE))
+	hash_function((char *)rand_buf, CHALLENGE_SIZE, challenge_hash);
+	if (memcmp(challenge_hash, buf, HASH_SIZE))
 		goto net_err;
 	/* auth successful */
 	alarm(0);