--- deliantra/server/socket/lowlevel.C 2006/12/20 01:19:11 1.27
+++ deliantra/server/socket/lowlevel.C 2012/11/18 09:39:11 1.96
@@ -1,35 +1,23 @@
/*
- CrossFire, A Multiplayer game for X-windows
-
- 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.
-
- The author can be reached via e-mail to mark@pyramid.com
-*/
-
-/**
- * \file
- * Low-level socket-related functions.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
*
- * \date 2003-12-02
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
*
- * 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.
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero 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.
+ *
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * .
+ *
+ * The authors can be reached via e-mail to
*/
using namespace std;
@@ -38,42 +26,22 @@
#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 ()
{
-#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
+ if (destroyed ())
+ return;
/**
* Writes data to socket.
@@ -82,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_PING seconds.
+ if (!outputbuffer.len)
+ {
+ if (last_send + IDLE_PING <= NOW && pl && pl->active)
+ {
+ // this is a bit ugly, but map1a seems to be the only
+ // nop'able command and it is quite small.
+ packet sl ("map1a");
+ send_packet (sl);
+ }
+ else
+ return;
+ }
+
+ if (socket_ev.poll () & EV_WRITE)
return;
+ last_send = NOW;
write_outputbuffer ();
}
@@ -104,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)
{
@@ -122,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;
}
@@ -134,7 +113,7 @@
}
}
- socket_ev.poll (socket_ev.poll () & ~PE_W);
+ socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
}
/******************************************************************************
@@ -155,7 +134,7 @@
if (inbuf_len == sizeof (inbuf))
{
- send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED);
+ send_packet_printf ("msg %d log input buffer overflow - closing connection.", NDI_RED | NDI_REPLY);
destroy ();
return -1;
}
@@ -180,57 +159,89 @@
#define SC(cb) (void *)static_cast(cb),
#define PC(cb) (void *)static_cast(cb), PF_PLAYER |
+static void
+NopCmd (char *, int, client *)
+{
+ // do nothing
+}
+
/**
* Dispatch table for the server.
*/
static struct packet_type packets[] = {
- {"ncom", PC(NewPlayerCmd) PF_PLAYING },
- {"command", PC(PlayerCmd) PF_PLAYING },
+ {"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND },
{"examine", PC(ExamineCmd) PF_PLAYING },
+ {"ex", PC(ExCmd) PF_PLAYING },
{"apply", PC(ApplyCmd) PF_PLAYING },
- {"reply", PC(ReplyCmd) 0 },
{"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+/Deliantra
+ {"mapredraw", PC(MapRedrawCmd) 0 },
+ {"mapinfo", PC(MapInfoCmd) 0 }, // CF+/Deliantra
- {"exti", SC(ExtiCmd) 0 }, /* CF+ */
+ {"reply", SC(ReplyCmd) 0 },
+ {"exti", SC(ExtiCmd) 0 }, // CF+/Deliantra
{"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 },
{"setup", SC(SetUp) 0 },
{"version", SC(VersionCmd) 0 },
- {"toggleextendedinfos", SC(ToggleExtendedInfos) 0 }, /*Added: tchize */
- {"toggleextendedtext", SC(ToggleExtendedText) 0 }, /*Added: tchize */
- {"asksmooth", SC(AskSmooth) 0 }, /*Added: tchize (smoothing technologies) */
+
+ {"toggleextendedtext", SC(NopCmd) 0 }, // deliantra: disabled
};
bool
client::may_execute (const packet_type *pkt) const
{
return (!(pkt->flags & PF_PLAYER) || pl)
- && (!(pkt->flags & PF_PLAYING) || (pl && pl->state == ST_PLAYING));
+ && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING);
+}
+
+// HACK: some commands currently should be executed
+// even when the player is frozen. this hack detects
+// those commands. it should be folded into may_execute,
+// but kept seperate to emphasise the hack aspect, i.e.
+// do it better, then remove.
+static bool
+always_immediate (const client *ns, const packet_type *pkt, const char *data, int len)
+{
+ if (!(pkt->flags & PF_COMMAND))
+ return false;
+
+ if (!ns->pl || !ns->pl->ob || !ns->pl->ob->map)
+ return false;
+
+ 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 > 8 && data [ 7] == ' ' && !strncmp (data, "suicide " , 8)) return true;
+ if (len > 18 && data [17] == ' ' && !strncmp (data, "accept-invitation ", 18)) return true;
+
+ if (len == 7 && !strcmp (data, "suicide")) return true;
+
+ return false;
}
void
client::execute (const packet_type *pkt, char *data, int datalen)
{
- if (may_execute (pkt))
+ if (may_execute (pkt) || always_immediate (this, pkt, data, datalen))
{
//TODO: only one format
if (pkt->flags & PF_PLAYER)
- ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl);
+ {
+ ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl);
+ pl->need_updated_stats ();
+ }
else
((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 log ERROR: you cannot execute '%s' now.", NDI_RED | NDI_REPLY, pkt->name);
}
bool
@@ -248,7 +259,8 @@
return false;
}
- inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */
+ uint8_t save_byte = inbuf [pkt_len]; // rather ugly
+ inbuf [pkt_len] = 0; /* temporarily terminate buffer - useful for string data */
/* First, break out beginning word. There are at least
* a few commands that do not have any paremeters. If
@@ -269,10 +281,10 @@
datalen = 0;
}
- for (packet_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt)
+ for (packet_type *pkt = packets; pkt < packets + array_length (packets); ++pkt)
if (!strcmp ((char *)inbuf + 2, pkt->name))
{
- if (pkt->flags & PF_PLAYER)
+ if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen))
queue_command (pkt, data, datalen);
else
execute (pkt, data, datalen);
@@ -281,49 +293,77 @@
}
// 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 ("msg %d log ERROR: command '%s' not supported.", NDI_RED | NDI_REPLY, (char *)inbuf + 2);
+
next_packet:
+ inbuf [pkt_len] = save_byte; // rather ugly
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;
}
+void
+client::inbuf_handle ()
+{
+ if (!handle_packet ())
+ return;
+
+ while (handle_packet ())
+ ;
+
+ flush ();
+}
+
// 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 (status == Ns_Dead)
+ if (destroyed ())
{
socket_ev.poll (0);
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
+ int amount;
+ uint8 *rbuf;
+
+ if (ws_version)
+ {
+ if (ws_inbuf_len + 2048 > ws_inbuf_alloc)
+ ws_inbuf = (uint8 *)realloc (ws_inbuf, ws_inbuf_alloc += 4096);
- int amount = sizeof (inbuf) - inbuf_len;
+ rbuf = ws_inbuf + ws_inbuf_len;
+ amount = ws_inbuf_alloc - ws_inbuf_len;
+ }
+ else
+ {
+ rbuf = inbuf + inbuf_len;
+ amount = sizeof (inbuf) - inbuf_len;
+ }
if (!amount)
{
// input buffer full
- socket_ev.poll (socket_ev.poll () & ~PE_R);
+ LOG (llevError, "input buffer overflow.");
+ destroy ();
return;
}
- amount = read (fd, inbuf + inbuf_len, amount);
+ amount = read (fd, rbuf, amount);
if (!amount)
{
@@ -341,28 +381,128 @@
// should not be here, normally
}
- else
+
+ if (ws_version)
{
- inbuf_len += amount;
+ ws_inbuf_len += amount;
- cst_tot.ibytes += amount;
- cst_lst.ibytes += amount;
+ while (ws_inbuf_len)
+ {
+ if (ws_inbuf_len < 2 + 4) // 6 is minimum length: op, len, mask
+ break;
- cmd_ev.start ();
+ int d = 2;
+ int fin = ws_inbuf [0] & 0x80;
+ int op = ws_inbuf [0] & 0x0f;
+ int len = ws_inbuf [1] & 0x7f;
+
+ if (len == 126)
+ {
+ len = (ws_inbuf [2] << 8) | ws_inbuf [3];
+ d += 2;
+ }
+ else if (len == 127)
+ {
+ if (ws_inbuf_len < 2 + 8)
+ return;
+
+ // we don't do extra long frames, if a browser wants to send >2**32 bytes,
+ // there are bigger issues to fix.
+ len = (ws_inbuf [8] << 8) | ws_inbuf [9];
+ d += 8;
+ }
+
+ // we only continue if we have a complete frame
+ if (ws_inbuf_len < d + 4 + len)
+ return;
+
+ switch (op)
+ {
+ case 0: op = ws_inbuf_type; break; // continuation
+ case 1: ws_inbuf_type = 1; break; // utf-8
+ case 2: ws_inbuf_type = 2; break; // binary
+ }
+
+ if (len > sizeof (inbuf) - inbuf_len)
+ {
+ // input buffer full
+ LOG (llevError, "input buffer overflow (ws).");
+ destroy ();
+ return;
+ }
+
+ uint8 *buf = inbuf + inbuf_len + 2;
+
+ for (int i = 0; i < len; ++i)
+ buf [i] = ws_inbuf [d + 4 + i] ^ ws_inbuf [d + (i & 3)];
+
+ // remove frame
+ ws_inbuf_len -= d + 4 + len;
+ memmove (ws_inbuf, ws_inbuf + d + 4 + len, ws_inbuf_len);
+
+ switch (op)
+ {
+ case 1: // utf-8
+ // utf-8 encoded frames cannot have full length (MAXSOCKBUF) in all cases
+ // but we assume that these extra-long packets will be rare.
+ {
+ uint8 *a = buf;
+ uint8 *b = a;
+ uint8 *c = a + len;
+
+ for (; a < c; ++a, ++b)
+ {
+ *b = *a;
+
+ if (*a >= 0x80)
+ *b = (a [0] & 0x1f) << 6 | (a [1] & 0x3f), ++a;
+ }
+
+ len -= a - b;
+ }
+ /* FALLTHROUGH */
+ case 2: // binary
+ inbuf_len += len;
+
+ if (fin)
+ {
+ inbuf [0] = inbuf_len >> 8;
+ inbuf [1] = inbuf_len;
+
+ inbuf_len += 2;
+
+ inbuf_handle ();
+ }
+ break;
+
+ case 9: // ping
+ {
+ // send pong - we assume ping messages are <64k
+ // as we can't handle >10k at the moment anyway.
+ uint8 hdr [] = { 0x8a, 126, len >> 8, len };
+ send (hdr, sizeof (hdr));
+ send (inbuf + inbuf_len, len);
+ }
+ break;
+
+ case 10: // pong
+ break;
+
+ case 8: // close
+ default:
+ destroy ();
+ return;
+ }
+ }
+ }
+ else
+ {
+ inbuf_len += amount;
+ inbuf_handle ();
}
}
}
-// 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.
@@ -379,16 +519,16 @@
client::send (void *buf_, int len)
{
char *buf = (char *)buf_;
- char *pos = buf;
- int amt = 0;
- if (status == Ns_Dead || !buf)
+ if (destroyed () || !buf)
return;
- if ((len + outputbuffer.len) > SOCKETBUFSIZE)
+ 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;
}
@@ -423,10 +563,10 @@
void
client::send_packet (packet &sl)
{
- if (status == Ns_Dead)
+ 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
@@ -438,12 +578,69 @@
if (!sl.length ())
return;
- assert (sl.hdrlen == 2);
+ if (ws_version == 8)
+ {
+ static uint8 buf [MAXSOCKBUF * 2 + 4];
+
+ uint8 *b = buf + 4;
+ for (uint8 *a = sl.buf_ + sl.hdrlen; a < sl.cur; ++a)
+ {
+ if (*a < 0x80)
+ *b++ = *a;
+ else
+ {
+ *b++ = 0xc0 | ((*a >> 6) & 0x1f);
+ *b++ = 0x80 | ( *a & 0x3f);
+ }
+ }
+
+ assert (b - buf < sizeof (buf));
+
+ int len = b - (buf + 4);
+
+ if (len < 126)
+ {
+ buf [2] = 0x81;
+ buf [3] = len;
+
+ send (buf + 2, len + 2);
+ }
+ else
+ {
+ buf [0] = 0x81;
+ buf [1] = 126;
+ buf [2] = len >> 8;
+ buf [3] = len;
+
+ send (buf, len + 4);
+ }
+ }
+ else if (ws_version == 13)
+ {
+ int len = sl.length ();
- sl.buf_ [0] = sl.length () >> 8;
- sl.buf_ [1] = sl.length () ;
+ if (len < 126)
+ {
+ uint8 hdr [] = { 0x82, len };
+ send (hdr, sizeof (hdr));
+ }
+ else
+ {
+ uint8 hdr [] = { 0x82, 126, len >> 8, len };
+ send (hdr, sizeof (hdr));
+ }
- send (sl.buf_, sl.length () + sl.hdrlen);
+ send (sl.buf_ + sl.hdrlen, len);
+ }
+ else
+ {
+ assert (sl.hdrlen == 2);
+
+ sl.buf_ [0] = sl.length () >> 8;
+ sl.buf_ [1] = sl.length () ;
+
+ send (sl.buf_, sl.length () + sl.hdrlen);
+ }
}
void
@@ -474,6 +671,25 @@
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 (!(color & NDI_VERBATIM)
+ && (msg_is_special (msg)
+ || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128)))
+ cfperl_send_msg (this, color, type, msg);
+ else
+ send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg);
+}
+
/***********************************************************************
*
* packet functions/utilities
@@ -489,6 +705,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)
@@ -535,38 +769,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
-