--- deliantra/server/socket/lowlevel.C	2007/07/28 00:15:18	1.52
+++ deliantra/server/socket/lowlevel.C	2007/07/29 13:36:40	1.55
@@ -47,30 +47,36 @@
     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);
+  // 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 (!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 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
 
-          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 ();
+      // 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 ();
-            }
+          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
@@ -166,7 +172,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;
         }
@@ -270,7 +276,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
@@ -321,7 +327,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);
 
@@ -463,7 +469,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
@@ -524,11 +530,11 @@
   if (msg_is_special (msg))
     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