--- deliantra/server/socket/lowlevel.C 2007/03/01 12:28:17 1.34
+++ deliantra/server/socket/lowlevel.C 2008/05/08 20:03:50 1.65
@@ -1,36 +1,23 @@
/*
- * CrossFire, A Multiplayer game for X-windows
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
*
- * 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
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 1992,2007 Frank Tore Johansen
+ *
+ * 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 2 of the License, or
+ * 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
+ * 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.
+ * along with this program. If not, see .
*
- * 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.
+ * The authors can be reached via e-mail to
*/
using namespace std;
@@ -39,17 +26,16 @@
#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
+// force a packet when idle for more than this many seconds,
+// forcing an ack regularly.
+#define IDLE_PING 2.
void
client::flush ()
@@ -57,28 +43,6 @@
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))
- {
- unsigned int diff = tcpi.tcpi_last_ack_recv - tcpi.tcpi_last_data_sent;
-
- rtt = tcpi.tcpi_rtt;
- rttvar = tcpi.tcpi_rttvar;
-
- 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
- {
- 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.
*
@@ -86,9 +50,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 && 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);
+ }
+ else
+ return;
+ }
+
+ if (socket_ev.poll () & EV_WRITE)
return;
+ last_send = NOW;
write_outputbuffer ();
}
@@ -108,10 +87,6 @@
outputbuffer.start = 0;
outputbuffer.len -= res;
-#ifdef CS_LOGSTATS
- cst_tot.obytes += res;
- cst_lst.obytes += res;
-#endif
}
else if (res == 0)
{
@@ -126,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;
}
@@ -138,7 +113,7 @@
}
}
- socket_ev.poll (socket_ev.poll () & ~PE_W);
+ socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
}
/******************************************************************************
@@ -159,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;
}
@@ -192,19 +167,20 @@
{"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND0 },
{"examine", PC(ExamineCmd) PF_PLAYING },
+ {"ex", PC(ExCmd) PF_PLAYING },
{"apply", PC(ApplyCmd) PF_PLAYING },
{"lookat", PC(LookAt) PF_PLAYING },
{"lock", PC(LockItem) PF_PLAYING },
{"mark", PC(MarkItem) PF_PLAYING },
{"move", PC(MoveCmd) PF_PLAYING },
- {"ext", PC(ExtCmd) 0 }, /* CF+ */
- {"mapredraw", PC(MapRedrawCmd) 0 }, /* Added: phil */
- {"mapinfo", PC(MapInfoCmd) 0 }, /* CF+ */
+ {"ext", PC(ExtCmd) 0 }, // CF+
+ {"mapredraw", PC(MapRedrawCmd) 0 },
+ {"mapinfo", PC(MapInfoCmd) 0 }, // CF+
{"reply", SC(ReplyCmd) 0 },
- {"exti", SC(ExtiCmd) 0 }, /* CF+ */
+ {"exti", SC(ExtiCmd) 0 }, // CF+
{"addme", SC(AddMeCmd) 0 },
- {"askface", SC(SendFaceCmd) 0 }, /* Added: phil */
+ {"askface", SC(AskFaceCmd) 0 },
{"requestinfo", SC(RequestInfo) 0 },
{"setfacemode", SC(SetFaceMode) 0 },
{"setsound", SC(SetSound) 0 },
@@ -242,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;
}
@@ -262,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
@@ -313,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 ())
@@ -334,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
@@ -351,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;
}
@@ -377,24 +354,17 @@
{
inbuf_len += amount;
- cst_tot.ibytes += amount;
- cst_lst.ibytes += amount;
+ if (handle_packet ())
+ {
+ while (handle_packet ())
+ ;
- cmd_ev.start ();
+ 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.
@@ -418,7 +388,9 @@
if (len + outputbuffer.len > SOCKETBUFSIZE)
{
LOG (llevDebug, "socket on fd %d has overrun internal buffer - marking as dead\n", fd);
- destroy ();
+ // shutdown the socket, this is safer than destroying it immediately
+ // as lots of code in the callchain might still access the map etc.
+ shutdown (fd, SHUT_RDWR);
return;
}
@@ -456,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
@@ -504,6 +476,33 @@
send_packet (sl);
}
+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);
+ 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 & NDI_COLOR_MASK, msg);
+}
+
+void
+client::send_drawinfo (const char *msg, int flags)
+{
+ send_msg (flags, "log", msg);
+}
+
/***********************************************************************
*
* packet functions/utilities
@@ -519,6 +518,24 @@
*cur++ = ' ';
}
+packet &packet::operator <<(const ber32 v)
+{
+ enum { maxlen = 32 / 7 + 1};
+ uint8 buf[maxlen];
+ uint8 *p = buf + maxlen;
+ uint32 val = v.val;
+
+ *--p = val & 0x7F;
+
+ while (val > 0x7F)
+ {
+ val >>= 7;
+ *--p = (val & 0x7F) | 0x80;
+ }
+
+ return *this << data (p, buf + maxlen - p);
+}
+
packet &packet::operator <<(const data &v)
{
if (room () < v.len)
@@ -565,38 +582,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
-