X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=f7aad89841306a3e4e431b039584f86822d82474;hp=e08b0661d14ddc4a8ef1cf2386cb75efe0655d19;hb=6b2414cd3ea3437ffb39d25ddc60eeecf3194ebc;hpb=343a65bc48b4e0cda4d9a14afcd7e96cca9c5de9

diff --git a/server.c b/server.c
index e08b0661..f7aad898 100644
--- a/server.c
+++ b/server.c
@@ -63,10 +63,13 @@
 #include <signal.h>
 #include <dirent.h>
 #include <sys/time.h>
+#include <openssl/rc4.h>
+#include <regex.h>
 #include <osl.h>
 
 #include "para.h"
 #include "error.h"
+#include "crypt.h"
 #include "server.cmdline.h"
 #include "afh.h"
 #include "string.h"
@@ -369,15 +372,14 @@ static void command_post_select(struct sched *s, struct task *t)
 	PARA_INFO_LOG("got connection from %s, forking\n", peer_name);
 	mmd->num_connects++;
 	mmd->active_connections++;
-	random();
 	/*
-	 * The chunk table is a pointer located in the mmd struct that point to
-	 * dynamically allocated memory that must be freed by the parent and
-	 * the child. However, as the mmd struct is in a shared memory area,
-	 * there's no guarantee that after the fork these pointers are still
-	 * valid in child context. As this pointer is not used in the child
-	 * anyway, we save it to a local variable and free the memory via that
-	 * copy in the child.
+	 * The chunk table is a pointer located in the mmd struct that points
+	 * to dynamically allocated memory, i.e. it must be freed by the parent
+	 * and the child. However, as the mmd struct is in a shared memory
+	 * area, there's no guarantee that after the fork this pointer is still
+	 * valid in child context. As it is not used in the child anyway, we
+	 * save it to a local variable before the fork and free the memory via
+	 * that copy in the child directly after the fork.
 	 */
 	chunk_table = mmd->afd.afhi.chunk_table;
 	child_pid = fork();
@@ -434,50 +436,24 @@ err:
 	exit(EXIT_FAILURE);
 }
 
-static void init_random_seed(void)
-{
-	unsigned int seed;
-	int fd, ret = para_open("/dev/urandom", O_RDONLY, 0);
-
-	if (ret < 0)
-		goto err;
-	fd = ret;
-	ret = read(fd, &seed, sizeof(seed));
-	if (ret < 0) {
-		ret = -ERRNO_TO_PARA_ERROR(errno);
-		goto out;
-	}
-	if (ret != sizeof(seed)) {
-		ret = -ERRNO_TO_PARA_ERROR(EIO);
-		goto out;
-	}
-	srandom(seed);
-	ret = 1;
-out:
-	close(fd);
-	if (ret >= 0)
-		return;
-err:
-	PARA_EMERG_LOG("can not seed pseudo random number generator: %s\n",
-		para_strerror(-ret));
-	exit(EXIT_FAILURE);
-}
-
 static int init_afs(void)
 {
 	int ret, afs_server_socket[2];
+	pid_t afs_pid;
 
 	ret = socketpair(PF_UNIX, SOCK_DGRAM, 0, afs_server_socket);
 	if (ret < 0)
 		exit(EXIT_FAILURE);
-	afs_socket_cookie = para_random((uint32_t)-1);
-	mmd->afs_pid = fork();
-	if (mmd->afs_pid < 0)
+	get_random_bytes_or_die((unsigned char *)&afs_socket_cookie,
+		sizeof(afs_socket_cookie));
+	afs_pid = fork();
+	if (afs_pid < 0)
 		exit(EXIT_FAILURE);
-	if (!mmd->afs_pid) { /* child (afs) */
+	if (afs_pid == 0) { /* child (afs) */
 		close(afs_server_socket[0]);
 		afs_init(afs_socket_cookie, afs_server_socket[1]);
 	}
+	mmd->afs_pid = afs_pid;
 	close(afs_server_socket[1]);
 	ret = mark_fd_nonblocking(afs_server_socket[0]);
 	if (ret < 0)
@@ -506,7 +482,7 @@ static void server_init(int argc, char **argv)
 	int afs_socket;
 
 	valid_fd_012();
-	init_random_seed();
+	init_random_seed_or_die();
 	/* parse command line options */
 	server_cmdline_parser_ext(argc, argv, &conf, &params);
 	HANDLE_VERSION_FLAG("server", conf);