--- deliantra/server/socket/lowlevel.C 2007/06/12 10:29:52 1.47
+++ deliantra/server/socket/lowlevel.C 2007/07/29 02:24:34 1.54
@@ -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
*/
@@ -48,31 +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
- struct tcp_info tcpi;
- 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;
- rtt = tcpi.tcpi_rtt;
- rttvar = tcpi.tcpi_rttvar;
+#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
@@ -168,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;
}
@@ -272,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
@@ -323,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);
@@ -513,26 +517,30 @@
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);
+ if (msg_is_special (msg))
+ 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 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);
}
/***********************************************************************