Update known contributors comments

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

diff --git a/src/lib/player/accept.c b/src/lib/player/accept.c
index 116e69b92e7e08b237f079dbb5a58ca504600649..70133ff806f171e300ec73e19a5d8b823129697d 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-2008, 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,10 +25,10 @@
  *  ---
  *
  *  accept.c: Keep track of people logged in
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1994
- *     Markus Armbruster, 2005-2008
+ *     Markus Armbruster, 2005-2010
  */
 
 #include <config.h>
@@ -72,20 +71,24 @@ 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_NBLOCK, IO_BUFSIZE);
+       lp->iop = io_open(s, IO_READ | IO_WRITE, IO_BUFSIZE, idle_timeout);
        if (!lp->iop) {
            free(lp);
            return NULL;
        }
        emp_insque(&lp->queue, &Players);
        lp->cnum = NATID_BAD;
+       lp->may_sleep = PLAYER_SLEEP_FREELY;
        lp->curid = -1;
        time(&lp->curup);
     }
@@ -103,7 +106,7 @@ player_delete(struct player *lp)
     if (lp->iop) {
        /* it's a real player */
        io_close(lp->iop);
-       lp->iop = 0;
+       lp->iop = NULL;
     }
     free(lp);
     /* XXX may need to free bigmap here */
@@ -113,24 +116,24 @@ player_delete(struct player *lp)
 struct player *
 player_next(struct player *lp)
 {
-    if (lp == 0)
+    if (!lp)
        lp = (struct player *)Players.q_forw;
     else
        lp = (struct player *)lp->queue.q_forw;
     if (&lp->queue == &Players)
-       return 0;
+       return NULL;
     return lp;
 }
 
 struct player *
 player_prev(struct player *lp)
 {
-    if (lp == 0)
+    if (!lp)
        lp = (struct player *)Players.q_back;
     else
        lp = (struct player *)lp->queue.q_back;
     if (&lp->queue == &Players)
-       return 0;
+       return NULL;
     return lp;
 }
 
@@ -173,7 +176,7 @@ player_accept(void *unused)
     sap = malloc(player_addrlen);
 
     while (1) {
-       empth_select(s, EMPTH_FD_READ);
+       empth_select(s, EMPTH_FD_READ, NULL);
        len = player_addrlen;
        ns = accept(s, sap, &len);
        /* FIXME accept() can block on some systems (RST after select() reports ready) */
@@ -197,7 +200,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