--- deliantra/server/socket/lowlevel.C 2006/08/30 16:30:37 1.4
+++ deliantra/server/socket/lowlevel.C 2007/07/28 00:15:03 1.51
@@ -1,257 +1,403 @@
-
/*
- * static char *rcsid_sockets_c =
- * "$Id: lowlevel.C,v 1.4 2006/08/30 16:30:37 root Exp $";
- */
-
-/*
- 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.
- *
- * \date 2003-12-02
- *
- * 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.
+ * 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 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
*/
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
+// disconnect a socket after this many seconds without an ack
+#define SOCKET_TIMEOUT 8.
-void Socket_Flush (NewSocket *ns)
-{
-#ifdef __linux__
- // check time of last ack, and, if too old, kill connection
- struct tcp_info tcpi;
- socklen_t len = sizeof (tcpi);
+// force a packet when idle for more than this many seconds,
+// forcing an ack regularly.
+#define IDLE_PING 2.
+
+void
+client::flush ()
+{
+ if (destroyed ())
+ return;
+
+#if HAVE_TCP_INFO
+ // check about once per second, spread evenly over all clients
+ // do this only when player is active
+ if (!((pticks + fd) & 7) && pl && pl->active)
+ {
+ // check time of last ack, and, if too old, kill connection
+ socklen_t len = sizeof (tcpi);
- if (!getsockopt (ns->fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi))
+ if (!getsockopt (fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi))
+ {
+ if (tcpi.tcpi_snd_mss)
+ mss = tcpi.tcpi_snd_mss;
+
+ fprintf (stderr, "uack %d sst %d cwnd %d mss %d pmtu %d\n",
+ tcpi.tcpi_unacked, tcpi.tcpi_snd_ssthresh, tcpi.tcpi_snd_cwnd, tcpi.tcpi_advmss, tcpi.tcpi_pmtu);
+
+ if (tcpi.tcpi_last_ack_recv > int (SOCKET_TIMEOUT * 1000))
+ {
+ send_msg (NDI_RED, "connection-timeout", "safety disconnect due to tcp/ip timeout (no packets received)");
+ write_outputbuffer ();
+
+ 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
+
+ /**
+ * Writes data to socket.
+ *
+ * When the socket is clear to write, and we have backlogged data, this
+ * is called to write it out.
+ */
+
+ // write a nop to the socket at least every IDLE_NOP seconds.
+ if (!outputbuffer.len)
{
- unsigned int diff = tcpi.tcpi_last_ack_recv - tcpi.tcpi_last_data_sent;
+ 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");
+ send_packet (sl);
+ }
+ else
+ return;
+ }
+
+ if (socket_ev.poll () & PE_W)
+ return;
+
+ 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;
- 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
+ outputbuffer.len -= res;
+ }
+ else if (res == 0)
+ {
+ LOG (llevError, "socket write failed, connection closed.\n");
+ destroy ();
+ return;
+ }
+ else if (errno == EINTR)
{
- 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;
+ // just retry
+ }
+ else if (errno == EAGAIN)
+ {
+ // delay till ready
+ socket_ev.poll (socket_ev.poll () | PE_W);
+ socket_ev.start ();
+ return;
+ }
+ else
+ {
+ LOG (llevError, "socket write failed: %s\n", strerror (errno));
+ destroy ();
+ return;
}
}
- int val;
- 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
+ socket_ev.poll (socket_ev.poll () & ~PE_W);
}
-/***********************************************************************
+/******************************************************************************
*
- * SockList functions/utilities
+ * Start of read routines.
*
- **********************************************************************/
+ ******************************************************************************/
-void SockList_Init(SockList *sl)
+int
+client::next_packet ()
{
- sl->len=0;
- sl->buf=NULL;
+ if (inbuf_len >= 2)
+ {
+ int pkt_len = (inbuf [0] << 8) | inbuf [1];
+
+ if (inbuf_len >= 2 + pkt_len)
+ return 2 + pkt_len;
+
+ if (inbuf_len == sizeof (inbuf))
+ {
+ send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED);
+ destroy ();
+ return -1;
+ }
+ }
+
+ return 0;
}
-void SockList_AddInt(SockList *sl, uint32 data)
+void
+client::skip_packet (int len)
{
- sl->buf[sl->len++]= (data>>24)&0xff;
- sl->buf[sl->len++]= (data>>16)&0xff;
- sl->buf[sl->len++]= (data>>8)&0xff;
- sl->buf[sl->len++] = data & 0xff;
+ inbuf_len -= len;
+ memmove (inbuf, inbuf + len, inbuf_len);
}
-void SockList_AddInt64(SockList *sl, uint64 data)
-{
- sl->buf[sl->len++]= ( char )( (data>>56)&0xff );
- sl->buf[sl->len++]= ( char )( (data>>48)&0xff );
- sl->buf[sl->len++]= ( char )( (data>>40)&0xff );
- sl->buf[sl->len++]= ( char )( (data>>32)&0xff );
+/*****************************************************************************
+ * Start of command dispatch area.
+ * The commands here are protocol commands.
+ ****************************************************************************/
- sl->buf[sl->len++]= ( char )( (data>>24)&0xff );
- sl->buf[sl->len++]= ( char )( (data>>16)&0xff );
- sl->buf[sl->len++]= ( char )( (data>>8)&0xff );
- sl->buf[sl->len++] =( char )( data & 0xff );
-}
+// 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 |
-/* Basically does the reverse of SockList_AddInt, but on
- * strings instead. Same for the GetShort, but for 16 bits.
+/**
+ * Dispatch table for the server.
*/
-int GetInt_String(unsigned char *data)
+static struct packet_type packets[] = {
+ {"ncom", PC(NewPlayerCmd) PF_PLAYING | PF_COMMAND6 },
+ {"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND0 },
+
+ {"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+
+ {"mapredraw", PC(MapRedrawCmd) 0 },
+ {"mapinfo", PC(MapInfoCmd) 0 }, // CF+
+
+ {"reply", SC(ReplyCmd) 0 },
+ {"exti", SC(ExtiCmd) 0 }, // CF+
+ {"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) */
+};
+
+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)
{
- return ((data[0]<<24) + (data[1]<<16) + (data[2]<<8) + data[3]);
+ if (!(pkt->flags & (PF_COMMAND0 | PF_COMMAND6)))
+ 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 && !strncmp (data, "say " , 4))
+ return true;
+ if (len > 5 && !strncmp (data, "chat ", 5))
+ return true;
+
+ return false;
}
-short GetShort_String(unsigned char *data) {
- return ((data[0]<<8)+data[1]);
+void
+client::execute (const packet_type *pkt, char *data, int datalen)
+{
+ 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);
+ 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);
}
-/******************************************************************************
- *
- * Start of read routines.
- *
- ******************************************************************************/
+bool
+client::handle_packet ()
+{
+ int pkt_len = next_packet ();
-/**
- * This reads from fd and puts the data in sl. We return true if we think
- * we have a full packet, 0 if we have a partial packet. The only processing
- * we do is remove the intial size value. len (As passed) is the size of the
- * buffer allocated in the socklist. We make the assumption the buffer is
- * at least 2 bytes long.
- */
-
-int SockList_ReadPacket(int fd, SockList *sl, int len)
+ 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;
+ }
+
+ inbuf [pkt_len] = 0; /* 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 + (sizeof (packets) / sizeof (packets[0])); ++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 ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED, (char *)inbuf + 2);
+next_packet:
+ skip_packet (pkt_len);
+
+ // input buffer has space again
+ socket_ev.poll (socket_ev.poll () | PE_R);
+
+ return true;
+}
+
+// callback called when socket is either readable or writable
+void
+client::socket_cb (iow &w, int got)
{
- int stat,toread;
+ //TODO remove when we have better socket cleanup logic
+ if (destroyed ())
+ {
+ socket_ev.poll (0);
+ return;
+ }
- /* Sanity check - shouldn't happen */
- if (sl->len < 0) {
- abort();
+ if (got & PE_W)
+ {
+ write_outputbuffer ();
+
+ if (!outputbuffer.len)
+ socket_ev.poll (socket_ev.poll () & ~PE_W);
}
- /* We already have a partial packet */
- if (sl->len<2) {
-#ifdef WIN32 /* ***WIN32 SockList_ReadPacket: change read() to recv() */
- stat=recv(fd, sl->buf + sl->len, 2-sl->len,0);
+ if (got & PE_R)
+ {
+ //TODO: rate-limit tcp connection in better ways, important
+
+ int amount = sizeof (inbuf) - inbuf_len;
-#else
- do {
- stat=read(fd, sl->buf + sl->len, 2-sl->len);
- } while ((stat==-1) && (errno==EINTR));
-#endif
- if (stat<0) {
- /* In non blocking mode, EAGAIN is set when there is no
- * data available.
- */
-#ifdef WIN32 /* ***WIN32 SockList_ReadPacket: error handling for win32 */
- if ((stat==-1) && WSAGetLastError() !=WSAEWOULDBLOCK) {
- if(WSAGetLastError() == WSAECONNRESET)
- LOG(llevDebug,"Connection closed by client\n");
- else
- {
- LOG(llevDebug,"ReadPacket got error %d, returning 0\n",WSAGetLastError());
- }
- return -1; /* kick this user! */
- }
-#else
- if (errno != EAGAIN && errno !=EWOULDBLOCK) {
- LOG(llevDebug, "ReadPacket got error %s, returning 0\n", strerror(errno));
- }
-#endif
- return 0; /*Error */
+ if (!amount)
+ {
+ // input buffer full
+ socket_ev.poll (socket_ev.poll () & ~PE_R);
+ return;
}
- if (stat==0) return -1;
- sl->len += stat;
-#ifdef CS_LOGSTATS
- cst_tot.ibytes += stat;
- cst_lst.ibytes += stat;
-#endif
- if (stat<2) return 0; /* Still don't have a full packet */
- }
- /* Figure out how much more data we need to read. Add 2 from the
- * end of this - size header information is not included.
- */
- toread = 2+(sl->buf[0] << 8) + sl->buf[1] - sl->len;
- if ((toread + sl->len) >= len) {
- LOG(llevError,"SockList_ReadPacket: Want to read more bytes than will fit in buffer (%d>=%d).\n",
- toread + sl->len, len);
- /* Quick hack in case for 'oldsocketmode' input. If we are
- * closing the socket anyways, then reading this extra 100 bytes
- * shouldn't hurt.
- */
-#ifdef WIN32 /* ***win32 SockList_ReadPacket: change read() to recv() */
- recv(fd, sl->buf+2, 100, 0);
-#else
- read(fd, sl->buf+2, 100);
-#endif /* end win32 */
-
- /* return error so the socket is closed */
- return -1;
- }
- do {
-#ifdef WIN32 /* ***win32 SockList_ReadPacket: change read() to recv() */
- stat = recv(fd, sl->buf+ sl->len, toread, 0);
-#else
- do {
- stat = read(fd, sl->buf+ sl->len, toread);
- } while ((stat<0) && (errno==EINTR));
-#endif
- if (stat<0) {
-#ifdef WIN32 /* ***win32 SockList_ReadPacket: change error handling for win32 */
- if ((stat==-1) && WSAGetLastError() !=WSAEWOULDBLOCK) {
- if(WSAGetLastError() == WSAECONNRESET)
- LOG(llevDebug,"Connection closed by client\n");
- else
- {
- LOG(llevDebug,"ReadPacket got error %d, returning 0\n",WSAGetLastError());
- }
- return -1; /* kick this user! */
- }
-#else
- if (errno != EAGAIN && errno !=EWOULDBLOCK) {
- LOG(llevDebug, "ReadPacket got error %s, returning 0\n", strerror(errno));
+ amount = read (fd, inbuf + inbuf_len, amount);
+
+ if (!amount)
+ {
+ destroy ();
+ return;
+ }
+ else if (amount < 0)
+ {
+ if (errno != EAGAIN && errno != EINTR)
+ {
+ LOG (llevError, "read error: %s\n", strerror (errno));
+ destroy ();
+ return;
}
-#endif
- return 0; /*Error */
+
+ // should not be here, normally
}
- if (stat==0) return -1;
- sl->len += stat;
-#ifdef CS_LOGSTATS
- cst_tot.ibytes += stat;
- cst_lst.ibytes += stat;
-#endif
- toread -= stat;
- if (toread==0) return 1;
- if (toread < 0) {
- LOG(llevError,"SockList_ReadPacket: Read more bytes than desired.\n");
- return 1;
+ else
+ {
+ inbuf_len += amount;
+
+ cmd_ev.start ();
}
- } while (toread>0);
- return 0;
+ }
+}
+
+// called whenever we have additional commands to process
+void
+client::cmd_cb (iw &w)
+{
+ if (handle_packet ())
+ w.start ();
+ else
+ flush ();
}
/*******************************************************************************
@@ -266,255 +412,207 @@
* 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(NewSocket *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) {
- LOG(llevDebug,"Socket on fd %d has overrun internal buffer - marking as dead\n",
- ns->fd);
- ns->status = Ns_Dead;
- return;
+ if (destroyed () || !buf)
+ return;
+
+ if (len + outputbuffer.len > SOCKETBUFSIZE)
+ {
+ 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 = outputbuffer.start + outputbuffer.len;
+ /* The buffer is already in a wrapped state, so adjust end */
+ if (end >= SOCKETBUFSIZE)
+ end -= SOCKETBUFSIZE;
+
+ avail = SOCKETBUFSIZE - end;
+
+ /* We can all fit it behind the current data without wrapping */
+ if (avail >= len)
+ memcpy (outputbuffer.data + end, buf, len);
+ else
+ {
+ memcpy (outputbuffer.data + end, buf, avail);
+ memcpy (outputbuffer.data, buf + avail, len - avail);
}
- /* 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;
- /* The buffer is already in a wrapped state, so adjust end */
- if (end>=SOCKETBUFSIZE) end-=SOCKETBUFSIZE;
- avail=SOCKETBUFSIZE - end;
-
- /* We can all fit it behind the current data without wrapping */
- if (avail >=len ) {
- memcpy(ns->outputbuffer.data + end, buf, len);
- }
- else {
- memcpy(ns->outputbuffer.data + end, buf, avail);
- memcpy(ns->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(NewSocket *ns)
+void
+client::send_packet (packet &sl)
{
- int amt, max;
+ if (destroyed ())
+ return;
- if (ns->outputbuffer.len==0) {
- LOG(llevDebug,"write_socket_buffer called when there is no data, fd=%d\n",
- ns->fd);
- return;
+ 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
+ * it easier to debug.
+ */
+ abort ();
}
- do {
- max = SOCKETBUFSIZE - ns->outputbuffer.start;
- if (ns->outputbuffer.lenoutputbuffer.len;
-
-#ifdef WIN32 /* ***win32 write_socket_buffer: change write() to send() */
- amt=send(ns->fd, ns->outputbuffer.data + ns->outputbuffer.start, max,0);
-#else
- do {
- amt=write(ns->fd, ns->outputbuffer.data + ns->outputbuffer.start, max);
- } while ((amt<0) && (errno==EINTR));
-#endif
+ if (!sl.length ())
+ return;
- if (amt < 0) { /* We got an error */
+ assert (sl.hdrlen == 2);
-#ifdef WIN32 /* ***win32 write_socket_buffer: change error handling */
- if (amt == -1 && WSAGetLastError() !=WSAEWOULDBLOCK) {
- LOG(llevError,"New socket write failed (wsb) (%d).\n", WSAGetLastError());
-#else
- if (errno !=EWOULDBLOCK) {
- LOG(llevError,"New socket write failed (wsb) (%d: %s).\n",
- errno, strerror(errno));
-#endif
- ns->status=Ns_Dead;
- return;
- }
- else { /* EWOULDBLOCK */
- /* can't write it, so store it away. */
- ns->can_write=0;
- return;
- }
- }
- 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);
+ sl.buf_ [0] = sl.length () >> 8;
+ sl.buf_ [1] = sl.length () ;
+
+ send (sl.buf_, sl.length () + sl.hdrlen);
}
-/**
- * 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 Write_To_Socket(NewSocket *ns, char *buf, int len)
+void
+client::send_packet (const char *buf, int len)
{
- int amt=0;
- char *pos=buf;
+ packet sl;
- if (ns->status == Ns_Dead || !buf) {
- LOG(llevDebug,"Write_To_Socket called with dead socket\n");
- return;
- }
-
-#ifndef __GNU__ /* This caused problems on Hurd */
- if (!ns->can_write) {
- add_to_buffer(ns, buf, len);
- return;
- }
-#endif
- /* If we manage to write more than we wanted, take it as a bonus */
- while (len>0) {
+ sl << data (buf, len);
+ send_packet (sl);
+}
-#ifdef WIN32 /* ***win32 Write_To_Socket: change write() to send() */
- amt=send(ns->fd, pos, len,0);
-#else
- do {
- amt=write(ns->fd, pos, len);
- } while ((amt<0) && (errno==EINTR));
-#endif
+void
+client::send_packet (const char *buf)
+{
+ send_packet (buf, strlen (buf));
+}
- if (amt < 0) { /* We got an error */
-#ifdef WIN32 /* ***win32 Write_To_Socket: change error handling */
- if (amt == -1 && WSAGetLastError() !=WSAEWOULDBLOCK) {
- LOG(llevError,"New socket write failed WTS (%d).\n",WSAGetLastError());
-#else
- if (errno !=EWOULDBLOCK) {
- LOG(llevError,"New socket write failed WTS (%d: %s).\n", /* ---WIN32 */
- errno, strerror(errno));
-#endif
- ns->status=Ns_Dead;
- return;
- }
- else { /* EWOULDBLOCK */
- /* can't write it, so store it away. */
- add_to_buffer(ns, pos, len);
- ns->can_write=0;
- return;
- }
- }
- /* 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
- }
+void
+client::send_packet_printf (const char *format, ...)
+{
+ packet sl;
+
+ va_list ap;
+ va_start (ap, format);
+ sl.vprintf (format, ap);
+ va_end (ap);
+
+ 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")];
+}
-/**
- * Takes a string of data, and writes it out to the socket. A very handy
- * shortcut function.
- */
-void cs_write_string(NewSocket *ns, const char *buf, int len)
+void
+client::send_msg (int color, const char *type, const char *msg)
{
- SockList sl;
-
- sl.len = len;
- sl.buf = (unsigned char*)buf;
- Send_With_Handling(ns, &sl);
+ if (msg_is_special (msg))
+ cfperl_send_msg (this, color, type, msg);
+ else if (can_msg)
+ send_packet_printf ("msg %d %s %s", color, type, msg);
+ else if (color < 0)
+ return; // client cannot handle this
+ else
+ send_packet_printf ("drawinfo %d %s", color, msg);
}
+void
+client::send_drawinfo (const char *msg, int flags)
+{
+ send_msg (flags, "log", msg);
+}
-/**
- * Calls Write_To_Socket to send data to the client.
+/***********************************************************************
*
- * The only difference in this function is that we take a SockList
- *, and we prepend the length information.
- */
-void Send_With_Handling(NewSocket *ns,SockList *msg)
+ * packet functions/utilities
+ *
+ **********************************************************************/
+
+packet::packet (const char *name)
{
- unsigned char sbuf[4];
+ reset ();
- if (ns->status == Ns_Dead || !msg)
- return;
+ 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;
+ }
- if (msg->len >= MAXSOCKBUF) {
- LOG(llevError,"Trying to send a buffer beyond properly size, len =%d\n",
- msg->len);
- /* Almost certainly we've overflowed a buffer, so quite now to make
- * it easier to debug.
- */
- abort();
- }
- sbuf[0] = ((uint32)(msg->len) >> 8) & 0xFF;
- sbuf[1] = ((uint32)(msg->len)) & 0xFF;
- if (ns->status != Ns_Old)
- Write_To_Socket(ns, (char *) sbuf, 2);
- Write_To_Socket(ns, (char*)msg->buf, msg->len);
+ return *this << data (p, buf + maxlen - p);
}
-/**
- * Takes a string of data, and writes it out to the socket. A very handy
- * shortcut function.
- */
-void Write_String_To_Socket(NewSocket *ns, char *buf, int len)
+packet &packet::operator <<(const data &v)
{
- SockList sl;
+ if (room () < v.len)
+ reset ();
+ else
+ {
+ if (v.len)
+ {
+ memcpy (cur, v.ptr, v.len);
+ cur += v.len;
+ }
+ }
- sl.len = len;
- sl.buf = (unsigned char*) buf;
- Send_With_Handling(ns, &sl);
+ return *this;
}
+packet &packet::operator <<(const data8 &v)
+{
+ unsigned int len = min (v.len, 0x00FF);
+ return *this << uint8 (len) << data (v.ptr, len);
+}
-/******************************************************************************
- *
- * statistics logging functions.
- *
- ******************************************************************************/
+packet &packet::operator <<(const data16 &v)
+{
+ unsigned int len = min (v.len, 0xFFFF);
+ return *this << uint16 (len) << data (v.ptr, len);
+}
-#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;
+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)
+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.max_conn=socket_info.nconns;
- cst_lst.time_start=now;
+ if (len >= size)
+ return reset ();
+
+ cur += len;
}
-#endif
+