--- deliantra/server/socket/init.C	2007/11/08 19:43:29	1.53
+++ deliantra/server/socket/init.C	2009/10/12 14:00:59	1.62
@@ -1,22 +1,23 @@
 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2001,2007 Mark Wedel
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * 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>
  */
@@ -68,6 +69,8 @@
 
   mss = 1500 - 52; // 1500 typical ethernet frame, 66 typical tcp header overhead
 
+  socket_timeout = 16.;
+
   {
     struct linger linger_opt;
 
@@ -132,28 +135,11 @@
 #endif
   }
 
-  {
-    int bufsize = 65535;          /*Supposed absolute upper limit */
-    int oldbufsize;
-    int buflen = sizeof (int);
-
-    if (fcntl (fd, F_SETFL, O_NONBLOCK) == -1)
-      LOG (llevError, "InitConnection:  Error on fcntl.\n");
-
-    if (getsockopt (fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen) == -1)
-      oldbufsize = 0;
-
-    if (oldbufsize < bufsize)
-      if (setsockopt (fd, SOL_SOCKET, SO_SNDBUF, (char *) &bufsize, sizeof (&bufsize)))
-        LOG (llevError, "InitConnection: setsockopt unable to set output buf size to %d\n", bufsize);
-
-    buflen = sizeof (oldbufsize);
-    getsockopt (fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen);
-  }
+  if (fcntl (fd, F_SETFL, O_NONBLOCK) == -1)
+    LOG (llevError, "InitConnection:  Error on fcntl.\n");
 
   state = ST_SETUP;
-  mapmode = Map0Cmd;
-  darkness = 1;
+  mapmode = Map1aCmd;
   mapx = 11;
   mapy = 11;
   itemcmd = 1;              /* Default is version item1 command */
@@ -166,9 +152,9 @@
   faces_sent[0] = true;
   fx_want [FT_FACE] = true; // all clients must support image faces
 
-  socket_ev.prio (PE_PRIO_HIGH);
-  socket_ev.fd (fd);
-  socket_ev.poll (PE_R);
+  socket_ev.set (fd, EV_READ);
+  socket_ev.prio (2); // one higher than the ticker priority
+  socket_ev.start ();
 
   // initialisation done, kick it!
   send_packet_printf ("version %d %d %s\n", VERSION_CS, VERSION_SC, VERSION_INFO);
@@ -207,7 +193,7 @@
 
   state = ST_DEAD;
 
-  socket_ev.suspend ();
+  socket_ev.stop ();
 
   refcnt_dec (); // socket no longer open
 }
@@ -229,9 +215,8 @@
   last_weapon_sp = -1;
   last_level = -1;
   last_stats.exp = -1;
-  last_weight = (uint32) - 1;
   last_flags = 0;
-  last_weight = 0;
+  last_weight = -1;
   last_weight_limit = 0;
   last_path_attuned = 0;
   last_path_repelled = 0;