--- deliantra/server/include/client.h 2007/06/09 22:54:03 1.53
+++ deliantra/server/include/client.h 2007/11/08 19:43:24 1.69
@@ -1,25 +1,24 @@
/*
- * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
+ * 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 it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
+ * 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, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along
- * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
*
- * The authors can be reached via e-mail to
+ * The authors can be reached via e-mail to
*/
#ifndef CLIENT_H
@@ -29,6 +28,43 @@
#include
#include
+#if HAVE_TCP_INFO
+# include
+#else
+ struct tcpi_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;
+ };
+#endif
+
// (possibly) max. number of objects "per page" in the ground container
#define FLOORBOX_PAGESIZE 50
@@ -88,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;
@@ -117,7 +162,7 @@
int ACC (RW, fd);
unsigned int inbuf_len; // number of bytes valid in inbuf
statsinfo stats;
- int ACC (RO, active);
+ object_vector_index ACC (RO, active);
player_ptr ACC (RO, pl);
/* The following is the setup for a ring buffer for storing output
@@ -158,12 +203,12 @@
bool ACC (RW, newmapcmd); /* Send newmap command when entering new map SMACFIGGEN */
bool ACC (RW, plugincmd); // extend the protocol through a plug-in */
bool ACC (RW, mapinfocmd); // return map info and send map change info
- bool ACC (RW, extcmd); // call into extensions/plugins
+ uint8_t ACC (RW, extcmd); // call into extensions/plugins
bool ACC (RW, extmap); // extend map comamnd with extra data
bool ACC (RW, buggy_mapscroll); // client crashes on large mapscrolls
bool ACC (RW, darkness); /* True if client wants darkness information */
bool ACC (RW, image2); /* Client wants image2/face2 commands */
- bool ACC (RW, fxix); // client implements fx and ix (face|image extended) commands
+ 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 */
@@ -192,25 +237,33 @@
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, 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
- faceidx partial_face;
- uint32 partial_face_ofs; // if != 0, need to send remaining bytes of partial_face
- std::vector > askface; // which faces have been requested by the client
+ struct tcp_info tcpi;
+ tstamp next_rate_adjust;
+
+ unordered_vector 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 > ixface; // which faces to send to the client using ix
- std::vector > fxface; // which faces to send using fx
+ std::vector > 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 > cmd_queue;
@@ -218,6 +271,7 @@
struct Map lastmap;
std::bitset anims_sent;
std::bitset faces_sent;
+ std::bitset 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
@@ -259,12 +313,14 @@
void send_packet (packet &sl);
void send_drawinfo (const char *msg, int flags = NDI_BLACK);
- 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);
- MTH void send_msg (int color, const char *type, const char *msg);
+ 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
@@ -273,12 +329,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) && \
@@ -316,7 +406,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+ Server"
+#define VERSION_INFO "Deliantra Server"
typedef object_vector sockvec;