--- deliantra/server/socket/init.C	2006/12/17 00:25:44	1.23
+++ deliantra/server/socket/init.C	2007/01/06 14:42:31	1.33
@@ -1,6 +1,7 @@
 /*
     CrossFire, A Multiplayer game for X-windows
 
+    Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
     Copyright (C) 2001 Mark Wedel
     Copyright (C) 1992 Frank Tore Johansen
 
@@ -32,7 +33,6 @@
  * The reading of data is handled in ericserver.c
  */
 
-
 #include <global.h>
 #include <sproto.h>
 #include <sys/types.h>
@@ -46,6 +46,8 @@
 #include <unistd.h>
 #include <arpa/inet.h>
 
+#include <algorithm>
+
 sockvec clients;
 
 /**
@@ -56,7 +58,8 @@
 client::client (int fd, const char *peername)
 : fd (fd), host (strdup (peername)),
   socket_ev (this, &client::socket_cb),
-  cmd_ev    (this, &client::cmd_cb)
+  cmd_ev    (this, &client::cmd_cb),
+  cc_inv (this), cc_other (this)
 {
   {
     struct linger linger_opt;
@@ -120,14 +123,14 @@
     getsockopt (fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen);
   }
 
+  state = ST_SETUP;
   mapmode = Map0Cmd;
   darkness = 1;
-  status = Ns_Add;
   mapx = 11;
   mapy = 11;
   itemcmd = 1;              /* Default is version item1 command */
 
-  faces_sent = salloc<uint8> (nrofpixmaps, 0);
+  faces_sent = salloc0<uint8> (nrofpixmaps);
 
   /* 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
@@ -149,6 +152,10 @@
   send_packet_printf ("version %d %d %s\n", VERSION_CS, VERSION_SC, VERSION_INFO);
   flush ();
 
+  // clients are externally referenced by the socket
+  refcnt_inc ();
+  clients.push_back (this);
+
 #if 0//TODO
   socket_info.nconns++;
   if (socket_info.nconns > cst_tot.max_conn) cst_tot.max_conn = socket_info.nconns;
@@ -158,24 +165,34 @@
 
 client::~client ()
 {
-  if (pl)
-    pl->socket = 0;
+  sockvec::iterator i = find (clients.begin (), clients.end (), this);
+  if (i != clients.end ())
+    clients.erase (i);
 
-  if (fd >= 0)
-    close (fd);
-
-  free (faces_sent);
+  sfree<uint8> (faces_sent, nrofpixmaps);
   free (stats.range);
   free (stats.title);
   free (host);
 }
 
 void
-client::destroy ()
+client::do_destroy ()
 {
-  status = Ns_Dead;
+  attachable::do_destroy ();
+
+  if (pl)
+    pl->disconnect ();
+
+  if (fd >= 0)
+    close (fd);
+
+  state = ST_DEAD;
+
   socket_ev.suspend ();
   cmd_ev.suspend ();
+
+  // socket now longer references us
+  refcnt_dec ();
 }
 
 /** This sets up the socket and reads all the image information into memory. */
@@ -205,26 +222,23 @@
   free_socket_images ();
 }
 
-/** Sends the 'goodbye' command to the player, and closes connection. */
-void
-final_free_player (player *pl)
-{
-  free_player (pl);
-}
-
-bool
-add_client (int fd, const char *peername)
+client *
+client::create (int fd, const char *peername)
 {
   if (checkbanned (NULL, peername))
     {
       LOG (llevInfo, "Banned host tried to connect: [%s]\n", peername);
-      return false;
+      return 0;
     }
   else
     {
       client *ns = new client (dup (fd), peername);
-      clients.push_back (ns);
-      return true;
+
+      ns->instantiate (); // effectively a nop right now
+
+      INVOKE_CLIENT (CONNECT, ns);
+
+      return ns;
     }
 }