--- deliantra/server/socket/lowlevel.C 2011/02/16 13:46:44 1.82
+++ deliantra/server/socket/lowlevel.C 2017/01/19 21:18:34 1.99
@@ -1,22 +1,22 @@
/*
* This file is part of Deliantra, the Roguelike Realtime MMORPG.
- *
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- *
+ *
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ *
* 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
*/
@@ -50,7 +50,7 @@
* is called to write it out.
*/
- // write a nop to the socket at least every IDLE_NOP seconds.
+ // write a nop to the socket at least every IDLE_PING seconds.
if (!outputbuffer.len)
{
if (last_send + IDLE_PING <= NOW && pl && pl->active)
@@ -134,7 +134,7 @@
if (inbuf_len == sizeof (inbuf))
{
- send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED | NDI_REPLY);
+ send_packet_printf ("msg %d log input buffer overflow - closing connection.", NDI_RED | NDI_REPLY);
destroy ();
return -1;
}
@@ -152,7 +152,7 @@
/*****************************************************************************
* Start of command dispatch area.
- * The commands here are protocol commands.
+ * The commands here are protocol commands.
****************************************************************************/
// SocketCommand, PlayingCommand, should not exist with those ugly casts
@@ -169,8 +169,7 @@
* Dispatch table for the server.
*/
static struct packet_type packets[] = {
- {"ncom", PC(NewPlayerCmd) PF_PLAYING | PF_COMMAND6 },
- {"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND0 },
+ {"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND },
{"examine", PC(ExamineCmd) PF_PLAYING },
{"ex", PC(ExCmd) PF_PLAYING },
@@ -202,7 +201,7 @@
&& (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING);
}
-// HACK: some commands currently should be executed
+// 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.
@@ -210,18 +209,12 @@
static bool
always_immediate (const client *ns, const packet_type *pkt, const char *data, int len)
{
- if (!(pkt->flags & (PF_COMMAND0 | PF_COMMAND6)))
+ if (!(pkt->flags & PF_COMMAND))
return false;
if (!ns->pl || !ns->pl->ob || !ns->pl->ob->map)
return false;
- if (pkt->flags & PF_COMMAND6)
- {
- data += 6;
- len -= 6;
- }
-
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;
@@ -248,7 +241,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 | NDI_REPLY, pkt->name);
+ send_packet_printf ("msg %d log ERROR: you cannot execute '%s' now.", NDI_RED | NDI_REPLY, pkt->name);
}
bool
@@ -300,7 +293,7 @@
}
// If we get here, we didn't find a valid command.
- send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED | NDI_REPLY, (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
@@ -312,6 +305,18 @@
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 revents)
@@ -333,18 +338,32 @@
if (revents & EV_READ)
{
- //TODO: rate-limit tcp connection in better ways, important
+ int amount;
+ uint8 *rbuf;
- int amount = sizeof (inbuf) - inbuf_len;
+ if (ws_version)
+ {
+ if (ws_inbuf_len + 2048 > ws_inbuf_alloc)
+ ws_inbuf = (uint8 *)realloc (ws_inbuf, ws_inbuf_alloc += 4096);
+
+ 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 () & ~EV_READ);
+ LOG (llevError, "input buffer overflow.");
+ destroy ();
return;
}
- amount = read (fd, inbuf + inbuf_len, amount);
+ amount = read (fd, rbuf, amount);
if (!amount)
{
@@ -362,18 +381,125 @@
// should not be here, normally
}
- else
+
+ if (ws_version)
{
- inbuf_len += amount;
+ ws_inbuf_len += amount;
- if (handle_packet ())
+ while (ws_inbuf_len)
{
- while (handle_packet ())
- ;
+ if (ws_inbuf_len < 2 + 4) // 6 is minimum length: op, len, mask
+ break;
- flush ();
+ 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 ();
+ }
}
}
@@ -452,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;
- sl.buf_ [0] = sl.length () >> 8;
- sl.buf_ [1] = sl.length () ;
+ 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 ();
- send (sl.buf_, sl.length () + sl.hdrlen);
+ 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.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
@@ -507,12 +690,6 @@
send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg);
}
-void
-client::send_drawinfo (const char *msg, int flags)
-{
- send_msg (flags, "log", msg);
-}
-
/***********************************************************************
*
* packet functions/utilities