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

Comparing deliantra/server/include/client.h (file contents):
Revision 1.66 by root, Mon Jul 30 02:03:02 2007 UTC vs.
Revision 1.83 by root, Fri Dec 26 10:44:17 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 <tr1/unordered_set>
 #if HAVE_TCP_INFO
 # include <netinet/tcp.h>
 #else
-  struct tcpi_info {
+  struct tcp_info {
     // dummy
-    char tcpi_state;
+    int tcpi_state;
-    char tcpi_ca_state;
+    int tcpi_ca_state;
-    char tcpi_retransmits;
+    int tcpi_retransmits;
-    char tcpi_probes;
+    int tcpi_probes;
-    char tcpi_backoff;
+    int tcpi_backoff;
-    char tcpi_options;
+    int tcpi_options;
-    char tcpi_snd_wscale;
+    int tcpi_snd_wscale;
-    char tcpi_rcv_wscale;
+    int tcpi_rcv_wscale;
-    char tcpi_rto;
+    int tcpi_rto;
-    char tcpi_ato;
+    int tcpi_ato;
-    char tcpi_snd_mss;
+    int tcpi_snd_mss;
-    char tcpi_rcv_mss;
+    int tcpi_rcv_mss;
-    char tcpi_unacked;
+    int tcpi_unacked;
-    char tcpi_sacked;
+    int tcpi_sacked;
-    char tcpi_lost;
+    int tcpi_lost;
-    char tcpi_retrans;
+    int tcpi_retrans;
-    char tcpi_fackets;
+    int tcpi_fackets;
-    char tcpi_last_data_sent;
+    int tcpi_last_data_sent;
-    char tcpi_last_ack_sent;
+    int tcpi_last_ack_sent;
-    char tcpi_last_data_recv;
+    int tcpi_last_data_recv;
-    char tcpi_last_ack_recv;
+    int tcpi_last_ack_recv;
-    char tcpi_pmtu;
+    int tcpi_pmtu;
-    char tcpi_rcv_ssthresh;
+    int tcpi_rcv_ssthresh;
-    char tcpi_rtt;
+    int tcpi_rtt;
-    char tcpi_rttvar;
+    int tcpi_rttvar;
-    char tcpi_snd_ssthresh;
+    int tcpi_snd_ssthresh;
-    char tcpi_snd_cwnd;
+    int tcpi_snd_cwnd;
-    char tcpi_advmss;
+    int tcpi_advmss;
-    char tcpi_reordering;
+    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 */
   uint8_t ACC (RW, fxix);                 // client implements fx and ix (face|image extended) commands
   bool ACC (RW, update_look);             /* If true, we need to send the look window */
   bool ACC (RW, has_readable_type);       /* If true client accept additional text information */
                                           /* used to arrange text in books, scrolls, or scripted dialogs */
   bool ACC (RW, monitor_spells);          /* Client wishes to be informed when their spell list changes */
-  bool ACC (RW, ext_mapinfos);            /* If true client accepts additional info on maps */
-                                          /* Below are flags for extedend infos to pass to client
-                                           * with S->C mapextended command */
-  bool ACC (RW, EMI_smooth);              /* Send smooth in extendmapinfos */
   bool ACC (RW, smoothing);               // trt-style smoothing
   bool ACC (RW, can_msg);                 // trt-style text messages
   bool ACC (RW, force_newmap);            // force a newmap before next map update
   uint32 ACC (RW, supported_readables);   /* each bit is a readable supported by 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.
   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
+  };
+  std::vector<ixsend, slice_allocator<ixsend> > ixface; // which faces to send to the client using ix
+  std::vector<faceidx, slice_allocator<faceidx> > fxface; // which faces to send using fx
+  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 revents);
+  std::deque< command, slice_allocator<command> > cmd_queue;
+  // large structures at the end please
+  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
+  uint8 inbuf[MAXSOCKBUF + 2 + 1];
+  enum { MSG_BUF_SIZE = 80, MSG_BUF_COUNT = 10 };
+  struct msg_buf
+  {
+    tick_t expire;
+    int len;
+    int count;
+    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 ();
+  // resets movement state
+  MTH void reset_state ();
+  // resets variable data used to send stat diffs
+  MTH void reset_stats ();
+  MTH bool handle_packet ();
+  int next_packet ();                     // returns length of packet or 0
+  void skip_packet (int len);             // we have processed the packet, skip it
+  MTH void flush ();
+  MTH void write_outputbuffer ();
+  MTH int outputbuffer_len () const { return outputbuffer.len; }
+  void send (void *buf_, int len);
+  void send_packet (const char *buf);
+  void send_packet (const char *buf, int len);
+  void send_packet_printf (const char *format, ...);
+  void send_packet (packet &sl);
+  void send_drawinfo (const char *msg, int flags = NDI_BLACK);
+  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
+  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
-  // unfortunately, this emans that we *require* tcp_info now...
   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_snd_cwnd);
   ACC (RW, tcpi.tcpi_advmss);
   ACC (RW, tcpi.tcpi_reordering);
 #endif
-  struct ixsend {
-    int16_t pri; // unused
-    faceidx idx;
-    uint32_t ofs;  // if != 0, need to send remaining bytes of partial_face
-  };
-  std::vector<ixsend, slice_allocator<ixsend> > ixface; // which faces to send to the client using ix
-  std::vector<faceidx, slice_allocator<faceidx> > fxface; // which faces to send using fx
-  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);
-  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;
-  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
-  uint8 inbuf[MAXSOCKBUF + 2 + 1];
-  enum { MSG_BUF_SIZE = 80, MSG_BUF_COUNT = 10 };
-  struct msg_buf
-  {
-    tick_t expire;
-    int len;
-    int count;
-    char msg[MSG_BUF_SIZE];
-  } msgbuf[MSG_BUF_COUNT];
-  MTH bool msg_suppressed (const char *msg);
-  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 ();
-  // resets movement state
-  MTH void reset_state ();
-  // resets variable data used to send stat diffs
-  MTH void reset_stats ();
-  MTH bool handle_packet ();
-  int next_packet ();                     // returns length of packet or 0
-  void skip_packet (int len);             // we have processed the packet, skip it
-  MTH void flush ();
-  MTH void write_outputbuffer ();
-  MTH int outputbuffer_len () const { return outputbuffer.len; }
-  void send (void *buf_, int len);
-  void send_packet (const char *buf);
-  void send_packet (const char *buf, int len);
-  void send_packet_printf (const char *format, ...);
-  void send_packet (packet &sl);
-  void send_drawinfo (const char *msg, int flags = NDI_BLACK);
-  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
-  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 ();
-};
 #define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\
         ( ((__type)>0) &&\
           ((__sockPtr)->has_readable_type) && \
           ((__sockPtr)->supported_readables & (1<<(__type))) )
-/* Constants in the form EMI_ is for extended map infos.
- * Even if the client select the additionnal infos it wants
- * on the map, there may exist cases where this whole info
- * is not given in one buch but in separate bunches. This
- * is done performance reasons (imagine some info related to
- * a visible object and another info related to a 4 square
- * width and height area). At the begin of an extended info packet
- * is a bit field. A bit is activated for each extended info
- * present in the data
- */
-/* Meanings:
- * EMI_NOREDRAW  Take extended infos into account but don't redraw,
- *               some additionnal datas will follow in a new packet
- * EMI_SMOOTH    Datas about smoothing
- */
-#define EMI_NOREDRAW        0x01
-#define EMI_SMOOTH          0x02
-/* this last one says the bitfield continue un next byte
- * There may be several on contiguous bytes. So there is 7
- * actual bits used per byte, and the number of bytes
- * is not fixed in protocol
- */
-#define EMI_HASMOREBITS     0x80
 #define FACE_TYPES  1
 #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.66 by root, Mon Jul 30 02:03:02 2007 UTC vs. Revision 1.83 by root, Fri Dec 26 10:44:17 2008 UTC

Diff Legend

Comparing deliantra/server/include/client.h (file contents):
Revision 1.66 by root, Mon Jul 30 02:03:02 2007 UTC vs.
Revision 1.83 by root, Fri Dec 26 10:44:17 2008 UTC