--- deliantra/server/socket/lowlevel.C	2007/07/12 19:36:58	1.50
+++ deliantra/server/socket/lowlevel.C	2007/09/01 08:03:46	1.57
@@ -33,14 +33,6 @@
 # include <netinet/tcp.h>
 #endif
 
-#define HAVE_SIOCOUTQ 1 //TODO configure.ac support
-#if HAVE_SIOCOUTQ
-# include <linux/sockios.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.
@@ -51,45 +43,6 @@
   if (destroyed ())
     return;
 
-# if HAVE_SIOCOUTQ
-  {
-    int value;
-
-    if (!ioctl (fd, SIOCOUTQ, &value))
-      outq = value;
-  }
-# endif
-
-#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
-      struct tcp_info tcpi;
-      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;
-
-          rtt    = tcpi.tcpi_rtt;
-          rttvar = tcpi.tcpi_rttvar;
-
-          if (tcpi.tcpi_last_ack_recv > int (SOCKET_TIMEOUT * 1000))
-            {
-              send_msg (NDI_RED, "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.
    *
@@ -181,7 +134,7 @@
 
       if (inbuf_len == sizeof (inbuf))
         {
-          send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED);
+          send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED | NDI_REPLY);
           destroy ();
           return -1;
         }
@@ -285,7 +238,7 @@
         ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this);
     }
   else
-    send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED, pkt->name);
+    send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED | NDI_REPLY, pkt->name);
 }
 
 bool
@@ -336,7 +289,7 @@
       }
 
   // If we get here, we didn't find a valid command.
-  send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED, (char *)inbuf + 2);
+  send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED | NDI_REPLY, (char *)inbuf + 2);
 next_packet:
   skip_packet (pkt_len);
 
@@ -478,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
@@ -536,14 +489,14 @@
 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, type, msg);
+    send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg);
   else if (color < 0)
     return; // client cannot handle this
   else
-    send_packet_printf ("drawinfo %d %s", color, msg);
+    send_packet_printf ("drawinfo %d %s", color & NDI_COLOR_MASK, msg);
 }
 
 void