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 ade425515c162e364ebb64fe296bbe1287362211..61e011d9bb17d6d0e101a95dbd16a1ea1a180008 100644 (file)
--- a/src/lib/player/login.c
+++ b/src/lib/player/login.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -26,11 +25,12 @@
  *  ---
  *
  *  login.c: Allow the player to login
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1994
  *     Steve McClure, 2000
- *     Markus Armbruster, 2004-2006
+ *     Markus Armbruster, 2004-2012
+ *     Ron Koenderink, 2005-2009
  */
 
 #include <config.h>
@@ -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"
@@ -68,29 +69,42 @@ static struct cmndstr login_coms[] = {
     {"quit", 0, quit_cmd, 0, 0},
     {"sanc", 0, sanc_cmd, 0, 0},
     {"user name", 0, user_cmd, 0, 0},
-    {0, 0, 0, 0, 0}
+    {NULL, 0, NULL, 0, 0}
 };
 
 /*ARGSUSED*/
 void
 player_login(void *ud)
 {
+    struct timeval timeout;
     char buf[128];
     char space[128];
     int ac;
     int cmd;
+    int res;
 
     player->proc = empth_self();
 
     pr_id(player, C_INIT, "Empire server ready\n");
 
-    while (!io_eof(player->iop) && !io_error(player->iop)) {
-       io_output(player->iop, IO_WAIT);
+    for (;;) {
+       io_output(player->iop, 1);
        if (io_gets(player->iop, buf, sizeof(buf)) < 0) {
-           io_input(player->iop, IO_WAIT);
+           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");
+               break;
+           }
+           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");
            continue;
        }
-       ac = parse(buf, player->argp, NULL, space, NULL);
        cmd = comtch(player->argp[0], login_coms, 0);
        if (cmd < 0) {
            pr_id(player, C_BADCMD, "Command %s not found\n", player->argp[0]);
@@ -107,15 +121,9 @@ player_login(void *ud)
        default:
            break;
        }
-       if (player->state >= PS_SHUTDOWN)
-           break;
     }
     player->state = PS_SHUTDOWN;
-    if (!io_eof(player->iop)) {
-       pr_id(player, C_EXIT, "so long...\n");
-       io_noblocking(player->iop, 0);
-       while (io_output(player->iop, IO_WAIT) > 0) ;
-    }
+    pr_id(player, C_EXIT, "so long...\n");
     player_delete(player);
     empth_exit();
     /*NOTREACHED*/
@@ -208,7 +216,7 @@ pass_cmd(void)
 {
     if (!player->argp[1])
        return RET_SYN;
-    if (player->cnum == 255) {
+    if (player->cnum == NATID_BAD) {
        pr_id(player, C_CMDERR, "need country first\n");
        return RET_FAIL;
     }
@@ -281,7 +289,7 @@ may_play(void)
 {
     struct natstr *np;
 
-    if (player->cnum == 255 || !player->authenticated) {
+    if (player->cnum == NATID_BAD || !player->authenticated) {
        pr_id(player, C_CMDERR, "need country and password\n");
        return 0;
     }
@@ -308,6 +316,7 @@ play_cmd(void)
     natid cnum;
     struct natstr *natp;
     char **ap;
+    char buf[128];
 
     ap = player->argp;
     if (*++ap) {
@@ -333,7 +342,7 @@ play_cmd(void)
     }
     if (!may_play())
        return RET_FAIL;
-    other = getplayer((natid)player->cnum);
+    other = getplayer(player->cnum);
     if (other) {
        natp = getnatp(player->cnum);
        if (natp->nat_stat != STAT_VIS) {
@@ -343,11 +352,15 @@ play_cmd(void)
        }
        return RET_FAIL;
     }
+    snprintf(buf, sizeof(buf), "Play#%d", player->cnum);
+    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;
 }
 
@@ -372,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;
 }