[ViewVC] Diff of: cvs/deliantra/server/include/client.h

Comparing deliantra/server/include/client.h (file contents):
Revision 1.63 by root, Tue Jul 24 04:55:34 2007 UTC vs.
Revision 1.82 by root, Tue Dec 23 22:03:06 2008 UTC

 /*
- * 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.
  *
  * This program is distributed in the hope that it will be useful,
  * GNU General Public License for more details.
  *
  * 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
 #define CLIENT_H
 #include <deque>
 #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
 struct MapCell
 {
-  tag_t player;                 // this is, unfortunately, very wasteful of memory space, but pretty bandwidth-efficient
+  tag_t player;                // this is, unfortunately, very wasteful of memory space, but pretty bandwidth-efficient
   int count;                   /* This is really darkness in the map1 command */
   faceidx faces[MAP_LAYERS];
   unsigned char stat_hp;       // health of something in this space, or 0
   unsigned char flags;
   uint8_t smooth[MAP_LAYERS];
 {
   tstamp stamp;
   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. */
 #define MAX_PASSWORD_FAILURES 5
   int ACC (RW, fd);
   unsigned int inbuf_len;                 // number of bytes valid in inbuf
   statsinfo stats;
   object_vector_index ACC (RO, active);
   player_ptr ACC (RO, pl);
-  /* The following is the setup for a ring buffer for storing output
-   * data that the OS can't handle right away.
-   */
-  struct
-  {
-    char data[SOCKETBUFSIZE];
-    int start;
-    int len;
-  } outputbuffer;
   char *ACC (RW, host);                   /* Which host it is connected from (ip address) */
   uint8 ACC (RW, state);                  /* Input state of the player (name, password, etc */
   sint8 ACC (RW, last_level);             /* Last level we sent to client */
   uint16 ACC (RW, mss);                   // likely tcp maximum segment size
   uint8 ACC (RW, mapmode);                /* Type of map commands the client wants. */
   uint8 ACC (RW, mapx), ACC (RW, mapy);             /* How large a map the client wants */
   uint8 ACC (RW, itemcmd);                /* What version of the 'item' protocol command to use */
-  maptile *ACC (RW, current_map);         // CF+ last/current player map
+  maptile_ptr ACC (RW, current_map);      // CF+ last/current player map
-  region *ACC (RW, current_region);       // CF+ last/current player region
+  region_ptr ACC (RW, current_region);    // CF+ last/current player region
   int ACC (RW, current_x), ACC (RW, current_y);     // CF+ last/current map position
   shstr ACC (RW, version);                // CF+ client name/version
   uint8 ACC (RW, faceset);                // CF+ selected faceset
   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;
     uint32_t ofs;  // if != 0, need to send remaining bytes of partial_face
   MTH void flush_fx (); // send fx if required
   void do_destroy ();
   void gather_callbacks (AV *&callbacks, event_type event) const;
-  iow socket_ev; void socket_cb (iow &w, int got);
+  iow socket_ev; void socket_cb (iow &w, int revents);
-  iw  cmd_ev;    void cmd_cb (iw &w);
   std::deque< command, slice_allocator<command> > cmd_queue;
   // large structures at the end please
   struct Map lastmap;
     char msg[MSG_BUF_SIZE];
   } msgbuf[MSG_BUF_COUNT];
   MTH bool msg_suppressed (const char *msg);
+  /* The following is the setup for a ring buffer for storing output
+   * data that the OS can't handle right away.
+   * TODO: this member is enourmously large - optimise?
+   */
+  struct
+  {
+    char data[SOCKETBUFSIZE];
+    int start;
+    int len;
+  } outputbuffer;
   bool may_execute (const packet_type *pkt) const;
   void execute (const packet_type *pkt, char *data, int datalen);
   void queue_command (packet_type *handler, char *data, int datalen);
   MTH bool handle_command ();
   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
   MTH void floorbox_reset  () { look_position = 0; floorbox_update (); }
   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) && \
           ((__sockPtr)->supported_readables & (1<<(__type))) )
 #define PNG_FACE_INDEX	0
 #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;
 extern sockvec clients;
 #define for_all_clients(var)                    \
   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

Diff Legend

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

Comparing deliantra/server/include/client.h (file contents): Revision 1.63 by root, Tue Jul 24 04:55:34 2007 UTC vs. Revision 1.82 by root, Tue Dec 23 22:03:06 2008 UTC

Diff Legend

Comparing deliantra/server/include/client.h (file contents):
Revision 1.63 by root, Tue Jul 24 04:55:34 2007 UTC vs.
Revision 1.82 by root, Tue Dec 23 22:03:06 2008 UTC