Replace the per-iop input_timeout by per-function timeouts

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

diff --git a/src/lib/player/accept.c b/src/lib/player/accept.c
index 87eb9124d44a27b9e76632ffee1a4222f77ab56b..46a6b17c6d1d50a3ae0d63b066169e1151e15e10 100644 (file)
--- a/src/lib/player/accept.c
+++ b/src/lib/player/accept.c
@@ -28,7 +28,7 @@
  *
  *  Known contributors to this file:
  *     Dave Pare, 1994
- *     Markus Armbruster, 2005-2010
+ *     Markus Armbruster, 2005-2012
  */
 
 #include <config.h>
@@ -71,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;
     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;
@@ -98,11 +95,14 @@ player_new(int s)
 struct player *
 player_delete(struct player *lp)
 {
+    struct timeval timeout;
     struct player *back;
 
     if (lp->iop) {
        /* it's a real player */
-       io_close(lp->iop);
+       timeout.tv_sec = minutes(max_idle);
+       timeout.tv_usec = 0;
+       io_close(lp->iop, &timeout);
        lp->iop = NULL;
     }
     back = (struct player *)lp->queue.q_back;