--- deliantra/server/socket/lowlevel.C 2007/07/28 00:15:03 1.51
+++ deliantra/server/socket/lowlevel.C 2010/04/30 20:43:18 1.78
@@ -1,23 +1,23 @@
/*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
*
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
*
- * 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.
+ * 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 .
+ * 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
+ * The authors can be reached via e-mail to
*/
using namespace std;
@@ -33,9 +33,6 @@
# include
#endif
-// disconnect a socket after this many seconds without an ack
-#define SOCKET_TIMEOUT 8.
-
// force a packet when idle for more than this many seconds,
// forcing an ack regularly.
#define IDLE_PING 2.
@@ -46,35 +43,6 @@
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 (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.
*
@@ -96,7 +64,7 @@
return;
}
- if (socket_ev.poll () & PE_W)
+ if (socket_ev.poll () & EV_WRITE)
return;
last_send = NOW;
@@ -133,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;
}
@@ -145,7 +113,7 @@
}
}
- socket_ev.poll (socket_ev.poll () & ~PE_W);
+ socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
}
/******************************************************************************
@@ -166,7 +134,7 @@
if (inbuf_len == sizeof (inbuf))
{
- send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED);
+ send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED | NDI_REPLY);
destroy ();
return -1;
}
@@ -191,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.
*/
@@ -205,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
@@ -250,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;
}
@@ -265,12 +240,15 @@
{
//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);
}
else
- send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED, pkt->name);
+ send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED | NDI_REPLY, pkt->name);
}
bool
@@ -288,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
@@ -309,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))
@@ -321,19 +300,21 @@
}
// 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);
+ 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;
}
// 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 ())
@@ -342,15 +323,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
@@ -359,7 +340,7 @@
if (!amount)
{
// input buffer full
- socket_ev.poll (socket_ev.poll () & ~PE_R);
+ socket_ev.poll (socket_ev.poll () & ~EV_READ);
return;
}
@@ -385,21 +366,17 @@
{
inbuf_len += amount;
- cmd_ev.start ();
+ if (handle_packet ())
+ {
+ while (handle_packet ())
+ ;
+
+ flush ();
+ }
}
}
}
-// called whenever we have additional commands to process
-void
-client::cmd_cb (iw &w)
-{
- if (handle_packet ())
- w.start ();
- else
- flush ();
-}
-
/*******************************************************************************
*
* Start of write related routines.
@@ -463,7 +440,7 @@
if (destroyed ())
return;
- if (sl.length () >= MAXSOCKBUF)
+ 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
@@ -511,24 +488,23 @@
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)
{
- if (msg_is_special (msg))
+ if (!msg || !type) // it can happen (for example, missing attack messages cause this)
+ {
+ LOG (logBacktrace | llevError, "send_msg(%d,%p,%p) called with NULL msg or type.\n", color, type, msg);
+ return;
+ }
+
+ int len = strlen (msg);
+
+ 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, type, msg);
- else if (color < 0)
- return; // client cannot handle this
else
- send_packet_printf ("drawinfo %d %s", color, msg);
+ send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg);
}
void