--- deliantra/server/socket/lowlevel.C	2007/06/09 22:54:04	1.43
+++ deliantra/server/socket/lowlevel.C	2007/07/12 19:36:58	1.50
@@ -1,51 +1,43 @@
 /*
- * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
  * 
  * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * Crossfire TRT is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
+ * Crossfire TRT is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  * 
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License along
- * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * 
  * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 
-/**
- * \file
- * Low-level socket-related functions.
- *
- * \date 2003-12-02
- *
- * Contains some base functions that both the client and server
- * can use.  As such, depending what we are being compiled for will
- * determine what we can include.  the client is designed have
- * CFCLIENT defined as part of its compile flags.
- */
-
 using namespace std;
 
 #include <global.h>
 #include <sproto.h>
 #include <cstdarg>
 
-#ifdef __linux__
+#if HAVE_TCP_INFO
 # include <sys/types.h>
 # include <sys/socket.h>
 # include <netinet/in.h>
 # 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.
 
@@ -59,9 +51,19 @@
   if (destroyed ())
     return;
 
-#ifdef __linux__
+# 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
-  if (!((pticks + fd) & 7))
+  // 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;
@@ -69,6 +71,9 @@
 
       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;
 
@@ -95,7 +100,7 @@
   // write a nop to the socket at least every IDLE_NOP seconds.
   if (!outputbuffer.len)
     {
-      if (last_send + IDLE_PING <= NOW)
+      if (last_send + IDLE_PING <= NOW && pl && pl->active)
         {
           // this is a bit ugly, but map1/map1a seem to be the only
           // nop'able commands and they are quite small.
@@ -521,28 +526,32 @@
   send_packet (sl);
 }
 
-void
-client::send_drawinfo (const char *msg, int flags)
-{
-  send_packet_printf ("drawinfo %d %s", flags, msg);
+// returns true when the message needs special (read: perl) treatment
+static bool
+msg_is_special (const char *msg)
+{   
+  return msg [strcspn (msg, "<[&\n")];
 }
 
 void
 client::send_msg (int color, const char *type, const char *msg)
 {
-  if (can_msg)
+  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);
   else if (color < 0)
     return; // client cannot handle this
-  else if (strchr (msg, '<') || strchr (msg, '&'))
-    {
-      //TODO: should escape/modify to old syntax
-      send_packet_printf ("drawinfo %d %s", color, msg);
-    }
   else
     send_packet_printf ("drawinfo %d %s", color, msg);
 }
 
+void
+client::send_drawinfo (const char *msg, int flags)
+{
+  send_msg (flags, "log", msg);
+}
+
 /***********************************************************************
  *
  * packet functions/utilities