[ViewVC] Diff of: cvs/deliantra/server/socket/lowlevel.C

Comparing deliantra/server/socket/lowlevel.C (file contents):
Revision 1.56 by root, Mon Jul 30 02:03:03 2007 UTC vs.
Revision 1.60 by root, Mon Oct 1 01:09:10 2007 UTC

         }
       else
         {
           inbuf_len += amount;
-          cmd_ev.start ();
-        }
-    }
-}
-// called whenever we have additional commands to process
-void
-client::cmd_cb (iw &w)
-{
-  if (handle_packet ())
+          if (handle_packet ())
-    w.start ();
+            {
-  else
+              while (handle_packet ())
-    flush ();
+                ;
+              flush ();
+            }
+        }
+    }
 }
 /*******************************************************************************
  *
  * Start of write related routines.
 }
 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);
   else if (color < 0)
     return; // client cannot handle this

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines