[ViewVC] Diff of: cvs/deliantra/server/socket/init.C

Comparing deliantra/server/socket/init.C (file contents):
Revision 1.27 by root, Thu Dec 21 06:12:37 2006 UTC vs.
Revision 1.31 by root, Mon Dec 25 11:25:50 2006 UTC

 #include <netinet/ip.h>
 #include <netdb.h>
 #include <unistd.h>
 #include <arpa/inet.h>
+#include <algorithm>
 sockvec clients;
 /**
  * Initializes a connection. Really, it just sets up the data structure,
     buflen = sizeof (oldbufsize);
     getsockopt (fd, SOL_SOCKET, SO_SNDBUF, (char *) &oldbufsize, (socklen_t *) & buflen);
   }
+  state = ST_SETUP;
   mapmode = Map0Cmd;
   darkness = 1;
   mapx = 11;
   mapy = 11;
   itemcmd = 1;              /* Default is version item1 command */
   // initialisation done, kick it!
   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;
   if (socket_info.nconns > cst_lst.max_conn) cst_lst.max_conn = socket_info.nconns;
 #endif
 }
 client::~client ()
 {
-  if (pl)
-    pl->socket = 0;
-  if (fd >= 0)
-    close (fd);
   sfree<uint8> (faces_sent, nrofpixmaps);
   free (stats.range);
   free (stats.title);
   free (host);
 }
 void
-client::destroy ()
+client::do_destroy ()
 {
-  destroyed = true;
+  attachable::do_destroy ();
+  sockvec::iterator i = find (clients.begin (), clients.end (), this);
+  if (i != clients.end ())
+    clients.erase (i);
+  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. */
 void
 init_ericserver (void)
 void
 free_all_newserver (void)
 {
   LOG (llevDebug, "Freeing all new client/server information.\n");
   free_socket_images ();
-}
-/** Sends the 'goodbye' command to the player, and closes connection. */
-void
-final_free_player (player *pl)
-{
-  free_player (pl);
 }
 client *
 client::create (int fd, const char *peername)
 {
       return 0;
     }
   else
     {
       client *ns = new client (dup (fd), peername);
-      clients.push_back (ns);
       ns->instantiate (); // effectively a nop right now
       INVOKE_CLIENT (CONNECT, ns);

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/socket/init.C (file contents): Revision 1.27 by root, Thu Dec 21 06:12:37 2006 UTC vs. Revision 1.31 by root, Mon Dec 25 11:25:50 2006 UTC

Diff Legend

Comparing deliantra/server/socket/init.C (file contents):
Revision 1.27 by root, Thu Dec 21 06:12:37 2006 UTC vs.
Revision 1.31 by root, Mon Dec 25 11:25:50 2006 UTC