--- deliantra/server/socket/lowlevel.C	2007/07/29 13:36:40	1.55
+++ deliantra/server/socket/lowlevel.C	2007/10/05 23:03:49	1.61
@@ -33,9 +33,6 @@
 # include <netinet/tcp.h>
 #endif
 
-// disconnect a socket after this many seconds without an ack
-#define SOCKET_TIMEOUT 8.
-
 // force a packet when idle for more than this many seconds,
 // forcing an ack regularly.
 #define IDLE_PING 2.
@@ -46,41 +43,6 @@
   if (destroyed ())
     return;
 
-#if HAVE_TCP_INFO
-  // check time of last ack, and, if too old, kill connection
-  socklen_t len = sizeof (tcpi);
-
-  if (!getsockopt (fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi))
-    {
-      if (tcpi.tcpi_snd_mss)
-        mss = tcpi.tcpi_snd_mss;
-
-#if 0
-      fprintf (stderr, "uack %d ack %d lost %d ret %d fack %d sst %d cwnd %d mss %d pmtu %d advmss %d EXC %d\n",
-               tcpi.tcpi_unacked,
-               tcpi.tcpi_sacked,
-               tcpi.tcpi_lost,
-               tcpi.tcpi_retrans,
-               tcpi.tcpi_fackets,
-               tcpi.tcpi_snd_ssthresh, tcpi.tcpi_snd_cwnd, tcpi.tcpi_advmss, tcpi.tcpi_pmtu, tcpi.tcpi_advmss,
-               
-               tcpi.tcpi_snd_cwnd - (tcpi.tcpi_unacked - tcpi.tcpi_sacked));
-#endif
-
-      // do this only when player is active
-      if (pl && pl->active
-          && tcpi.tcpi_last_ack_recv > int (SOCKET_TIMEOUT * 1000))
-        {
-          send_msg (NDI_RED | NDI_REPLY, "connection-timeout", "safety disconnect due to tcp/ip timeout (no packets received)");
-          write_outputbuffer ();
-
-          LOG (llevDebug, "connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd,
-               (unsigned)tcpi.tcpi_last_ack_recv, (unsigned)tcpi.tcpi_last_data_sent, (unsigned)tcpi.tcpi_unacked);
-          destroy ();
-        }
-    }
-#endif
-
   /**
    * Writes data to socket.
    *
@@ -256,10 +218,11 @@
       len  -= 6;
     }
 
-  if (len > 4 && !strncmp (data, "say " , 4))
-    return true;
-  if (len > 5 && !strncmp (data, "chat ", 5))
-    return true;
+  if (len > 4 && data [3] == ' ' && !strncmp (data, "say "  , 4)) return true;
+  if (len > 5 && data [4] == ' ' && !strncmp (data, "chat " , 5)) return true;
+  if (len > 6 && data [5] == ' ' && !strncmp (data, "shout ", 6)) return true;
+
+  if (len == 7 && !strcmp (data, "suicide")) return true;
 
   return false;
 }
@@ -391,21 +354,17 @@
         {
           inbuf_len += amount;
 
-          cmd_ev.start ();
+          if (handle_packet ())
+            {
+              while (handle_packet ())
+                ;
+
+              flush ();
+            }
         }
     }
 }
 
-// called whenever we have additional commands to process
-void
-client::cmd_cb (iw &w)
-{
-  if (handle_packet ())
-    w.start ();
-  else
-    flush ();
-}
-
 /*******************************************************************************
  *
  * Start of write related routines.
@@ -527,7 +486,15 @@
 void
 client::send_msg (int color, const char *type, const char *msg)
 {
-  if (msg_is_special (msg))
+  if (!msg || !type) // it can happen (for example, missing attack messages cause this)
+    {
+      LOG (logBacktrace | llevError, "send_msg(%d,%p,%p) called with NULL msg or type.\n", color, type, msg);
+      return;
+    }
+
+  int len = strlen (msg);
+
+  if (msg_is_special (msg) || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128))
     cfperl_send_msg (this, color, type, msg);
   else if (can_msg)
     send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg);