--- deliantra/server/socket/lowlevel.C 2007/06/09 22:54:04 1.43 +++ deliantra/server/socket/lowlevel.C 2008/09/19 01:39:45 1.66 @@ -1,36 +1,23 @@ /* - * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. + * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team + * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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. + * Deliantra 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 - */ - -/** - * \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. + * The authors can be reached via e-mail to */ using namespace std; @@ -39,16 +26,13 @@ #include #include -#ifdef __linux__ +#if HAVE_TCP_INFO # include # include # include # 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. @@ -59,32 +43,6 @@ 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. * @@ -95,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. @@ -106,7 +64,7 @@ return; } - if (socket_ev.poll () & PE_W) + if (socket_ev.poll () & EV_WRITE) return; last_send = NOW; @@ -143,7 +101,7 @@ else if (errno == EAGAIN) { // delay till ready - socket_ev.poll (socket_ev.poll () | PE_W); + socket_ev.poll (socket_ev.poll () | EV_WRITE); socket_ev.start (); return; } @@ -155,7 +113,7 @@ } } - socket_ev.poll (socket_ev.poll () & ~PE_W); + socket_ev.poll (socket_ev.poll () & ~EV_WRITE); } /****************************************************************************** @@ -176,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; } @@ -260,10 +218,11 @@ len -= 6; } - if (len > 4 && !strncmp (data, "say " , 4)) - return true; - if (len > 5 && !strncmp (data, "chat ", 5)) - return true; + if (len > 4 && data [3] == ' ' && !strncmp (data, "say " , 4)) return true; + if (len > 5 && data [4] == ' ' && !strncmp (data, "chat " , 5)) return true; + if (len > 6 && data [5] == ' ' && !strncmp (data, "shout ", 6)) return true; + + if (len == 7 && !strcmp (data, "suicide")) return true; return false; } @@ -280,7 +239,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 @@ -331,19 +290,19 @@ } // 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); + socket_ev.poll (socket_ev.poll () | EV_READ); return true; } // callback called when socket is either readable or writable void -client::socket_cb (iow &w, int got) +client::socket_cb (iow &w, int revents) { //TODO remove when we have better socket cleanup logic if (destroyed ()) @@ -352,15 +311,15 @@ return; } - if (got & PE_W) + if (revents & EV_WRITE) { write_outputbuffer (); if (!outputbuffer.len) - socket_ev.poll (socket_ev.poll () & ~PE_W); + socket_ev.poll (socket_ev.poll () & ~EV_WRITE); } - if (got & PE_R) + if (revents & EV_READ) { //TODO: rate-limit tcp connection in better ways, important @@ -369,7 +328,7 @@ if (!amount) { // input buffer full - socket_ev.poll (socket_ev.poll () & ~PE_R); + socket_ev.poll (socket_ev.poll () & ~EV_READ); return; } @@ -395,21 +354,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. @@ -473,7 +428,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 @@ -522,25 +477,32 @@ } void -client::send_drawinfo (const char *msg, int flags) -{ - 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, '&')) + 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 (!(color & NDI_VERBATIM) + && (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); } /***********************************************************************