--- deliantra/server/socket/init.C	2006/12/16 03:08:26	1.21
+++ deliantra/server/socket/init.C	2007/01/07 02:39:15	1.34
@@ -1,6 +1,7 @@
 /*
     CrossFire, A Multiplayer game for X-windows
 
+    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
     Copyright (C) 2001 Mark Wedel
     Copyright (C) 1992 Frank Tore Johansen
 
@@ -32,18 +33,21 @@
  * The reading of data is handled in ericserver.c
  */
 
-
 #include <global.h>
 #include <sproto.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <netinet/ip.h>
 #include <netdb.h>
 
 #include <unistd.h>
 #include <arpa/inet.h>
 
+#include <algorithm>
+
 sockvec clients;
 
 /**
@@ -54,8 +58,11 @@
 client::client (int fd, const char *peername)
 : fd (fd), host (strdup (peername)),
   socket_ev (this, &client::socket_cb),
-  cmd_ev    (this, &client::cmd_cb)
+  cmd_ev    (this, &client::cmd_cb),
+  cc_inv (this), cc_other (this)
 {
+  refcnt_inc (); // the socket is an external reference
+
   {
     struct linger linger_opt;
 
@@ -63,10 +70,43 @@
     linger_opt.l_linger = 0;
 
     if (setsockopt (fd, SOL_SOCKET, SO_LINGER, &linger_opt, sizeof (struct linger)))
-      LOG (llevError, "Cannot setsockopt(SO_LINGER): %s\n", strerror (errno));
+      LOG (llevError, "SO_LINGER: %s\n", strerror (errno));
+  }
+
+  {
+    int val = IPTOS_LOWDELAY;
+
+    if (setsockopt (fd, IPPROTO_IP, IP_TOS, &val, sizeof (val)))
+      LOG (llevError, "IP_TOS: %s\n", strerror (errno));
   }
 
   {
+    int val = 1;
+
+    if (setsockopt (fd, IPPROTO_TCP, TCP_NODELAY, &val, sizeof (val)))
+      LOG (llevError, "TCP_NODELAY: %s\n", strerror (errno));
+  }
+
+#ifdef __linux__
+  {
+     int val;
+
+     // set some very aggressive keepalive parameters
+     val = 10;
+     if (setsockopt (fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof (val)))
+       LOG (llevError, "TCP_KEEPIDLE: %s\n", strerror (errno));
+
+     val = 5;
+     if (setsockopt (fd, IPPROTO_TCP, TCP_KEEPCNT, &val, sizeof (val)))
+       LOG (llevError, "TCP_KEEPCNT: %s\n", strerror (errno));
+
+     val = 1;
+     if (setsockopt (fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof (val)))
+       LOG (llevError, "TCP_KEEPINTVL: %s\n", strerror (errno));
+  }
+#endif
+
+  {
     int bufsize = 65535;          /*Supposed absolute upper limit */
     int oldbufsize;
     int buflen = sizeof (int);
@@ -85,17 +125,14 @@
     getsockopt (fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen);
   }
 
+  state = ST_SETUP;
   mapmode = Map0Cmd;
   darkness = 1;
-  status = Ns_Add;
   mapx = 11;
   mapy = 11;
   itemcmd = 1;              /* Default is version item1 command */
 
-  faces_sent_len = nrofpixmaps;
-  faces_sent = (uint8 *)calloc (nrofpixmaps, sizeof (*faces_sent));
-  if (!faces_sent)
-    fatal (OUT_OF_MEMORY);
+  faces_sent = salloc0<uint8> (nrofpixmaps);
 
   /* Do this so we don't send a face command for the client for
    * this face.  Face 0 is sent to the client to say clear
@@ -114,36 +151,44 @@
   cmd_ev.prio (PE_PRIO_NORMAL + 2);
 
   // initialisation done, kick it!
-
   send_packet_printf ("version %d %d %s\n", VERSION_CS, VERSION_SC, VERSION_INFO);
   flush ();
 
-#if 0//TODO
-  socket_info.nconns++;
-  if (socket_info.nconns > cst_tot.max_conn) cst_tot.max_conn = socket_info.nconns;
-  if (socket_info.nconns > cst_lst.max_conn) cst_lst.max_conn = socket_info.nconns;
-#endif
+  clients.insert (this);
 }
 
 client::~client ()
 {
-  if (pl)
-    pl->socket = 0;
+  clients.erase (this);
 
-  if (fd >= 0)
-    close (fd), fd = -1;
-
-  free (stats.range), stats.range = 0;
-  free (stats.title), stats.title = 0;
-  free (host), host = 0;
+  sfree<uint8> (faces_sent, nrofpixmaps);
+  free (stats.range);
+  free (stats.title);
+  free (host);
 }
 
 void
-client::destroy ()
+client::do_destroy ()
 {
-  status = Ns_Dead;
+  attachable::do_destroy ();
+
+  if (pl)
+    pl->disconnect ();
+
+  if (fd >= 0)
+    {
+      send_packet ("goodbye");
+      flush ();
+
+      close (fd);
+    }
+
+  state = ST_DEAD;
+
   socket_ev.suspend ();
   cmd_ev.suspend ();
+
+  refcnt_dec (); // socket no longer open
 }
 
 /** This sets up the socket and reads all the image information into memory. */
@@ -173,26 +218,23 @@
   free_socket_images ();
 }
 
-/** Sends the 'goodbye' command to the player, and closes connection. */
-void
-final_free_player (player *pl)
-{
-  free_player (pl);
-}
-
-bool
-add_client (int fd, const char *peername)
+client *
+client::create (int fd, const char *peername)
 {
   if (checkbanned (NULL, peername))
     {
       LOG (llevInfo, "Banned host tried to connect: [%s]\n", peername);
-      return false;
+      return 0;
     }
   else
     {
       client *ns = new client (dup (fd), peername);
-      clients.push_back (ns);
-      return true;
+
+      ns->instantiate (); // effectively a nop right now
+
+      INVOKE_CLIENT (CONNECT, ns);
+
+      return ns;
     }
 }