--- deliantra/server/socket/lowlevel.C 2007/04/23 19:10:17 1.39 +++ deliantra/server/socket/lowlevel.C 2007/06/10 02:51:46 1.45 @@ -1,36 +1,24 @@ /* - * CrossFire, A Multiplayer game for X-windows + * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. * - * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team - * Copyright (C) 1992 Frank Tore Johansen - * - * This program 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. - * - * 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 this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team + * Copyright (©) 1992,2007 Frank Tore Johansen * - * The author can be reached via e-mail to mark@pyramid.com - */ - -/** - * \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. + * 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. + * + * 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 + * + * The authors can be reached via e-mail to */ using namespace std; @@ -39,17 +27,19 @@ #include #include -#ifdef __linux__ +#if HAVE_TCP_INFO # include # include # include # include #endif -// use a really low timeout, as it doesn't cost any bandwidth, and you can -// easily die in 20 seconds... -#define SOCKET_TIMEOUT1 10 * 1000 -#define SOCKET_TIMEOUT2 20 * 1000 +// 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 () @@ -57,24 +47,28 @@ if (destroyed ()) return; -#ifdef __linux__ - // 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)) +#if HAVE_TCP_INFO + // check about once per second, spread evenly over all clients + if (!((pticks + fd) & 7)) { - unsigned int diff = tcpi.tcpi_last_ack_recv - tcpi.tcpi_last_data_sent; - - rtt = tcpi.tcpi_rtt; - rttvar = tcpi.tcpi_rttvar; + // check time of last ack, and, if too old, kill connection + struct tcp_info tcpi; + socklen_t len = sizeof (tcpi); - if (tcpi.tcpi_unacked && SOCKET_TIMEOUT1 < diff && diff < 0x80000000UL // ack delayed for 20s - && SOCKET_TIMEOUT2 < tcpi.tcpi_last_data_sent) // no data sent for 10s + if (!getsockopt (fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi)) { - 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 (); + 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 @@ -86,9 +80,24 @@ * is called to write it out. */ - if (!outputbuffer.len || socket_ev.poll () & PE_W) + // write a nop to the socket at least every IDLE_NOP seconds. + if (!outputbuffer.len) + { + if (last_send + IDLE_PING <= NOW) + { + // 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); + } + else + return; + } + + if (socket_ev.poll () & PE_W) return; + last_send = NOW; write_outputbuffer (); } @@ -108,10 +117,6 @@ outputbuffer.start = 0; outputbuffer.len -= res; -#ifdef CS_LOGSTATS - cst_tot.obytes += res; - cst_lst.obytes += res; -#endif } else if (res == 0) { @@ -378,9 +383,6 @@ { inbuf_len += amount; - cst_tot.ibytes += amount; - cst_lst.ibytes += amount; - cmd_ev.start (); } } @@ -513,6 +515,22 @@ send_packet_printf ("drawinfo %d %s", flags, msg); } +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, '&')) + { + //TODO: should escape/modify to old syntax + send_packet_printf ("drawinfo %d %s", color, msg); + } + else + send_packet_printf ("drawinfo %d %s", color, msg); +} + /*********************************************************************** * * packet functions/utilities @@ -592,38 +610,3 @@ cur += len; } -/****************************************************************************** - * - * statistics logging functions. - * - ******************************************************************************/ - -#ifdef CS_LOGSTATS - -/* cst_tot is for the life of the server, cst_last is for the last series of - * stats - */ -CS_Stats cst_tot, cst_lst; - -/** - * Writes out the gathered stats. We clear cst_lst. - */ -void -write_cs_stats (void) -{ - time_t now = time (NULL); - - /* If no connections recently, don't both to log anything */ - if (cst_lst.ibytes == 0 && cst_lst.obytes == 0) - return; - - /* CSSTAT is put in so scripts can easily find the line */ - LOG (llevInfo, "CSSTAT: %.16s tot %d %d %d %d inc %d %d %d %d\n", - ctime (&now), cst_tot.ibytes, cst_tot.obytes, cst_tot.max_conn, - now - cst_tot.time_start, cst_lst.ibytes, cst_lst.obytes, cst_lst.max_conn, now - cst_lst.time_start); - cst_lst.ibytes = 0; - cst_lst.obytes = 0; - cst_lst.time_start = now; -} -#endif -