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

Comparing deliantra/server/socket/init.C (file contents):
Revision 1.33 by pippijn, Sat Jan 6 14:42:31 2007 UTC vs.
Revision 1.34 by root, Sun Jan 7 02:39:15 2007 UTC

 : fd (fd), host (strdup (peername)),
   socket_ev (this, &client::socket_cb),
   cmd_ev    (this, &client::cmd_cb),
   cc_inv (this), cc_other (this)
 {
+  refcnt_inc (); // the socket is an external reference
   {
     struct linger linger_opt;
     linger_opt.l_onoff = 0;
     linger_opt.l_linger = 0;
   // 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
+  clients.insert (this);
-  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 ()
 {
-  sockvec::iterator i = find (clients.begin (), clients.end (), this);
-  if (i != clients.end ())
-    clients.erase (i);
+  clients.erase (this);
   sfree<uint8> (faces_sent, nrofpixmaps);
   free (stats.range);
   free (stats.title);
   free (host);
   if (pl)
     pl->disconnect ();
   if (fd >= 0)
+    {
+      send_packet ("goodbye");
+      flush ();
-    close (fd);
+      close (fd);
+    }
   state = ST_DEAD;
   socket_ev.suspend ();
   cmd_ev.suspend ();
-  // socket now longer references us
+  refcnt_dec (); // socket no longer open
-  refcnt_dec ();
 }
 /** This sets up the socket and reads all the image information into memory. */
 void
 init_ericserver (void)

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