/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2005, 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,
* 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/>.
*
* ---
*
- * See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- * related information and legal notices. It is expected that any future
- * projects/authors will amend these files as needed.
+ * See files README, COPYING and CREDITS in the root of the source
+ * tree for related information and legal notices. It is expected
+ * that future projects/authors will amend these files as needed.
*
* ---
*
* accept.c: Keep track of people logged in
- *
+ *
* Known contributors to this file:
* Dave Pare, 1994
+ * Markus Armbruster, 2005-2010
*/
#include <config.h>
-#if defined(_WIN32)
-#define WIN32
-#include <winsock2.h>
-#undef NS_ALL
-#endif
+#include <errno.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <unistd.h>
-#include "prototypes.h"
-#include "misc.h"
-#include "proto.h"
+#include "empio.h"
#include "empthread.h"
-#include "player.h"
#include "file.h"
-#include "empio.h"
-#include "power.h"
-#include "gen.h"
+#include "misc.h"
+#include "nat.h"
#include "optlist.h"
-
-#if !defined(_WIN32)
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <sys/ioctl.h>
-#include <unistd.h>
-#endif
-#include <signal.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdlib.h>
-#include <stdio.h>
+#include "player.h"
+#include "power.h"
+#include "proto.h"
+#include "prototypes.h"
static struct emp_qelem Players;
static int player_socket;
-static int player_addrlen;
+static size_t player_addrlen;
void
player_init(void)
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, 0, 0);
+ 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 = 255;
+ lp->cnum = NATID_BAD;
+ lp->may_sleep = PLAYER_SLEEP_FREELY;
lp->curid = -1;
time(&lp->curup);
}
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 */
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;
}
return NULL;
}
-void
-player_wakeup_all(natid cnum)
-{
- register struct player *lp;
-
- if (NULL != (lp = getplayer(cnum)))
- player_wakeup(lp);
-}
-
-void
-player_wakeup(struct player *pl)
-{
- if (pl->waiting)
- empth_wakeup(pl->proc);
-}
-
/*ARGSUSED*/
void
player_accept(void *unused)
void *inaddr;
int s = player_socket;
struct player *np;
- int len;
+ socklen_t len;
int ns;
int set = 1;
int stacksize;
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() reported s ready) */
+ /* FIXME accept() can block on some systems (RST after select() reports ready) */
if (ns < 0) {
logerror("new socket accept");
continue;
np = player_new(ns);
if (!np) {
logerror("can't create player for fd %d", ns);
- close(ns);
- continue;
- }
+ close(ns);
+ continue;
+ }
#ifdef HAVE_GETADDRINFO
inaddr = sap->sa_family == AF_INET
? (void *)&((struct sockaddr_in *)sap)->sin_addr
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
if (NULL != hostp)
strcpy(np->hostname, hostp->h_name);
#endif /* RESOLVE_IPADDRESS */
- /* XXX may not be big enough */
+ /* FIXME ancient black magic; figure out true stack need */
stacksize = 100000
-/* budget */ + max(WORLD_X * WORLD_Y / 2 * sizeof(int) * 7,
+/* budget */ + MAX(WORLD_SZ() * sizeof(int) * 7,
/* power */ MAXNOC * sizeof(struct powstr));
- sprintf(buf, "Player (fd #%d)", ns);
- empth_create(PP_PLAYER, player_login, stacksize,
- 0, buf, "Empire player", np);
+ sprintf(buf, "Conn%d", ns);
+ empth_create(player_login, stacksize, 0, buf, np);
}
}
projects / empserver / blobdiff