Replace the per-iop input_timeout by per-function timeouts

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

diff --git a/src/lib/player/recvclient.c b/src/lib/player/recvclient.c
index a34b278a716a47dea61b81773d24a24ba189417c..33c3cbbe53ef9bef39ae424215f77f15db74f739 100644 (file)
--- a/src/lib/player/recvclient.c
+++ b/src/lib/player/recvclient.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, 1986
- *     Markus Armbruster, 2006-2008
+ *     Markus Armbruster, 2006-2012
  *     Ron Koenderink, 2009
  */
 
@@ -37,29 +36,32 @@
 
 #include "empio.h"
 #include "journal.h"
+#include "optlist.h"
 #include "player.h"
 #include "prototypes.h"
 
 /*
  * Receive a line of input from the current player.
- * If the player's eof flag is set, return -1 without receiving input.
- * If the player's aborted flag is set, return -2 without receiving
+ * If the player's aborted flag is set, return -1 without receiving
  * input.
  * Else receive one line and store it in CMD[SIZE].
  * This may block for input, yielding the processor.  Flush buffered
  * output when blocking, to make sure player sees the prompt.
  * If the player's connection has the I/O error or EOF indicator set,
- * or the line is "ctld", set the player's eof and aborted flag and
+ * or the line is "aborted", set the player's aborted flag and return
+ * -1.
+ * If we block and time out, set the EOF indicator on the player's
+ * connection, set the player's aborted flag, and return -1.
+ * If the line is "ctld", set the player's eof and aborted flag and
  * return -1.
- * If the line is "aborted", set the player's aborted flag and return
- * -2.
  * Else return the length of the line.
  * Design bug: there is no way to indicate truncation of a long line.
  */
 int
 recvclient(char *cmd, int size)
 {
-    int count;
+    int count, res;
+    struct timeval timeout;
 
     count = -1;
     while (!player->aborted) {
@@ -68,29 +70,41 @@ recvclient(char *cmd, int size)
        if (count >= 0) {
            /* got it */
            if (strcmp(cmd, "ctld") == 0)
-               player->aborted = player->eof = 1;
+               player->aborted = player->got_ctld = 1;
            if (strcmp(cmd, "aborted") == 0)
                player->aborted = 1;
            journal_input(cmd);
            break;
        }
 
-       /* Make sure player sees prompt */
-       io_output_all(player->iop);
+       /*
+        * Flush all queued output before potentially sleeping in
+        * io_input(), to make sure player sees the prompt.
+        */
+       while (io_output(player->iop,
+                        player->may_sleep >= PLAYER_SLEEP_ON_INPUT) > 0)
+           ;
 
        /*
-        * If io_output_all() blocked and got unblocked by command
+        * If io_output() blocked and got unblocked by command
         * abortion, we must return without blocking in io_input().
         */
        if (player->aborted)
            break;
 
-       if (io_input(player->iop, IO_WAIT) <= 0) {
-           if (!io_error(player->iop) && !io_eof(player->iop)) {
-               pr_flash(player, "idle connection terminated\n");
-               player->state = PS_SHUTDOWN;
-           }
-           player->aborted = player->eof = 1;
+       timeout.tv_sec = minutes(max_idle);
+       timeout.tv_usec = 0;
+       res = io_input(player->iop, &timeout);
+       if (res > 0)
+           ;
+       else if (res < 0)
+           player->aborted = 1;
+       else if (io_eof(player->iop))
+           player->aborted = 1;
+       else if (!player->aborted) {
+           pr_flash(player, "idle connection terminated\n");
+           io_set_eof(player->iop);
+           player->aborted = 1;
        }
     }
 
@@ -104,7 +118,7 @@ recvclient(char *cmd, int size)
            CANT_HAPPEN(player->recvfail == 256);
            empth_sleep(time(NULL) + 60);
        }
-       return player->eof ? -1 : -2;
+       return -1;
     }
 
     player->recvfail = 0;