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

Comparing deliantra/server/socket/lowlevel.C (file contents):
Revision 1.43 by root, Sat Jun 9 22:54:04 2007 UTC vs.
Revision 1.60 by root, Mon Oct 1 01:09:10 2007 UTC

 /*
- * 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
+ * Crossfire TRT is free software: you can redistribute it and/or modify
- * under the terms of the GNU General Public License as published by the Free
+ * it under the terms of the GNU General Public License as published by
- * Software Foundation; either version 2 of the License, or (at your option)
+ * the Free Software Foundation, either version 3 of the License, or
- * any later version.
+ * (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful, but
+ * This program is distributed in the hope that it will be useful,
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * for more details.
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along
+ * You should have received a copy of the GNU General Public License
- * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  *
  * 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
-// 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.
 void
 client::flush ()
 {
   if (destroyed ())
     return;
-#ifdef __linux__
-  // check about once per second, spread evenly over all clients
-  if (!((pticks + fd) & 7))
-    {
-      // 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))
-        {
-          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.
    *
    * When the socket is clear to write, and we have backlogged data, this
    */
   // 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.
           packet sl (mapmode == Map1Cmd ? "map1" : "map1a");
           send_packet (sl);
       if (inbuf_len >= 2 + pkt_len)
         return 2 + pkt_len;
       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;
         }
     }
         ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl);
       else
         ((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
 client::handle_packet ()
 {
         goto next_packet;
       }
   // 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);
   // input buffer has space again
   socket_ev.poll (socket_ev.poll () | PE_R);
         }
       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.
 client::send_packet (packet &sl)
 {
   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
        * it easier to debug.
        */
   va_end (ap);
   send_packet (sl);
 }
-void
+// returns true when the message needs special (read: perl) treatment
-client::send_drawinfo (const char *msg, int flags)
+static bool
-{
+msg_is_special (const char *msg)
-  send_packet_printf ("drawinfo %d %s", flags, msg);
+{
+  return msg [strcspn (msg, "<[&\n")];
 }
 void
 client::send_msg (int color, const char *type, const char *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);
-  if (can_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 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);
+    send_packet_printf ("drawinfo %d %s", color & NDI_COLOR_MASK, msg);
+}
+void
+client::send_drawinfo (const char *msg, int flags)
+{
+  send_msg (flags, "log", msg);
 }
 /***********************************************************************
  *
  * packet functions/utilities

Diff Legend

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

Comparing deliantra/server/socket/lowlevel.C (file contents): Revision 1.43 by root, Sat Jun 9 22:54:04 2007 UTC vs. Revision 1.60 by root, Mon Oct 1 01:09:10 2007 UTC

Diff Legend

Comparing deliantra/server/socket/lowlevel.C (file contents):
Revision 1.43 by root, Sat Jun 9 22:54:04 2007 UTC vs.
Revision 1.60 by root, Mon Oct 1 01:09:10 2007 UTC