--- deliantra/server/include/client.h	2007/08/24 00:26:10	1.67
+++ deliantra/server/include/client.h	2008/04/22 07:28:05	1.76
@@ -1,11 +1,11 @@
 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  * 
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  * 
- * Crossfire TRT is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -18,7 +18,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  * 
- * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 
 #ifndef CLIENT_H
@@ -31,37 +31,37 @@
 #if HAVE_TCP_INFO
 # include <netinet/tcp.h>
 #else
-  struct tcpi_info {
+  struct tcp_info {
     // dummy
-    char tcpi_state;
-    char tcpi_ca_state;
-    char tcpi_retransmits;
-    char tcpi_probes;
-    char tcpi_backoff;
-    char tcpi_options;
-    char tcpi_snd_wscale;
-    char tcpi_rcv_wscale;
-    char tcpi_rto;
-    char tcpi_ato;
-    char tcpi_snd_mss;
-    char tcpi_rcv_mss;
-    char tcpi_unacked;
-    char tcpi_sacked;
-    char tcpi_lost;
-    char tcpi_retrans;
-    char tcpi_fackets;
-    char tcpi_last_data_sent;
-    char tcpi_last_ack_sent;
-    char tcpi_last_data_recv;
-    char tcpi_last_ack_recv;
-    char tcpi_pmtu;
-    char tcpi_rcv_ssthresh;
-    char tcpi_rtt;
-    char tcpi_rttvar;
-    char tcpi_snd_ssthresh;
-    char tcpi_snd_cwnd;
-    char tcpi_advmss;
-    char tcpi_reordering;
+    int tcpi_state;
+    int tcpi_ca_state;
+    int tcpi_retransmits;
+    int tcpi_probes;
+    int tcpi_backoff;
+    int tcpi_options;
+    int tcpi_snd_wscale;
+    int tcpi_rcv_wscale;
+    int tcpi_rto;
+    int tcpi_ato;
+    int tcpi_snd_mss;
+    int tcpi_rcv_mss;
+    int tcpi_unacked;
+    int tcpi_sacked;
+    int tcpi_lost;
+    int tcpi_retrans;
+    int tcpi_fackets;
+    int tcpi_last_data_sent;
+    int tcpi_last_ack_sent;
+    int tcpi_last_data_recv;
+    int tcpi_last_ack_recv;
+    int tcpi_pmtu;
+    int tcpi_rcv_ssthresh;
+    int tcpi_rtt;
+    int tcpi_rttvar;
+    int tcpi_snd_ssthresh;
+    int tcpi_snd_cwnd;
+    int tcpi_advmss;
+    int tcpi_reordering;
   };
 #endif
 
@@ -146,11 +146,6 @@
   const packet_type *handler;
   char *data;
   int datalen;
-
-  ~command ()
-  {
-    sfree<char> (data, datalen + 1);
-  }
 };
 
 /* how many times we are allowed to give the wrong password before being kicked. */
@@ -263,8 +258,7 @@
   void do_destroy ();
   void gather_callbacks (AV *&callbacks, event_type event) const;
 
-  iow socket_ev; void socket_cb (iow &w, int got);
-  iw  cmd_ev;    void cmd_cb (iw &w);
+  iow socket_ev; void socket_cb (iow &w, int revents);
 
   std::deque< command, slice_allocator<command> > cmd_queue;
 
@@ -407,7 +401,7 @@
 #define VERSION_CS 1023        /* version >= 1023 understand setup cmd */
 #define VERSION_SC 1026
 //#define VERSION_SC 1027 // requestinfo image_info and image_sums, makes extending faces on the fly impossible
-#define VERSION_INFO "Crossfire TRT Server"
+#define VERSION_INFO "Deliantra Server"
 
 typedef object_vector<client, &client::active> sockvec;