Fix PRNG seeding to resist guessing

[empserver] / src / server / main.c

diff --git a/src/server/main.c b/src/server/main.c
index 22ef0b2e86ac5129d972074b6756b722979091be..52c4c8cc3fb2eb72494b8cf155e96979aaf9683c 100644 (file)
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2013, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -31,7 +31,7 @@
  *     Steve McClure, 1996, 1998
  *     Doug Hay, 1998
  *     Ron Koenderink, 2004-2009
- *     Markus Armbruster, 2005-2011
+ *     Markus Armbruster, 2005-2012
  */
 
 #include <config.h>
@@ -50,15 +50,13 @@
 #include "sys/socket.h"
 #endif
 
+#include "chance.h"
 #include "empio.h"
 #include "empthread.h"
 #include "file.h"
 #include "journal.h"
-#include "land.h"
 #include "match.h"
 #include "misc.h"
-#include "nat.h"
-#include "nuke.h"
 #include "optlist.h"
 #include "plane.h"
 #include "player.h"
@@ -66,7 +64,6 @@
 #include "prototypes.h"
 #include "sect.h"
 #include "server.h"
-#include "ship.h"
 #include "version.h"
 
 static void ignore(void);
@@ -79,10 +76,16 @@ static void loc_NTInit(void);
 #endif
 
 /*
- * Lock to synchronize player threads with update and shutdown.
- * Update and shutdown takes it exclusive, commands take it shared.
+ * Lock to synchronize player threads with update.
+ * Update holds it exclusive, commands hold it shared.
  */
-empth_rwlock_t *play_lock;
+empth_rwlock_t *update_lock;
+/*
+ * Lock to synchronize player threads with shutdown.
+ * Shutdown holds it exclusive, player threads in state PS_PLAYING
+ * hold it shared.
+ */
+empth_rwlock_t *shutdown_lock;
 
 static char pidfname[] = "server.pid";
 
@@ -140,7 +143,8 @@ main(int argc, char **argv)
     char *config_file = NULL;
     int force_bad_state = 0;
     int op, idx, sig;
-    unsigned seed = time(NULL);
+    unsigned seed = 0;
+    int seed_set = 0;
 
     oops_handler = ignore;
 
@@ -191,6 +195,7 @@ main(int argc, char **argv)
            break;
        case 'R':
            seed = strtoul(optarg, NULL, 10);
+           seed_set = 1;
            break;
        case 'v':
            printf("%s\n\n%s", version, legal);
@@ -251,6 +256,8 @@ main(int argc, char **argv)
        return install_service(program_name, service_name, config_file);
 #endif /* _WIN32 */
 
+    if (!seed_set)
+       seed = pick_seed();
     init_server(seed, force_bad_state);
 
 #if defined(_WIN32)
@@ -284,7 +291,6 @@ main(int argc, char **argv)
     }
 #endif /* !_WIN32 */
     start_server(flags);
-    journal_prng(seed);
 
     for (;;) {
        sig = empth_wait_for_signal();
@@ -348,7 +354,7 @@ crash_dump(void)
 static void
 init_server(unsigned seed, int force_bad_state)
 {
-    srandom(seed);
+    seed_prng(seed);
 #if defined(_WIN32)
     loc_NTInit();
 #endif
@@ -357,6 +363,9 @@ init_server(unsigned seed, int force_bad_state)
     io_init();
     init_nreport();
 
+    if (journal_startup() < 0)
+       exit(1);
+    journal_prng(seed);
     loginit("server");
 }
 
@@ -375,8 +384,10 @@ start_server(int flags)
 
     empth_init((void **)&player, flags);
 
-    if (journal_startup() < 0)
-       exit(1);
+    update_lock = empth_rwlock_create("Update");
+    shutdown_lock = empth_rwlock_create("Shutdown");
+    if (!update_lock || !shutdown_lock)
+       exit_nomem();
 
     market_init();
     update_init();
@@ -410,8 +421,8 @@ void
 shutdwn(int sig)
 {
     struct player *p;
-    time_t now;
-    int i, queues_drained;
+    time_t now = time(NULL);
+    int i;
 
     logerror("Shutdown commencing (cleaning up threads.)");
 
@@ -419,34 +430,25 @@ shutdwn(int sig)
        if (p->state != PS_PLAYING)
            continue;
        pr_flash(p, "Server shutting down...\n");
-       p->state = PS_SHUTDOWN;
+       io_set_eof(p->iop);
+       p->aborted = 1;
        p->may_sleep = PLAYER_SLEEP_NEVER;
-       p->aborted++;
        if (p->command) {
            pr_flash(p, "Shutdown aborting command\n");
        }
        empth_wakeup(p->proc);
     }
-    empth_rwlock_wrlock(play_lock);
 
-    now = time(NULL);
+    empth_rwlock_wrlock(shutdown_lock);
     empth_yield();
-    for (i = 1; i <= 3; i++) {
-       queues_drained = 1;
-       for (p = player_next(NULL); p; p = player_next(p)) {
-           if (io_outputwaiting(p->iop))
-               queues_drained = 0;
-       }
-       if (queues_drained)
-           break;
-       logerror("Waiting for player output to drain\n");
+
+    for (i = 1; i <= 3 && player_next(NULL); i++) {
+       logerror("Waiting for player threads to terminate\n");
        empth_sleep(now + i);
     }
 
-    for (p = player_next(NULL); p; p = player_next(p)) {
-       if (io_outputwaiting(p->iop))
-           logerror("Output for player %d lost", p->cnum);
-    }
+    for (p = player_next(NULL); p; p = player_next(p))
+       logerror("Player %d lingers, output might be lost", p->cnum);
 
     if (sig)
        logerror("Server shutting down on signal %d", sig);