--- deliantra/server/socket/loop.C	2009/03/18 11:09:14	1.79
+++ deliantra/server/socket/loop.C	2009/11/03 23:44:21	1.83
@@ -1,22 +1,21 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * 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
+ * Copyright (©) 2005,2006,2007,2008,2009 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 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 <http://www.gnu.org/licenses/>.
+ * 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
+ * <http://www.gnu.org/licenses/>.
  * 
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
@@ -51,9 +50,6 @@
 #define MAX_QUEUE_DEPTH   50
 #define MAX_QUEUE_BACKLOG 3.
 
-// disconnect a socket after this many seconds without an ack
-#define SOCKET_TIMEOUT 16.
-
 void
 client::reset_state ()
 {
@@ -168,10 +164,10 @@
                tcpi.tcpi_snd_cwnd - (tcpi.tcpi_unacked - tcpi.tcpi_sacked));
 #endif
 
-      // fast-time-out a player by checking for missign acks
+      // fast-time-out a player by checking for missing acks
       // do this only when player is active
       if (pl && pl->active
-          && tcpi.tcpi_last_ack_recv > int (SOCKET_TIMEOUT * 1000))
+          && tcpi.tcpi_last_ack_recv > int (socket_timeout * 1000))
         {
           send_msg (NDI_RED | NDI_REPLY, "connection-timeout", "safety disconnect due to tcp/ip timeout (no packets received)");
           write_outputbuffer ();