--- deliantra/server/socket/lowlevel.C	2007/07/28 12:02:58	1.53
+++ deliantra/server/socket/lowlevel.C	2007/09/01 08:03:46	1.57
@@ -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,35 +43,6 @@
   if (destroyed ())
     return;
 
-#if HAVE_TCP_INFO
-  // check about once per second, spread evenly over all clients
-  // do this only when player is active
-  if (!((pticks + fd) & 7) && pl && pl->active)
-    {
-      // 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;
-
-          //fprintf (stderr, "uack %d sst %d cwnd %d mss %d pmtu %d\n",
-          //         tcpi.tcpi_unacked, tcpi.tcpi_snd_ssthresh, tcpi.tcpi_snd_cwnd, tcpi.tcpi_advmss, tcpi.tcpi_pmtu);
-
-          if (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.
    *
@@ -463,7 +431,7 @@
   if (destroyed ())
     return;
 
-  if (sl.length () >= MAXSOCKBUF)
+  if (sl.length () > MAXSOCKBUF)
     {
       LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ());
       /* Almost certainly we've overflowed a buffer, so quit now to make
@@ -521,7 +489,7 @@
 void
 client::send_msg (int color, const char *type, const char *msg)
 {
-  if (msg_is_special (msg))
+  if (msg_is_special (msg) || (type [0] == 'c' && type [1] == '/'))
     cfperl_send_msg (this, color, type, msg);
   else if (can_msg)
     send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg);