Base idle timeout on player->curup again, not current time

[empserver] / src / lib / player / login.c

diff --git a/src/lib/player/login.c b/src/lib/player/login.c
index 99cba66238ee8ef7fe25acf9b4bab9a299ad104e..61e011d9bb17d6d0e101a95dbd16a1ea1a180008 100644 (file)
--- a/src/lib/player/login.c
+++ b/src/lib/player/login.c
@@ -29,7 +29,7 @@
  *  Known contributors to this file:
  *     Dave Pare, 1994
  *     Steve McClure, 2000
- *     Markus Armbruster, 2004-2011
+ *     Markus Armbruster, 2004-2012
  *     Ron Koenderink, 2005-2009
  */
 
@@ -76,6 +76,7 @@ static struct cmndstr login_coms[] = {
 void
 player_login(void *ud)
 {
+    struct timeval timeout;
     char buf[128];
     char space[128];
     int ac;
@@ -86,10 +87,11 @@ player_login(void *ud)
 
     pr_id(player, C_INIT, "Empire server ready\n");
 
-    while (player->state != PS_SHUTDOWN) {
+    for (;;) {
        io_output(player->iop, 1);
        if (io_gets(player->iop, buf, sizeof(buf)) < 0) {
-           res = io_input(player->iop, 1);
+           io_timeout(&timeout, player->curup + minutes(max_idle));
+           res = io_input(player->iop, &timeout);
            if (res <= 0) {
                if (res == 0 && !io_eof(player->iop))
                    pr_id(player, C_DATA, "idle connection terminated\n");
@@ -121,10 +123,7 @@ player_login(void *ud)
        }
     }
     player->state = PS_SHUTDOWN;
-    if (!io_eof(player->iop)) {
-       pr_id(player, C_EXIT, "so long...\n");
-       while (io_output(player->iop, 1) > 0) ;
-    }
+    pr_id(player, C_EXIT, "so long...\n");
     player_delete(player);
     empth_exit();
     /*NOTREACHED*/
@@ -357,9 +356,11 @@ play_cmd(void)
     empth_set_name(empth_self(), buf);
     logerror("%s logged in as country #%d", praddr(player), player->cnum);
     pr_id(player, C_INIT, "%d\n", CLIENTPROTO);
+    player->state = PS_PLAYING;
     player_main(player);
     logerror("%s logged out, country #%d", praddr(player), player->cnum);
-    player->state = PS_SHUTDOWN;
+    if (!io_eof(player->iop) && !io_error(player->iop))
+       io_set_eof(player->iop);
     return RET_OK;
 }
 
@@ -384,7 +385,6 @@ kill_cmd(void)
 static int
 quit_cmd(void)
 {
-    pr_id(player, C_EXIT, "so long\n");
-    io_shutdown(player->iop, IO_READ);
+    io_set_eof(player->iop);
     return RET_OK;
 }