--- deliantra/server/socket/init.C	2007/07/24 04:55:35	1.50
+++ deliantra/server/socket/init.C	2007/11/14 10:12:45	1.55
@@ -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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2001,2007 Mark Wedel
  * 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 <http://www.gnu.org/licenses/>.
  * 
- * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
 /**
@@ -62,8 +62,7 @@
  */
 client::client (int fd, const char *peername)
 : fd (fd), host (strdup (peername)),
-  socket_ev (this, &client::socket_cb),
-  cmd_ev    (this, &client::cmd_cb)
+  socket_ev (this, &client::socket_cb)
 {
   refcnt_inc (); // the socket is an external reference
 
@@ -133,24 +132,8 @@
 #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;
@@ -167,11 +150,8 @@
   faces_sent[0] = true;
   fx_want [FT_FACE] = true; // all clients must support image faces
 
-  socket_ev.prio (PE_PRIO_NORMAL);
-  socket_ev.fd (fd);
-  socket_ev.poll (PE_R);
-
-  cmd_ev.prio (PE_PRIO_NORMAL);
+  socket_ev.set (fd, EV_READ);
+  socket_ev.start ();
 
   // initialisation done, kick it!
   send_packet_printf ("version %d %d %s\n", VERSION_CS, VERSION_SC, VERSION_INFO);
@@ -186,6 +166,7 @@
 {
   clients.erase (this);
 
+  mapinfo_queue_clear ();
   free (stats.range);
   free (stats.title);
   free (host);
@@ -209,8 +190,7 @@
 
   state = ST_DEAD;
 
-  socket_ev.suspend ();
-  cmd_ev.suspend ();
+  socket_ev.stop ();
 
   refcnt_dec (); // socket no longer open
 }