--- deliantra/server/socket/lowlevel.C 2007/06/10 02:51:46 1.45
+++ deliantra/server/socket/lowlevel.C 2007/10/01 01:09:10 1.60
@@ -1,22 +1,21 @@
/*
- * 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 .
*
* The authors can be reached via e-mail to
*/
@@ -34,9 +33,6 @@
# include
#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.
@@ -47,32 +43,6 @@
if (destroyed ())
return;
-#if HAVE_TCP_INFO
- // 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.
*
@@ -83,7 +53,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.
@@ -164,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;
}
@@ -268,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
@@ -319,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);
@@ -383,21 +353,17 @@
{
inbuf_len += amount;
- cmd_ev.start ();
+ if (handle_packet ())
+ {
+ while (handle_packet ())
+ ;
+
+ flush ();
+ }
}
}
}
-// called whenever we have additional commands to process
-void
-client::cmd_cb (iw &w)
-{
- if (handle_packet ())
- w.start ();
- else
- flush ();
-}
-
/*******************************************************************************
*
* Start of write related routines.
@@ -461,7 +427,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
@@ -509,26 +475,38 @@
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)
- 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, '&'))
+ if (!msg || !type) // it can happen (for example, missing attack messages cause this)
{
- //TODO: should escape/modify to old syntax
- send_packet_printf ("drawinfo %d %s", color, msg);
+ 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
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);
}
/***********************************************************************