Fix how play_cmd() ensures connection close

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

diff --git a/src/lib/player/login.c b/src/lib/player/login.c
index b5954d58b4789d9408f982b8e5876d017a430fa8..fd56f531dfa6e34c5a2f11a622779545b108772b 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-2009
+ *     Markus Armbruster, 2004-2012
  *     Ron Koenderink, 2005-2009
  */
 
@@ -39,6 +39,7 @@
 #include "empio.h"
 #include "empthread.h"
 #include "file.h"
+#include "journal.h"
 #include "match.h"
 #include "misc.h"
 #include "nat.h"
@@ -85,7 +86,7 @@ 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);
@@ -96,6 +97,7 @@ player_login(void *ud)
            }
            continue;
        }
+       journal_input(buf);
        ac = parse(buf, space, player->argp, NULL, NULL, NULL);
        if (ac <= 0) {
            pr_id(player, C_BADCMD, "Can't parse command\n");
@@ -119,10 +121,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*/
@@ -355,9 +354,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;
 }
 
@@ -382,7 +383,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;
 }