Update copyright notice

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

diff --git a/src/lib/player/accept.c b/src/lib/player/accept.c
index f32548e0cfad842ee5bba0bbaf222858b29582f8..cfda5bd354087bff79b041bd38d1da986e99a9f1 100644 (file)
--- a/src/lib/player/accept.c
+++ b/src/lib/player/accept.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2017, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -28,7 +28,7 @@
  *
  *  Known contributors to this file:
  *     Dave Pare, 1994
- *     Markus Armbruster, 2005-2012
+ *     Markus Armbruster, 2005-2014
  */
 
 #include <config.h>
@@ -44,19 +44,18 @@
 
 #include "empio.h"
 #include "empthread.h"
-#include "file.h"
 #include "misc.h"
 #include "nat.h"
 #include "optlist.h"
 #include "player.h"
-#include "power.h"
-#include "proto.h"
 #include "prototypes.h"
 
 static struct emp_qelem Players;
 static int player_socket;
 static size_t player_addrlen;
 
+static const char *sockaddr_ntop(struct sockaddr *, char *, size_t);
+
 void
 player_init(void)
 {
@@ -135,7 +134,7 @@ player_prev(struct player *lp)
 }
 
 /*
- * Return player in state PS_PLAYING for CNUM.
+ * Return player in state PS_PLAYING for @cnum.
  */
 struct player *
 getplayer(natid cnum)
@@ -159,39 +158,44 @@ player_io_deadline(struct player *pl, int write)
        return 0;
     if (pl->state != PS_PLAYING)
        return pl->curup + login_grace_time;
-    return pl->curup + minutes(max_idle);
+    return pl->curup
+       + minutes(pl->nstat & NONVIS ? max_idle: max_idle_visitor);
 }
 
 /*ARGSUSED*/
 void
 player_accept(void *unused)
 {
+    static int conn_cnt;
     struct sockaddr *sap;
-    void *inaddr;
-    int s = player_socket;
     struct player *np;
     socklen_t len;
+    const char *p;
     int ns;
     int set = 1;
-    int stacksize;
     char buf[128];
-#ifdef RESOLVE_IPADDRESS
-    struct hostent *hostp;
-#endif
 
     /* auto sockaddr_storage would be simpler, but less portable */
     sap = malloc(player_addrlen);
+    len = player_addrlen;
+    if (getsockname(player_socket, sap, &len)) {
+       logerror("getsockname() failed: %s", strerror(errno));
+       p = NULL;
+    } else {
+       p = sockaddr_ntop(sap, buf, sizeof(buf));
+       CANT_HAPPEN(!p);
+    }
+    logerror("Listening on %s", p ? buf : "unknown address");
 
     while (1) {
-       empth_select(s, EMPTH_FD_READ, NULL);
+       empth_select(player_socket, EMPTH_FD_READ, NULL);
        len = player_addrlen;
-       ns = accept(s, sap, &len);
+       ns = accept(player_socket, sap, &len);
        /* FIXME accept() can block on some systems (RST after select() reports ready) */
        if (ns < 0) {
            logerror("new socket accept");
            continue;
        }
-       /* FIXME SO_KEEPALIVE is useless, player_kill_idle() strikes long before */
        (void)setsockopt(ns, SOL_SOCKET, SO_KEEPALIVE, &set, sizeof(set));
        np = player_new(ns);
        if (!np) {
@@ -199,31 +203,45 @@ player_accept(void *unused)
            close(ns);
            continue;
        }
-#ifdef HAVE_GETADDRINFO
-       inaddr = sap->sa_family == AF_INET
-           ? (void *)&((struct sockaddr_in *)sap)->sin_addr
-           : (void *)&((struct sockaddr_in6 *)sap)->sin6_addr;
-       /* Assumes that if you got getaddrinfo(), you got inet_ntop() too */
-       if (!inet_ntop(sap->sa_family, inaddr,
-                      np->hostaddr, sizeof(np->hostaddr))) {
-           logerror("inet_ntop() failed: %s", strerror(errno));
+       if (!sockaddr_ntop(sap, np->hostaddr, sizeof(np->hostaddr))) {
+           CANT_REACH();
            player_delete(np);
            continue;
        }
+       logerror("Connect from %s", np->hostaddr);
+       sprintf(buf, "Conn%d", conn_cnt++);
+       empth_create(player_login, 1024 * 1024, 0, buf, np);
+    }
+}
+
+static const char *
+sockaddr_ntop(struct sockaddr *sap, char *buf, size_t bufsz)
+{
+#ifdef HAVE_GETADDRINFO
+    /* Assumes that if you got getaddrinfo(), you got inet_ntop() too */
+    sa_family_t af = sap->sa_family;
+    void *addr;
+    struct sockaddr_in6 *sap6;
+
+    if (af == AF_INET)
+       addr = &((struct sockaddr_in *)sap)->sin_addr;
+    else {
+       sap6 = (struct sockaddr_in6 *)sap;
+       addr = &sap6->sin6_addr;
+       if (IN6_IS_ADDR_V4MAPPED(&sap6->sin6_addr)) {
+           af = AF_INET;
+           addr = sap6->sin6_addr.s6_addr + 12;
+       }
+    }
+    return inet_ntop(af, addr, buf, bufsz);
 #else
-       inaddr = &((struct sockaddr_in *)sap)->sin_addr;
-       strcpy(np->hostaddr, inet_ntoa(*(struct in_addr *)inaddr));
-#endif
-#ifdef RESOLVE_IPADDRESS
-       hostp = gethostbyaddr(inaddr, player_addrlen, sap->sa_family);
-       if (NULL != hostp)
-           strcpy(np->hostname, hostp->h_name);
-#endif /* RESOLVE_IPADDRESS */
-       /* FIXME ancient black magic; figure out true stack need */
-       stacksize = 100000
-/* budget */  + MAX(WORLD_SZ() * sizeof(int) * 7,
-/* power */ MAXNOC * sizeof(struct powstr));
-       sprintf(buf, "Conn%d", ns);
-       empth_create(player_login, stacksize, 0, buf, np);
+    const char *p;
+
+    p = inet_ntoa(((struct sockaddr_in *)sap)->sin_addr);
+    if (strlen(p) >= bufsz) {
+       errno = ENOSPC;
+       return NULL;
     }
+    return strcpy(buf, p);
+#endif
 }