Log connection attempts

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

diff --git a/src/lib/player/accept.c b/src/lib/player/accept.c
index 46a6b17c6d1d50a3ae0d63b066169e1151e15e10..117100468e406e9c454771c4187708ba0ae81f88 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-2013, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -44,19 +44,19 @@
 
 #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)
 {
@@ -95,14 +95,11 @@ 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 */
-       timeout.tv_sec = minutes(max_idle);
-       timeout.tv_usec = 0;
-       io_close(lp->iop, &timeout);
+       io_close(lp->iop, player->curup + login_grace_time);
        lp->iop = NULL;
     }
     back = (struct player *)lp->queue.q_back;
@@ -155,15 +152,26 @@ getplayer(natid cnum)
     return NULL;
 }
 
+time_t
+player_io_deadline(struct player *pl, int write)
+{
+    if (pl->may_sleep < (write ? PLAYER_SLEEP_FREELY : PLAYER_SLEEP_ON_INPUT))
+       return 0;
+    if (pl->state != PS_PLAYING)
+       return pl->curup + login_grace_time;
+    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;
@@ -174,11 +182,20 @@ player_accept(void *unused)
 
     /* 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");
@@ -192,21 +209,12 @@ 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;
        }
-#else
-       inaddr = &((struct sockaddr_in *)sap)->sin_addr;
-       strcpy(np->hostaddr, inet_ntoa(*(struct in_addr *)inaddr));
-#endif
+       logerror("Connect from %s", np->hostaddr);
 #ifdef RESOLVE_IPADDRESS
        hostp = gethostbyaddr(inaddr, player_addrlen, sap->sa_family);
        if (NULL != hostp)
@@ -216,7 +224,30 @@ player_accept(void *unused)
        stacksize = 100000
 /* budget */  + MAX(WORLD_SZ() * sizeof(int) * 7,
 /* power */ MAXNOC * sizeof(struct powstr));
-       sprintf(buf, "Conn%d", ns);
+       sprintf(buf, "Conn%d", conn_cnt++);
        empth_create(player_login, stacksize, 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 */
+    void *inaddr;
+
+    inaddr = sap->sa_family == AF_INET
+       ? (void *)&((struct sockaddr_in *)sap)->sin_addr
+       : (void *)&((struct sockaddr_in6 *)sap)->sin6_addr;
+    return inet_ntop(sap->sa_family, inaddr, buf, bufsz);
+#else
+    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
+}