--- deliantra/server/include/client.h 2010/04/08 19:31:22 1.96
+++ deliantra/server/include/client.h 2012/11/11 05:53:12 1.112
@@ -1,22 +1,22 @@
/*
* This file is part of Deliantra, the Roguelike Realtime MMORPG.
- *
- * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- *
+ *
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ *
* Deliantra is free software: you can redistribute it and/or modify it under
* the terms of the Affero 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.
- *
+ *
* You should have received a copy of the Affero GNU General Public License
* and the GNU General Public License along with this program. If not, see
* .
- *
+ *
* The authors can be reached via e-mail to
*/
@@ -91,18 +91,6 @@
char *range, *title;
};
-/* This contains basic information on the socket structure. status is its
- * current state. we set up our on buffers for sending/receiving, so we can
- * handle some higher level functions. fd is the actual file descriptor we
- * are using.
- */
-
-/* Only one map mode can actually be used, so lets make it a switch
- * instead of having a bunch of different fields that needed to
- * get toggled.
- */
-enum { Map0Cmd = 0, Map1Cmd = 1, Map1aCmd = 2 };
-
// states the socket can be in
enum {
ST_DEAD, // socket is dead
@@ -121,9 +109,9 @@
PF_COMMAND6 = 0x08, // command starts at offset 6
};
-// face type.s bit 0 means "has meta info prepended"
+// face types. bit 0 means "has meta info prepended"
enum {
- FT_FACE = 0 * 2 + 0, // faces (images)
+ FT_IMAGE = 0 * 2 + 0, // images
FT_MUSIC = 1 * 2 + 1, // background music
FT_SOUND = 2 * 2 + 1, // effects
FT_RSRC = 3 * 2 + 0, // generic data files
@@ -150,6 +138,11 @@
/* how many times we are allowed to give the wrong password before being kicked. */
#define MAX_PASSWORD_FAILURES 5
+/* This contains basic information on the socket connection. status is its
+ * current state. we set up our on buffers for sending/receiving, so we can
+ * handle some higher level functions. fd is the actual file descriptor we
+ * are using.
+ */
INTERFACE_CLASS (client) // should become player when newsocket is a baseclass of player
struct client : zero_initialised, attachable
{
@@ -173,34 +166,35 @@
living ACC (RO, last_stats); /* Last stats as sent to client */
float ACC (RW, last_speed); /* Last speed as sent to client */
sint16 ACC (RW, last_resist[NROFATTACKS]);/* last resist values sent to client */
- sint64 ACC (RW, last_skill_exp[NUM_SKILLS]);/* shadow register. if != exp. obj update client */
+ sint64 ACC (RW, last_skill_exp[CS_NUM_SKILLS]);/* shadow register. if != exp. obj update client */
bool ACC (RW, afk); /* player is afk */
- bool ACC (RW, sent_scroll);
+ bool ACC (RW, sent_scroll);
bool ACC (RW, sound); /* does the client want sound */
- bool ACC (RW, newmapcmd); /* Send newmap command when entering new map SMACFIGGEN */
+ bool ACC (RW, bumpmsg); /* give message when bumping into walls */
+
bool ACC (RW, plugincmd); // extend the protocol through a plug-in */
bool ACC (RW, mapinfocmd); // return map info and send map change info
- uint8_t ACC (RW, extcmd); // call into extensions/plugins
+ uint8 ACC (RW, extcmd); // call into extensions/plugins
+ bool ACC (RW, need_delinv0); /* If true, we need to delinv 0 before sending new floorbox */
+
bool ACC (RW, update_look); /* If true, we need to send the look window */
bool ACC (RW, update_spells); // If true, we need to esrv_update_spells
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, smoothing); // deliantra-style smoothing
+ bool ACC (RW, smoothing); // deliantra-style smoothing
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, look_position); /* start of drawing of look window */
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, mapx), ACC (RW, mapy); /* How large a map the client wants */
uint8 ACC (RW, itemcmd); /* What version of the 'item' protocol command to use */
+ uint8 ACC (RW, tileset); // selected tileset
+ uint8 ACC (RW, ws_version); // websocket protocol versio for framing
- maptile_ptr ACC (RW, current_map); // CF+ last/current player map
- region_ptr ACC (RW, current_region); // CF+ last/current player region
+ maptile_ptr ACC (RW, current_map); // last/current player map
+ region_ptr ACC (RW, current_region); // last/current player region
int ACC (RW, current_x), ACC (RW, current_y); // CF+ last/current map position
- uint8 ACC (RW, faceset); // CF+ selected faceset
tstamp ACC (RW, last_send); // last data send on socket.
@@ -213,21 +207,34 @@
struct tcp_info tcpi;
tstamp next_rate_adjust;
+ // websocket frame buffer
+ uint8 ws_inbuf_type; // current frame type
+ uint8 *ws_inbuf;
+ uint32 ws_inbuf_len;
+ uint32 ws_inbuf_alloc;
+
unordered_vector mapinfo_queue;
void mapinfo_queue_clear ();
void mapinfo_queue_run ();
bool mapinfo_try (char *buf);
struct ixsend {
- int16_t pri; // unused
+ sint16 pri; // higher means faces are sent earlier, default 0
faceidx idx;
- uint32_t ofs; // if != 0, need to send remaining bytes of partial_face
+ uint32 ofs; // if != 0, need to send remaining bytes of partial_face
+ uint8 *data;
+ SV *data_sv;
};
std::vector > ixface; // which faces to send to the client using ix
+ MTH void ix_send (faceidx idx, sint16 pri, SV *data_sv); // keeps a copy of data_sv
+ void ix_pop (); // pops topmost ixsend
std::vector > fxface; // which faces to send using fx
MTH void flush_fx (); // send fx if required
+ MTH void invalidate_face (faceidx idx);
+ MTH void invalidate_all_faces ();
+
void do_destroy ();
void gather_callbacks (AV *&callbacks, event_type event) const;
@@ -244,6 +251,7 @@
// 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];
+ void inbuf_handle ();
enum { MSG_BUF_SIZE = 80, MSG_BUF_COUNT = 10 };
struct msg_buf
@@ -284,8 +292,9 @@
MTH void flush ();
MTH void write_outputbuffer ();
MTH int outputbuffer_len () const { return outputbuffer.len; }
- void send (void *buf_, int len);
+ void send_raw (void *buf_, int len);
+ void send (void *buf_, int len);
void send_packet (const_octet_string buf);
void send_packet (const_octet_string buf, int len);
void send_packet_printf (const_utf8_string format, ...) attribute ((format (printf, 2, 3)));
@@ -310,6 +319,8 @@
MTH static void clock ();
MTH static void flush_sockets ();
+ MTH void run (); // start handshake after init
+
protected:
client (int fd, const char *from_ip);
~client ();
@@ -347,18 +358,6 @@
ACC (RW, tcpi.tcpi_reordering);
#endif
-//+GPL
-
-#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\
- ( ((__type)>0) &&\
- ((__sockPtr)->has_readable_type) && \
- ((__sockPtr)->supported_readables & (1<<(__type))) )
-
-#define FACE_TYPES 1
-#define PNG_FACE_INDEX 0
-
-//-GPL
-
typedef object_vector sockvec;
extern sockvec clients;