--- deliantra/server/socket/lowlevel.C 2010/10/25 11:35:15 1.81
+++ deliantra/server/socket/lowlevel.C 2012/11/06 03:45:17 1.87
@@ -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 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
*/
@@ -55,8 +55,8 @@
{
if (last_send + IDLE_PING <= NOW && pl && pl->active)
{
- // this is a bit ugly, but map1a seem to be the only
- // nop'able commands and they are quite small.
+ // 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);
}
@@ -312,6 +312,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)
@@ -340,11 +352,108 @@
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);
+ if (ws_version)
+ {
+ if (ws_inbuf_len + 4096 > ws_inbuf_alloc)
+ ws_inbuf = (uint8 *)realloc (ws_inbuf, ws_inbuf_alloc += 4096);
+
+ int len = read (fd, ws_inbuf + ws_inbuf_len, ws_inbuf_alloc - ws_inbuf_len);
+
+ if (len > 0)
+ {
+ ws_inbuf_len += len;
+
+ if (ws_inbuf_len < 2 + 4) // 6 is minimum length: op, len, mask
+ return;
+
+ int d = 2;
+ int o = ws_inbuf [0] & 15;
+ int l = ws_inbuf [1] & 127;
+
+ if (l == 126)
+ {
+ l = (ws_inbuf [2] << 8) | ws_inbuf [3];
+ d += 2;
+ }
+ else if (l == 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.
+ l = (ws_inbuf [6] << 24)
+ | (ws_inbuf [7] << 16)
+ | (ws_inbuf [8] << 8)
+ | ws_inbuf [9];
+ d += 8;
+ }
+
+ // we only continue if we have a complete frame
+ if (ws_inbuf_len < d + 4 + l)
+ return;
+
+ switch (o)
+ {
+ case 0: o = ws_inbuf_type; break; // continuation
+ case 1: ws_inbuf_type = 1; break; // utf-8
+ case 2: ws_inbuf_type = 2; break; // binary
+ }
+
+ if (l > amount)
+ {
+ // input buffer full
+ LOG (llevError, "input buffer overflow (ws).");
+ destroy ();
+ return;
+ }
+
+ for (int i = 0; i < l; ++i)
+ inbuf [inbuf_len + i] = ws_inbuf [d + 4 + i] ^ ws_inbuf [d + (i & 3)];
+
+ // remove frame
+ ws_inbuf_len -= d + 4 + l;
+ memmove (ws_inbuf, ws_inbuf + d + 4 + l, ws_inbuf_len);
+
+ switch (o)
+ {
+ case 1: // utf-8
+ //TODO
+ break;
+ case 2: // binary
+ 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, l >> 8, l };
+ send (hdr, sizeof (hdr));
+ send (inbuf + inbuf_len, l);
+ }
+ return;
+
+ case 10: // pong
+ return;
+
+ case 8: // close
+ default:
+ destroy ();
+ return;
+ }
+
+ amount = l;
+ }
+ else
+ amount = -1;
+ }
+ else
+ amount = read (fd, inbuf + inbuf_len, amount);
if (!amount)
{
@@ -365,14 +474,7 @@
else
{
inbuf_len += amount;
-
- if (handle_packet ())
- {
- while (handle_packet ())
- ;
-
- flush ();
- }
+ inbuf_handle ();
}
}
}
@@ -452,12 +554,28 @@
if (!sl.length ())
return;
- assert (sl.hdrlen == 2);
+ if (ws_version == 8)
+ {
+ uint8 hdr [4] = { 0x81, 126, sl.length () >> 8, sl.length () };
+ // TODO: utf-8 encoding
+ send (hdr, 4);
+ send (sl.buf_ + sl.hdrlen, sl.cur - sl.buf_ - sl.hdrlen);
+ }
+ else if (ws_version == 13)
+ {
+ uint8 hdr [4] = { 0x82, 126, sl.length () >> 8, sl.length () };
+ send (hdr, 4);
+ send (sl.buf_ + sl.hdrlen, sl.cur - sl.buf_ - sl.hdrlen);
+ }
+ else
+ {
+ assert (sl.hdrlen == 2);
- sl.buf_ [0] = sl.length () >> 8;
- sl.buf_ [1] = sl.length () ;
+ sl.buf_ [0] = sl.length () >> 8;
+ sl.buf_ [1] = sl.length () ;
- send (sl.buf_, sl.length () + sl.hdrlen);
+ send (sl.buf_, sl.length () + sl.hdrlen);
+ }
}
void