--- deliantra/server/socket/init.C	2007/11/08 19:43:29	1.53
+++ deliantra/server/socket/init.C	2007/11/14 10:12:45	1.55
@@ -132,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;
@@ -166,9 +150,8 @@
   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.start ();
 
   // initialisation done, kick it!
   send_packet_printf ("version %d %d %s\n", VERSION_CS, VERSION_SC, VERSION_INFO);
@@ -207,7 +190,7 @@
 
   state = ST_DEAD;
 
-  socket_ev.suspend ();
+  socket_ev.stop ();
 
   refcnt_dec (); // socket no longer open
 }