--- deliantra/server/socket/init.C	2006/12/16 21:40:26	1.22
+++ deliantra/server/socket/init.C	2006/12/17 00:25:44	1.23
@@ -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>
@@ -63,10 +65,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);