--- deliantra/server/socket/lowlevel.C 2006/12/14 05:09:32 1.18
+++ deliantra/server/socket/lowlevel.C 2017/01/19 21:18:34 1.99
@@ -1,197 +1,506 @@
/*
- 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,2013,2014,2015,2016 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;
#include
-#include
#include
#include
-#ifdef __linux__
+#if HAVE_TCP_INFO
# include
# include
# include
-# define TCP_HZ 1000 // sorry...
# 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
-#define SOCKET_TIMEOUT2 20
+// force a packet when idle for more than this many seconds,
+// forcing an ack regularly.
+#define IDLE_PING 2.
void
-Socket_Flush (client_socket * ns)
+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 (destroyed ())
+ return;
- if (!getsockopt (ns->fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi))
- {
- unsigned int diff = tcpi.tcpi_last_ack_recv - tcpi.tcpi_last_data_sent;
+ /**
+ * Writes data to socket.
+ *
+ * When the socket is clear to write, and we have backlogged data, this
+ * is called to write it out.
+ */
- if (tcpi.tcpi_unacked && SOCKET_TIMEOUT1 * TCP_HZ < diff && diff < 0x80000000UL // ack delayed for 20s
- && SOCKET_TIMEOUT2 * TCP_HZ < tcpi.tcpi_last_data_sent) // no data sent for 10s
+ // write a nop to the socket at least every IDLE_PING seconds.
+ if (!outputbuffer.len)
+ {
+ if (last_send + IDLE_PING <= NOW && pl && pl->active)
{
- LOG (llevDebug, "Connection on fd %d closed due to ack timeout (%u/%u/%u)\n", ns->fd,
- (unsigned) tcpi.tcpi_last_ack_recv, (unsigned) tcpi.tcpi_last_data_sent, (unsigned) tcpi.tcpi_unacked);
- ns->status = Ns_Dead;
+ // 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;
}
- int val;
+ if (socket_ev.poll () & EV_WRITE)
+ return;
- val = 0; setsockopt (ns->fd, IPPROTO_TCP, TCP_CORK, &val, sizeof (val));
- val = 1; setsockopt (ns->fd, IPPROTO_TCP, TCP_CORK, &val, sizeof (val));
-#endif
+ last_send = NOW;
+ write_outputbuffer ();
}
-/***********************************************************************
+void
+client::write_outputbuffer ()
+{
+ while (outputbuffer.len)
+ {
+ int res = write (fd, outputbuffer.data + outputbuffer.start,
+ min (outputbuffer.len, SOCKETBUFSIZE - outputbuffer.start));
+
+ if (res > 0)
+ {
+ outputbuffer.start += res;
+ /* wrap back to start of buffer */
+ if (outputbuffer.start == SOCKETBUFSIZE)
+ outputbuffer.start = 0;
+
+ outputbuffer.len -= res;
+ }
+ else if (res == 0)
+ {
+ LOG (llevError, "socket write failed, connection closed.\n");
+ destroy ();
+ return;
+ }
+ else if (errno == EINTR)
+ {
+ // just retry
+ }
+ else if (errno == EAGAIN)
+ {
+ // delay till ready
+ socket_ev.poll (socket_ev.poll () | EV_WRITE);
+ socket_ev.start ();
+ return;
+ }
+ else
+ {
+ LOG (llevError, "socket write failed: %s\n", strerror (errno));
+ destroy ();
+ return;
+ }
+ }
+
+ socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
+}
+
+/******************************************************************************
*
- * packet functions/utilities
+ * Start of read routines.
*
- **********************************************************************/
+ ******************************************************************************/
-packet &packet::operator <<(const data &v)
+int
+client::next_packet ()
{
- if (room () < v.len)
- reset ();
- else
+ if (inbuf_len >= 2)
{
- if (v.len)
+ int pkt_len = (inbuf [0] << 8) | inbuf [1];
+
+ if (inbuf_len >= 2 + pkt_len)
+ return 2 + pkt_len;
+
+ if (inbuf_len == sizeof (inbuf))
{
- memcpy (cur, v.ptr, v.len);
- cur += v.len;
+ send_packet_printf ("msg %d log input buffer overflow - closing connection.", NDI_RED | NDI_REPLY);
+ destroy ();
+ return -1;
}
}
- return *this;
+ return 0;
}
-packet &packet::operator <<(const data8 &v)
+void
+client::skip_packet (int len)
{
- unsigned int len = min (v.len, 0x00FF);
- return *this << uint8 (len) << data (v.ptr, len);
+ inbuf_len -= len;
+ memmove (inbuf, inbuf + len, inbuf_len);
}
-packet &packet::operator <<(const data16 &v)
+/*****************************************************************************
+ * Start of command dispatch area.
+ * The commands here are protocol commands.
+ ****************************************************************************/
+
+// SocketCommand, PlayingCommand, should not exist with those ugly casts
+#define SC(cb) (void *)static_cast(cb),
+#define PC(cb) (void *)static_cast(cb), PF_PLAYER |
+
+static void
+NopCmd (char *, int, client *)
{
- unsigned int len = min (v.len, 0xFFFF);
- return *this << uint16 (len) << data (v.ptr, len);
+ // do nothing
}
-packet &packet::operator <<(const char *v)
-{
- return *this << data (v, strlen (v ? v : 0));
+/**
+ * Dispatch table for the server.
+ */
+static struct packet_type packets[] = {
+ {"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND },
+
+ {"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+/Deliantra
+ {"mapredraw", PC(MapRedrawCmd) 0 },
+ {"mapinfo", PC(MapInfoCmd) 0 }, // CF+/Deliantra
+
+ {"reply", SC(ReplyCmd) 0 },
+ {"exti", SC(ExtiCmd) 0 }, // CF+/Deliantra
+ {"addme", SC(AddMeCmd) 0 },
+ {"askface", SC(AskFaceCmd) 0 },
+ {"requestinfo", SC(RequestInfo) 0 },
+ {"setsound", SC(SetSound) 0 },
+ {"setup", SC(SetUp) 0 },
+ {"version", SC(VersionCmd) 0 },
+
+ {"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) || 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
-packet::printf (const char *format, ...)
+client::execute (const packet_type *pkt, char *data, int datalen)
{
- int size = room ();
+ 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);
+ pl->need_updated_stats ();
+ }
+ else
+ ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this);
+ }
+ else
+ send_packet_printf ("msg %d log ERROR: you cannot execute '%s' now.", NDI_RED | NDI_REPLY, pkt->name);
+}
- va_list ap;
- va_start (ap, format);
- int len = vsnprintf ((char *)cur, size, format, ap);
- va_end (ap);
+bool
+client::handle_packet ()
+{
+ int pkt_len = next_packet ();
- if (len >= size)
- return reset ();
+ if (!pkt_len)
+ return false;
+ else if (pkt_len < 0)
+ {
+ LOG (llevError, "read error on player %s\n",
+ pl && pl->ob ? &pl->ob->name : "[anonymous]");
+ destroy ();
+ return false;
+ }
- cur += len;
+ 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
+ * we get such a command, don't worry about trying
+ * to break it up.
+ */
+ int datalen;
+ char *data = strchr ((char *)inbuf + 2, ' ');
+
+ if (data)
+ {
+ *data++ = 0;
+ datalen = pkt_len - (data - (char *)inbuf);
+ }
+ else
+ {
+ data = (char *)inbuf + 2; // better read garbage than segfault
+ datalen = 0;
+ }
+
+ 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))
+ queue_command (pkt, data, datalen);
+ else
+ execute (pkt, data, datalen);
+
+ goto next_packet;
+ }
+
+ // If we get here, we didn't find a valid command.
+ 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 () | EV_READ);
+
+ return true;
}
-/******************************************************************************
- *
- * Start of read routines.
- *
- ******************************************************************************/
+void
+client::inbuf_handle ()
+{
+ if (!handle_packet ())
+ return;
-int
-client_socket::read_packet ()
+ while (handle_packet ())
+ ;
+
+ flush ();
+}
+
+// callback called when socket is either readable or writable
+void
+client::socket_cb (iow &w, int revents)
{
- for (;;)
+ //TODO remove when we have better socket cleanup logic
+ if (destroyed ())
+ {
+ socket_ev.poll (0);
+ return;
+ }
+
+ if (revents & EV_WRITE)
+ {
+ write_outputbuffer ();
+
+ if (!outputbuffer.len)
+ socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
+ }
+
+ if (revents & EV_READ)
{
- if (inbuf_len >= 2)
+ int amount;
+ uint8 *rbuf;
+
+ if (ws_version)
{
- unsigned int pkt_len = (inbuf [0] << 8) | inbuf [1];
+ if (ws_inbuf_len + 2048 > ws_inbuf_alloc)
+ ws_inbuf = (uint8 *)realloc (ws_inbuf, ws_inbuf_alloc += 4096);
- if (inbuf_len >= 2 + pkt_len)
- return pkt_len + 2;
+ rbuf = ws_inbuf + ws_inbuf_len;
+ amount = ws_inbuf_alloc - ws_inbuf_len;
+ }
+ else
+ {
+ rbuf = inbuf + inbuf_len;
+ amount = sizeof (inbuf) - inbuf_len;
}
- int amount = sizeof (inbuf) - inbuf_len;
-
- if (amount <= 0)
+ if (!amount)
{
- LOG (llevError, "packet too large");//TODO
- return -1;
+ // input buffer full
+ LOG (llevError, "input buffer overflow.");
+ destroy ();
+ return;
}
- amount = read (fd, inbuf + inbuf_len, amount);
+ amount = read (fd, rbuf, amount);
if (!amount)
{
- status = Ns_Dead;
- return -1;
+ destroy ();
+ return;
}
else if (amount < 0)
{
if (errno != EAGAIN && errno != EINTR)
{
- LOG (llevError, "read error: %s", strerror (errno));
- return -1;
+ LOG (llevError, "read error: %s\n", strerror (errno));
+ destroy ();
+ return;
}
- return 0;
+ // should not be here, normally
}
- inbuf_len += amount;
+ if (ws_version)
+ {
+ 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;
-void
-client_socket::skip_packet (int len)
-{
- inbuf_len -= len;
- memmove (inbuf, inbuf + len, inbuf_len);
+ 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 ();
+ }
+ }
}
/*******************************************************************************
@@ -206,24 +515,29 @@
* ns is the socket we are adding the data to, buf is the start of the
* data, and len is the number of bytes to add.
*/
-
-static void
-add_to_buffer (client_socket *ns, char *buf, int len)
+void
+client::send (void *buf_, int len)
{
- int avail, end;
+ char *buf = (char *)buf_;
- if ((len + ns->outputbuffer.len) > SOCKETBUFSIZE)
+ if (destroyed () || !buf)
+ return;
+
+ if (len + outputbuffer.len > SOCKETBUFSIZE)
{
- LOG (llevDebug, "Socket on fd %d has overrun internal buffer - marking as dead\n", ns->fd);
- ns->status = Ns_Dead;
+ LOG (llevDebug, "socket on fd %d has overrun internal buffer - marking as dead\n", fd);
+ // 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;
}
+ int avail, end;
+
/* data + end is where we start putting the new data. The last byte
* currently in use is actually data + end -1
*/
-
- end = ns->outputbuffer.start + ns->outputbuffer.len;
+ end = outputbuffer.start + outputbuffer.len;
/* The buffer is already in a wrapped state, so adjust end */
if (end >= SOCKETBUFSIZE)
end -= SOCKETBUFSIZE;
@@ -232,159 +546,105 @@
/* We can all fit it behind the current data without wrapping */
if (avail >= len)
- memcpy (ns->outputbuffer.data + end, buf, len);
+ memcpy (outputbuffer.data + end, buf, len);
else
{
- memcpy (ns->outputbuffer.data + end, buf, avail);
- memcpy (ns->outputbuffer.data, buf + avail, len - avail);
+ memcpy (outputbuffer.data + end, buf, avail);
+ memcpy (outputbuffer.data, buf + avail, len - avail);
}
- ns->outputbuffer.len += len;
-#if 0
- LOG (llevDebug, "Added %d to output buffer, total length now %d, start=%d\n", len, ns->outputbuffer.len, ns->outputbuffer.start);
-#endif
+ outputbuffer.len += len;
}
/**
- * Writes data to socket.
- *
- * When the socket is clear to write, and we have backlogged data, this
- * is called to write it out.
+ * Takes a string of data, and writes it out to the socket. A very handy
+ * shortcut function.
*/
void
-write_socket_buffer (client_socket * ns)
+client::send_packet (packet &sl)
{
- int amt, max;
+ if (destroyed ())
+ return;
- if (ns->outputbuffer.len == 0)
+ if (sl.length () > MAXSOCKBUF)
{
- LOG (llevDebug, "write_socket_buffer called when there is no data, fd=%d\n", ns->fd);
- return;
+ 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
+ * it easier to debug.
+ */
+ abort ();
}
- do
+ if (!sl.length ())
+ return;
+
+ if (ws_version == 8)
{
- max = SOCKETBUFSIZE - ns->outputbuffer.start;
- if (ns->outputbuffer.len < max)
- max = ns->outputbuffer.len;
+ static uint8 buf [MAXSOCKBUF * 2 + 4];
- do
+ uint8 *b = buf + 4;
+ for (uint8 *a = sl.buf_ + sl.hdrlen; a < sl.cur; ++a)
{
- amt = write (ns->fd, ns->outputbuffer.data + ns->outputbuffer.start, max);
- }
- while ((amt < 0) && (errno == EINTR));
-
- if (amt < 0)
- { /* We got an error */
-
- if (errno != EWOULDBLOCK)
- {
- LOG (llevError, "New socket write failed (wsb) (%d: %s).\n", errno, strerror (errno));
- ns->status = Ns_Dead;
- return;
- }
+ if (*a < 0x80)
+ *b++ = *a;
else
- { /* EWOULDBLOCK */
- /* can't write it, so store it away. */
- ns->can_write = 0;
- return;
+ {
+ *b++ = 0xc0 | ((*a >> 6) & 0x1f);
+ *b++ = 0x80 | ( *a & 0x3f);
}
}
- ns->outputbuffer.start += amt;
- /* wrap back to start of buffer */
- if (ns->outputbuffer.start == SOCKETBUFSIZE)
- ns->outputbuffer.start = 0;
- ns->outputbuffer.len -= amt;
-#ifdef CS_LOGSTATS
- cst_tot.obytes += amt;
- cst_lst.obytes += amt;
-#endif
- }
- while (ns->outputbuffer.len > 0);
-}
-/**
- * This writes data to the socket. - It is very low level -
- * all we try and do is write out the data to the socket
- * provided (ns). buf is the data to write, len is the number
- * of bytes to write. IT doesn't return anything - rather, it
- * updates the ns structure if we get an error.
- */
-void
-client_socket::send (void *buf_, int len)
-{
- char *buf = (char *)buf_;
- char *pos = buf;
- int amt = 0;
+ assert (b - buf < sizeof (buf));
- if (status == Ns_Dead || !buf)
- {
- LOG (llevDebug, "Write_To_Socket called with dead socket\n");
- return;
- }
+ int len = b - (buf + 4);
-#ifndef __GNU__ /* This caused problems on Hurd */
- if (!can_write)
- {
- add_to_buffer (this, buf, len);
- return;
- }
-#endif
+ if (len < 126)
+ {
+ buf [2] = 0x81;
+ buf [3] = len;
- /* If we manage to write more than we wanted, take it as a bonus */
- while (len > 0)
- {
- do
+ send (buf + 2, len + 2);
+ }
+ else
{
- amt = write (fd, pos, len);
+ buf [0] = 0x81;
+ buf [1] = 126;
+ buf [2] = len >> 8;
+ buf [3] = len;
+
+ send (buf, len + 4);
}
- while ((amt < 0) && (errno == EINTR));
+ }
+ else if (ws_version == 13)
+ {
+ int len = sl.length ();
- if (amt < 0)
- { /* We got an error */
- if (errno != EWOULDBLOCK)
- {
- LOG (llevError, "New socket write failed WTS (%d: %s).\n", /* ---WIN32 */
- errno, strerror (errno));
- status = Ns_Dead;
- return;
- }
- else
- { /* EWOULDBLOCK */
- /* can't write it, so store it away. */
- add_to_buffer (this, pos, len);
- can_write = 0;
- return;
- }
+ if (len < 126)
+ {
+ uint8 hdr [] = { 0x82, len };
+ send (hdr, sizeof (hdr));
+ }
+ else
+ {
+ uint8 hdr [] = { 0x82, 126, len >> 8, len };
+ send (hdr, sizeof (hdr));
}
- /* amt gets set to 0 above in blocking code, so we do this as
- * an else if to make sure we don't reprocess it.
- */
- else if (amt == 0)
- LOG (llevError, "Write_To_Socket: No data written out.\n");
- len -= amt;
- pos += amt;
-#ifdef CS_LOGSTATS
- cst_tot.obytes += amt;
- cst_lst.obytes += amt;
-#endif
+ send (sl.buf_ + sl.hdrlen, len);
}
-}
+ else
+ {
+ assert (sl.hdrlen == 2);
-/**
- * Takes a string of data, and writes it out to the socket. A very handy
- * shortcut function.
- */
+ sl.buf_ [0] = sl.length () >> 8;
+ sl.buf_ [1] = sl.length () ;
-void
-client_socket::send_packet (packet &sl)
-{
- Send_With_Handling (this, &sl);
+ send (sl.buf_, sl.length () + sl.hdrlen);
+ }
}
void
-client_socket::send_packet (const char *buf, int len)
+client::send_packet (const char *buf, int len)
{
packet sl;
@@ -393,74 +653,119 @@
}
void
-client_socket::send_packet (const char *buf)
+client::send_packet (const char *buf)
{
send_packet (buf, strlen (buf));
}
-/**
- * Calls Write_To_Socket to send data to the client.
- *
- * The only difference in this function is that we take a packet
- *, and we prepend the length information.
- */
void
-Send_With_Handling (client_socket *ns, packet *msg)
+client::send_packet_printf (const char *format, ...)
{
- unsigned char sbuf[4];
+ packet sl;
- if (ns->status == Ns_Dead || !msg)
- return;
+ va_list ap;
+ va_start (ap, format);
+ sl.vprintf (format, ap);
+ va_end (ap);
- if (msg->length () >= MAXSOCKBUF)
+ 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 (llevError, "Trying to send a buffer beyond properly size, len =%d\n", msg->length ());
- /* Almost certainly we've overflowed a buffer, so quite now to make
- * it easier to debug.
- */
- abort ();
+ LOG (logBacktrace | llevError, "send_msg(%d,%p,%p) called with NULL msg or type.\n", color, type, msg);
+ return;
}
- sbuf[0] = ((uint32) (msg->length ()) >> 8);
- sbuf[1] = ((uint32) (msg->length ()) );
+ int len = strlen (msg);
- //TODO: single write, or writev
- ns->send (sbuf, 2);
- ns->send (msg->buf, msg->length ());
+ 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);
}
-/******************************************************************************
+/***********************************************************************
*
- * statistics logging functions.
+ * packet functions/utilities
*
- ******************************************************************************/
+ **********************************************************************/
-#ifdef CS_LOGSTATS
+packet::packet (const char *name)
+{
+ reset ();
-/* cst_tot is for the life of the server, cst_last is for the last series of
- * stats
- */
-CS_Stats cst_tot, cst_lst;
+ int len = strlen (name);
+ memcpy (cur, name, len); cur += len;
+ *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)
+ reset ();
+ else
+ {
+ if (v.len)
+ {
+ memcpy (cur, v.ptr, v.len);
+ cur += v.len;
+ }
+ }
+
+ return *this;
+}
+
+packet &packet::operator <<(const data8 &v)
+{
+ unsigned int len = min (v.len, 0x00FF);
+ return *this << uint8 (len) << data (v.ptr, len);
+}
+
+packet &packet::operator <<(const data16 &v)
+{
+ unsigned int len = min (v.len, 0xFFFF);
+ return *this << uint16 (len) << data (v.ptr, len);
+}
+
+packet &packet::operator <<(const char *v)
+{
+ return *this << data (v, strlen (v ? v : 0));
+}
-/**
- * Writes out the gathered stats. We clear cst_lst.
- */
void
-write_cs_stats (void)
+packet::vprintf (const char *format, va_list ap)
{
- time_t now = time (NULL);
+ int size = room ();
- /* If no connections recently, don't both to log anything */
- if (cst_lst.ibytes == 0 && cst_lst.obytes == 0)
- return;
+ int len = vsnprintf ((char *)cur, size, format, ap);
- /* 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;
+ if (len >= size)
+ return reset ();
+
+ cur += len;
}
-#endif