--- deliantra/server/socket/init.C	2006/12/14 04:30:33	1.16
+++ deliantra/server/socket/init.C	2006/12/16 21:40:26	1.22
@@ -41,24 +41,20 @@
 #include <netinet/in.h>
 #include <netdb.h>
 
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif
-
-#ifdef HAVE_ARPA_INET_H
-# include <arpa/inet.h>
-#endif
-#include <newserver.h>
+#include <unistd.h>
+#include <arpa/inet.h>
 
-sockvec client_sockets;
+sockvec clients;
 
 /**
  * Initializes a connection. Really, it just sets up the data structure,
  * socket setup is handled elsewhere.  We do send a version to the
  * client.
  */
-client_socket::client_socket (int fd, const char *peername)
-: fd (fd), host (strdup (peername))
+client::client (int fd, const char *peername)
+: fd (fd), host (strdup (peername)),
+  socket_ev (this, &client::socket_cb),
+  cmd_ev    (this, &client::cmd_cb)
 {
   {
     struct linger linger_opt;
@@ -96,10 +92,7 @@
   mapy = 11;
   itemcmd = 1;              /* Default is version item1 command */
 
-  faces_sent_len = nrofpixmaps;
-  faces_sent = (uint8 *)calloc (nrofpixmaps, sizeof (*faces_sent));
-  if (!faces_sent)
-    fatal (OUT_OF_MEMORY);
+  faces_sent = salloc<uint8> (nrofpixmaps, 0);
 
   /* Do this so we don't send a face command for the client for
    * this face.  Face 0 is sent to the client to say clear
@@ -107,15 +100,19 @@
    */
   faces_sent[0] = NS_FACESENT_FACE;
 
-  can_write = 1;
+  // socket I/O is low priority
+  // we prefer to have the server run instead of handling client requests
+  socket_ev.prio (PE_PRIO_NORMAL + 1);
+  socket_ev.fd (fd);
+  socket_ev.poll (PE_R);
+
+  // command handling is even lower priority
+  // that way no client can monopolise the server
+  cmd_ev.prio (PE_PRIO_NORMAL + 2);
 
   // initialisation done, kick it!
-
-  {
-    packet sl;
-    sl.printf ("version %d %d %s\n", VERSION_CS, VERSION_SC, VERSION_INFO);
-    send_packet (sl);
-  }
+  send_packet_printf ("version %d %d %s\n", VERSION_CS, VERSION_SC, VERSION_INFO);
+  flush ();
 
 #if 0//TODO
   socket_info.nconns++;
@@ -124,20 +121,32 @@
 #endif
 }
 
-client_socket::~client_socket ()
+client::~client ()
+{
+  if (pl)
+    pl->socket = 0;
+
+  if (fd >= 0)
+    close (fd);
+
+  free (faces_sent);
+  free (stats.range);
+  free (stats.title);
+  free (host);
+}
+
+void
+client::destroy ()
 {
   status = Ns_Dead;
+  socket_ev.suspend ();
+  cmd_ev.suspend ();
 }
 
 /** This sets up the socket and reads all the image information into memory. */
 void
 init_ericserver (void)
 {
-  struct sockaddr_in insock;
-  struct linger linger_opt;
-
-  memset (&cst_tot, 0, sizeof (CS_Stats));
-  memset (&cst_lst, 0, sizeof (CS_Stats));
   cst_tot.time_start = time (NULL);
   cst_lst.time_start = time (NULL);
 
@@ -161,44 +170,15 @@
   free_socket_images ();
 }
 
-/**
- * Frees a socket.
- * Basically, all we need to do here is free all data structures that
- * might be associated with the socket.  It is up to the caller to
- * update the list
- */
-
-void
-free_newsocket (client_socket *ns)
-{
-  if (ns->fd >= 0)
-    close (ns->fd);
-
-  if (ns->stats.range)
-    free (ns->stats.range);
-
-  if (ns->stats.title)
-    free (ns->stats.title);
-
-  free (ns->host);
-
-  ns->fd = -1;
-  ns->stats.range = 0;
-  ns->stats.title = 0;
-  ns->host = 0;
-}
-
 /** Sends the 'goodbye' command to the player, and closes connection. */
 void
 final_free_player (player *pl)
 {
-  pl->socket->send_packet ("goodbye");
-  free_newsocket (pl->socket);
   free_player (pl);
 }
 
 bool
-add_client_socket (int fd, const char *peername)
+add_client (int fd, const char *peername)
 {
   if (checkbanned (NULL, peername))
     {
@@ -207,8 +187,8 @@
     }
   else
     {
-      client_socket *ns = new client_socket (dup (fd), peername);
-      client_sockets.push_back (ns);
+      client *ns = new client (dup (fd), peername);
+      clients.push_back (ns);
       return true;
     }
 }