--- deliantra/server/socket/init.C	2007/04/02 18:54:00	1.42
+++ deliantra/server/socket/init.C	2007/05/28 21:22:26	1.46
@@ -1,25 +1,25 @@
 /*
- * CrossFire, A Multiplayer game for X-windows
+ * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
  * 
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
- * Copyright (C) 2001 Mark Wedel
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2001,2007 Mark Wedel
+ * Copyright (©) 1992,2007 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.
+ * 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 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.
+ * 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 <crossfire@schmorp.de>
+ * You should have received a copy of the GNU General Public License along
+ * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 
 /**
@@ -58,17 +58,16 @@
 client::client (int fd, const char *peername)
 : fd (fd), host (strdup (peername)),
   socket_ev (this, &client::socket_cb),
-  cmd_ev    (this, &client::cmd_cb),
-  cc_inv (this), cc_other (this)
+  cmd_ev    (this, &client::cmd_cb)
 {
   refcnt_inc (); // the socket is an external reference
 
-  mss = 1500 - 66; // 1500 typical ethernet frame, 66 typical tcp header overhead
+  mss = 1500 - 52; // 1500 typical ethernet frame, 66 typical tcp header overhead
 
   {
     struct linger linger_opt;
 
-    linger_opt.l_onoff = 0;
+    linger_opt.l_onoff  = 0;
     linger_opt.l_linger = 0;
 
     if (setsockopt (fd, SOL_SOCKET, SO_LINGER, &linger_opt, sizeof (struct linger)))
@@ -92,13 +91,13 @@
 
     // set some very aggressive keepalive parameters
 #ifdef TCP_KEEPIDLE
-    val = 10;
+    val = 1;
     if (setsockopt (fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof (val)))
       LOG (llevError, "TCP_KEEPIDLE: %s\n", strerror (errno));
 #endif
 
 #ifdef TCP_KEEPCNT
-    val = 5;
+    val = 3;
     if (setsockopt (fd, IPPROTO_TCP, TCP_KEEPCNT, &val, sizeof (val)))
       LOG (llevError, "TCP_KEEPCNT: %s\n", strerror (errno));
 #endif
@@ -223,7 +222,7 @@
   last_path_repelled = 0;
   last_path_denied = 0;
   last_speed = 0;
-  flags = 0;
+  last_flags = 0;
 
   static living zero_living;
   last_stats = zero_living;
@@ -239,7 +238,6 @@
   LOG (llevDebug, "Initialize new client/server data\n");
 }
 
-
 /*******************************************************************************
  *
  * Start of functions dealing with freeing of the data.