--- deliantra/server/socket/lowlevel.C 2007/10/01 01:09:10 1.60
+++ deliantra/server/socket/lowlevel.C 2012/11/06 21:50:36 1.89
@@ -1,23 +1,23 @@
/*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
- *
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 3 of the License, or
- * (at your option) any later version.
- *
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
+ *
+ * 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 GNU General Public License
- * along with this program. If not, see .
- *
- * The authors can be reached via e-mail to
+ *
+ * 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;
@@ -55,16 +55,16 @@
{
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");
+ // 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 () & PE_W)
+ if (socket_ev.poll () & EV_WRITE)
return;
last_send = NOW;
@@ -101,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;
}
@@ -113,7 +113,7 @@
}
}
- socket_ev.poll (socket_ev.poll () & ~PE_W);
+ socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
}
/******************************************************************************
@@ -159,6 +159,12 @@
#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.
*/
@@ -173,22 +179,20 @@
{"lock", PC(LockItem) PF_PLAYING },
{"mark", PC(MarkItem) PF_PLAYING },
{"move", PC(MoveCmd) PF_PLAYING },
- {"ext", PC(ExtCmd) 0 }, // CF+
+ {"ext", PC(ExtCmd) 0 }, // CF+/Deliantra
{"mapredraw", PC(MapRedrawCmd) 0 },
- {"mapinfo", PC(MapInfoCmd) 0 }, // CF+
+ {"mapinfo", PC(MapInfoCmd) 0 }, // CF+/Deliantra
{"reply", SC(ReplyCmd) 0 },
- {"exti", SC(ExtiCmd) 0 }, // CF+
+ {"exti", SC(ExtiCmd) 0 }, // CF+/Deliantra
{"addme", SC(AddMeCmd) 0 },
{"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
@@ -198,7 +202,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.
@@ -218,10 +222,13 @@
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 > 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;
}
@@ -233,7 +240,10 @@
{
//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);
}
@@ -256,7 +266,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
@@ -277,7 +288,7 @@
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 && !always_immediate (this, pkt, data, datalen))
@@ -290,18 +301,32 @@
// 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);
+
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 (destroyed ())
@@ -310,15 +335,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
@@ -327,11 +352,122 @@
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);
+ if (ws_version)
+ {
+ if (ws_inbuf_len + 2048 > 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
+ {
+ uint8 *a = inbuf + inbuf_len;
+ uint8 *b = a;
+ uint8 *c = a + l;
+
+ for (; a < c; ++a, ++b)
+ {
+ *b = *a;
+
+ if (*a >= 0x80)
+ *b = (a [0] & 0x1f) << 6 | (a [1] & 0x3f), ++a;
+ }
+
+ l -= a - b;
+ }
+ 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)
{
@@ -352,14 +488,7 @@
else
{
inbuf_len += amount;
-
- if (handle_packet ())
- {
- while (handle_packet ())
- ;
-
- flush ();
- }
+ inbuf_handle ();
}
}
}
@@ -439,12 +568,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 l = b - (buf + 4);
+
+ if (l < 126)
+ {
+ buf [2] = 0x81;
+ buf [3] = l;
+
+ send (buf + 2, l + 2);
+ }
+ else
+ {
+ buf [0] = 0x81;
+ buf [1] = 126;
+ buf [2] = l >> 8;
+ buf [3] = l;
+
+ send (buf, l + 4);
+ }
+ }
+ else if (ws_version == 13)
+ {
+ int l = sl.length ();
- sl.buf_ [0] = sl.length () >> 8;
- sl.buf_ [1] = sl.length () ;
+ if (l < 126)
+ {
+ uint8 hdr [] = { 0x82, l };
+ send (hdr, sizeof (hdr));
+ }
+ else
+ {
+ uint8 hdr [] = { 0x82, 126, l >> 8, l };
+ send (hdr, sizeof (hdr));
+ }
- send (sl.buf_, sl.length () + sl.hdrlen);
+ send (sl.buf_ + sl.hdrlen, l);
+ }
+ else
+ {
+ assert (sl.hdrlen == 2);
+
+ sl.buf_ [0] = sl.length () >> 8;
+ sl.buf_ [1] = sl.length () ;
+
+ send (sl.buf_, sl.length () + sl.hdrlen);
+ }
}
void
@@ -475,13 +661,6 @@
send_packet (sl);
}
-// returns true when the message needs special (read: perl) treatment
-static bool
-msg_is_special (const char *msg)
-{
- return msg [strcspn (msg, "<[&\n")];
-}
-
void
client::send_msg (int color, const char *type, const char *msg)
{
@@ -493,14 +672,12 @@
int len = strlen (msg);
- if (msg_is_special (msg) || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128))
+ 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 & NDI_COLOR_MASK, msg);
+ send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg);
}
void
@@ -526,7 +703,7 @@
packet &packet::operator <<(const ber32 v)
{
- enum { maxlen = 32 / 7 + 1};
+ enum { maxlen = 32 / 7 + 1 };
uint8 buf[maxlen];
uint8 *p = buf + maxlen;
uint32 val = v.val;