--- deliantra/server/socket/init.C	2006/12/16 03:08:26	1.21
+++ deliantra/server/socket/init.C	2006/12/20 09:14:22	1.26
@@ -39,6 +39,8 @@
 #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>
@@ -54,7 +56,8 @@
 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)
 {
   {
     struct linger linger_opt;
@@ -63,10 +66,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);
@@ -92,10 +128,7 @@
   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 = salloc<uint8> (nrofpixmaps, 0);
 
   /* 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,7 +147,6 @@
   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 ();
 
@@ -131,11 +163,12 @@
     pl->socket = 0;
 
   if (fd >= 0)
-    close (fd), fd = -1;
+    close (fd);
 
-  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