--- deliantra/server/include/client.h	2007/07/23 21:02:50	1.62
+++ deliantra/server/include/client.h	2008/05/08 20:03:50	1.78
@@ -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,2008 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
@@ -28,6 +28,43 @@
 #include <bitset>
 #include <tr1/unordered_set>
 
+#if HAVE_TCP_INFO
+# include <netinet/tcp.h>
+#else
+  struct tcp_info {
+    // dummy
+    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
+
 // (possibly) max. number of objects "per page" in the ground container
 #define FLOORBOX_PAGESIZE 50
 
@@ -87,6 +124,15 @@
   PF_COMMAND6 = 0x08, // command starts at offset 6
 };
 
+// face type.s bit 0 means "has meta info prepended"
+enum {
+  FT_FACE  = 0 * 2 + 0, // faces (images)
+  FT_MUSIC = 1 * 2 + 1, // background music
+  FT_SOUND = 2 * 2 + 1, // effects
+  FT_RSRC  = 3 * 2 + 0, // generic data files
+  FT_NUM,
+};
+
 struct packet_type
 {
   const char *name;
@@ -100,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. */
@@ -191,14 +232,19 @@
 
   tstamp ACC (RW, last_send);             // last data send on socket.
 
-  int ACC (RW, rtt), ACC (RW, rttvar);    /* round-trip time and -variance, if known */
-  int ACC (RW, outq);                     // current socket outq length, or 0 if indeterminable
-
   int ACC (RW, rate_avail);               // current rate balance
   int ACC (RW, max_rate);                 // max. # of bytes to send per tick
   faceidx ACC (RW, scrub_idx);            // which face to send next
   int ACC (RW, bg_scrub);                 // how many ticks till the next background face send
 
+  struct tcp_info tcpi;
+  tstamp next_rate_adjust;
+
+  unordered_vector<char *> mapinfo_queue;
+  void mapinfo_queue_clear ();
+  void mapinfo_queue_run ();
+  bool mapinfo_try (char *buf);
+
   struct ixsend {
     int16_t pri; // unused
     faceidx idx;
@@ -212,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;
 
@@ -221,6 +266,7 @@
   struct Map lastmap;
   std::bitset<MAXANIMNUM> anims_sent;
   std::bitset<MAX_FACES> faces_sent;
+  std::bitset<FT_NUM> fx_want;
 
   // if we get an incomplete packet, this is used to hold the data.
   // we add 2 byte for the header, one for the trailing 0 byte
@@ -263,21 +309,13 @@
 
   void send_drawinfo (const char *msg, int flags = NDI_BLACK);
 
-  MTH bool must_send_face (faceidx facenum)
-  {
-    if (faces_sent[facenum])
-      return false;
-
-    faces_sent[facenum] = true;
-    return true;
-  }
-
-  MTH void send_face (faceidx facenum);
+  MTH void send_face (faceidx facenum, int pri = 0);
   MTH void send_image (faceidx facenum);
   MTH void send_faces (object *ob);
   MTH void send_animation (short anim_num);
   void send_msg (int color, const char *type, const char *msg);
 
+  MTH void play_sound (faceidx sound, int dx = 0, int dy = 0);
   // called when something under the player changes
   MTH void floorbox_update () { update_look = 1; }
   // called when the player has been moved
@@ -286,12 +324,46 @@
   MTH void tick (); // called every server tick to do housekeeping etc.
 
   MTH static client *create (int fd, const char *peername);
+  MTH static void clock ();
+  MTH static void flush_sockets ();
 
 protected:
   client (int fd, const char *from_ip);
   ~client ();
 };
 
+#if FOR_PERL
+  ACC (RW, tcpi.tcpi_state);
+  ACC (RW, tcpi.tcpi_ca_state);
+  ACC (RW, tcpi.tcpi_retransmits);
+  ACC (RW, tcpi.tcpi_probes);
+  ACC (RW, tcpi.tcpi_backoff);
+  ACC (RW, tcpi.tcpi_options);
+  ACC (RO, tcpi.tcpi_snd_wscale);
+  ACC (RO, tcpi.tcpi_rcv_wscale);
+  ACC (RW, tcpi.tcpi_rto);
+  ACC (RW, tcpi.tcpi_ato);
+  ACC (RW, tcpi.tcpi_snd_mss);
+  ACC (RW, tcpi.tcpi_rcv_mss);
+  ACC (RW, tcpi.tcpi_unacked);
+  ACC (RW, tcpi.tcpi_sacked);
+  ACC (RW, tcpi.tcpi_lost);
+  ACC (RW, tcpi.tcpi_retrans);
+  ACC (RW, tcpi.tcpi_fackets);
+  ACC (RW, tcpi.tcpi_last_data_sent);
+  ACC (RW, tcpi.tcpi_last_ack_sent);
+  ACC (RW, tcpi.tcpi_last_data_recv);
+  ACC (RW, tcpi.tcpi_last_ack_recv);
+  ACC (RW, tcpi.tcpi_pmtu);
+  ACC (RW, tcpi.tcpi_rcv_ssthresh);
+  ACC (RW, tcpi.tcpi_rtt);
+  ACC (RW, tcpi.tcpi_rttvar);
+  ACC (RW, tcpi.tcpi_snd_ssthresh);
+  ACC (RW, tcpi.tcpi_snd_cwnd);
+  ACC (RW, tcpi.tcpi_advmss);
+  ACC (RW, tcpi.tcpi_reordering);
+#endif
+
 #define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\
         ( ((__type)>0) &&\
           ((__sockPtr)->has_readable_type) && \
@@ -329,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;
 
@@ -339,5 +411,12 @@
   for (int _i = 0; _i < clients.size (); ++_i)  \
     statementvar (client *, var, clients [_i])
 
+// returns true when the message needs special (read: perl) treatment
+static inline bool
+msg_is_special (const char *msg, bool nl_special = true)
+{   
+  return msg [strcspn (msg, nl_special ? "<[&\n" : "<[&")];
+}
+
 #endif