--- deliantra/server/socket/loop.C 2007/07/31 20:10:31 1.67
+++ deliantra/server/socket/loop.C 2009/03/18 11:09:14 1.79
@@ -1,11 +1,11 @@
/*
- * 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 (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
* Copyright (©) 2002-2003,2007 Mark Wedel & The Crossfire Development Team
* Copyright (©) 1992,2007 Frank Tore Johansen
*
- * Crossfire TRT is free software: you can redistribute it and/or modify
+ * Deliantra 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.
@@ -18,7 +18,7 @@
* 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
+ * The authors can be reached via e-mail to
*/
/**
@@ -52,7 +52,7 @@
#define MAX_QUEUE_BACKLOG 3.
// disconnect a socket after this many seconds without an ack
-#define SOCKET_TIMEOUT 8.
+#define SOCKET_TIMEOUT 16.
void
client::reset_state ()
@@ -77,7 +77,7 @@
}
else
{
- cmd_queue.push_back (command ());
+ cmd_queue.resize (cmd_queue.size () + 1);
command &cmd = cmd_queue.back ();
cmd.stamp = stamp;
cmd.handler = handler;
@@ -97,12 +97,21 @@
if (cmd.stamp + MAX_QUEUE_BACKLOG < NOW)
{
- reset_state ();
- send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED);
+ reset_state (); // the command might actually reset some movement state etc.
+
+ if (pl)
+ pl->failmsg (
+ "Cannot keep up with your commands, ignoring them! "
+ "H. "
+ "Try issuing commands slower, or, if G is incapacitated (paralyzed and so on), "
+ "wait till your character can act again.\n\nIf G is permanently stuck, then "
+ "try the B command (or use B to ask somebody to B you out).>"
+ );
}
else
execute (cmd.handler, cmd.data, cmd.datalen);
+ sfree (cmd.data, cmd.datalen + 1);
cmd_queue.pop_front ();
return true;
}
@@ -116,17 +125,19 @@
if (!pl || destroyed ())
return;
+ pl->dirty = true;
+
/* Update the players stats once per tick. More efficient than
* sending them whenever they change, and probably just as useful
*/
esrv_update_stats (pl);
- if (last_weight != -1 && last_weight != WEIGHT (pl->ob))
+ sint32 weight = pl->ob->client_weight ();
+
+ if (last_weight != weight)
{
+ pl->ob->update_stats ();
esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
- if (last_weight != WEIGHT (pl->ob))
- LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n",
- (unsigned long) last_weight, WEIGHT (pl->ob));
}
draw_client_map (pl);
@@ -134,6 +145,8 @@
if (update_look)
esrv_draw_look (pl);
+ mapinfo_queue_run ();
+
#if HAVE_TCP_INFO
// check time of last ack, and, if too old, kill connection
socklen_t len = sizeof (tcpi);
@@ -155,6 +168,7 @@
tcpi.tcpi_snd_cwnd - (tcpi.tcpi_unacked - tcpi.tcpi_sacked));
#endif
+ // fast-time-out a player by checking for missign acks
// do this only when player is active
if (pl && pl->active
&& tcpi.tcpi_last_ack_recv > int (SOCKET_TIMEOUT * 1000))
@@ -178,13 +192,13 @@
max_send = min (max_send, (tcpi.tcpi_snd_cwnd - tcpi.tcpi_unacked + tcpi.tcpi_sacked) * mss);
#endif
- // if we can split images, round to next-lowest mss
- if (fxix) max_send -= max_send % mss;
+ // round to next-lowest mss
+ max_send -= max_send % mss;
if (ixface.empty ())
{
// regularly send a new face when queue is empty
- if (bg_scrub && !--bg_scrub && enable_bg_scrub)
+ if (bg_scrub && !--bg_scrub)
while (scrub_idx < faces.size () - 1)
{
++scrub_idx;
@@ -216,36 +230,28 @@
if (facedata *d = face_data (ix.idx, faceset))
{
- if (fxix)
- {
- // estimate the packet header overhead "ix " + idx + (new)ofs
- int pktlen = 3 + ber32::encoded_size (ix.idx) + ber32::encoded_size (ix.ofs);
- int chunk = min (avail - packet::hdrlen, MAXSOCKBUF) - pktlen;
-
- // only transfer something if the amount of data transferred
- // has a healthy relation to the header overhead
- if (chunk < 64)
- break;
+ // estimate the packet header overhead "ix " + idx + (new)ofs
+ int pktlen = 3 + ber32::encoded_size (ix.idx) + ber32::encoded_size (ix.ofs);
+ int chunk = min (avail - packet::hdrlen, MAXSOCKBUF) - pktlen;
+
+ // only transfer something if the amount of data transferred
+ // has a healthy relation to the header overhead
+ if (chunk < 64)
+ break;
- chunk = min (chunk, (int)ix.ofs);
+ chunk = min (chunk, (int)ix.ofs);
- ix.ofs -= chunk;
+ ix.ofs -= chunk;
- //fprintf (stderr, "i%dx %6d: %5d+%4d (%4d)\n", fxix, ix.idx,ix.ofs,chunk, ixface.size());//D
+ //fprintf (stderr, "i%dx %6d: %5d+%4d (%4d)\n", fxix, ix.idx,ix.ofs,chunk, ixface.size());//D
- packet sl ("ix");
+ packet sl ("ix");
- sl << ber32 (ix.idx)
- << ber32 (ix.ofs)
- << data (d->data.data () + ix.ofs, chunk);
+ sl << ber32 (ix.idx)
+ << ber32 (ix.ofs)
+ << data (d->data.data () + ix.ofs, chunk);
- send_packet (sl);
- }
- else
- {
- send_image (ix.idx);
- ix.ofs = 0;
- }
+ send_packet (sl);
}
else
ix.ofs = 0;