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

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

diff --git a/src/lib/player/accept.c b/src/lib/player/accept.c
index 1c8c60bc03cbdba91b559d08ffd8e4835cdff182..ad1e78a0bef1e5405aa715c82e708a82b51050bc 100644 (file)
--- a/src/lib/player/accept.c
+++ b/src/lib/player/accept.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2009, 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/>.
  *
  *  ---
  *
@@ -29,7 +28,7 @@
  *
  *  Known contributors to this file:
  *     Dave Pare, 1994
- *     Markus Armbruster, 2005-2008
+ *     Markus Armbruster, 2005-2012
  */
 
 #include <config.h>
@@ -72,17 +71,14 @@ struct player *
 player_new(int s)
 {
     struct player *lp;
-    struct timeval idle_timeout;
 
     lp = malloc(sizeof(struct player));
     if (!lp)
-      return NULL;
+       return NULL;
     memset(lp, 0, sizeof(struct player));
-    idle_timeout.tv_sec = max_idle * 60;
-    idle_timeout.tv_usec = 0 ;
     if (s >= 0) {
        /* real player, not dummy created by update and market update */
-       lp->iop = io_open(s, IO_READ | IO_WRITE, IO_BUFSIZE, idle_timeout);
+       lp->iop = io_open(s, IO_READ | IO_WRITE, IO_BUFSIZE);
        if (!lp->iop) {
            free(lp);
            return NULL;
@@ -99,16 +95,18 @@ player_new(int s)
 struct player *
 player_delete(struct player *lp)
 {
+    struct timeval timeout;
     struct player *back;
 
-    back = (struct player *)lp->queue.q_back;
-    if (back)
-       emp_remque(&lp->queue);
     if (lp->iop) {
        /* it's a real player */
-       io_close(lp->iop);
+       io_timeout(&timeout, player->curup + minutes(max_idle));
+       io_close(lp->iop, &timeout);
        lp->iop = NULL;
     }
+    back = (struct player *)lp->queue.q_back;
+    if (back)
+       emp_remque(&lp->queue);
     free(lp);
     /* XXX may need to free bigmap here */
     return back;
@@ -201,7 +199,7 @@ player_accept(void *unused)
        if (!inet_ntop(sap->sa_family, inaddr,
                       np->hostaddr, sizeof(np->hostaddr))) {
            logerror("inet_ntop() failed: %s", strerror(errno));
-           close(ns);
+           player_delete(np);
            continue;
        }
 #else