--- deliantra/server/include/client.h 2009/09/02 16:54:20 1.86 +++ deliantra/server/include/client.h 2012/11/06 03:45:17 1.109 @@ -1,33 +1,28 @@ /* * This file is part of Deliantra, the Roguelike Realtime MMORPG. - * - * 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 - * - * 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. - * + * + * 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 GNU General Public License - * along with this program. If not, see . - * + * + * 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 */ #ifndef CLIENT_H #define CLIENT_H -#include -#include -#include - #if HAVE_TCP_INFO # include #else @@ -65,6 +60,8 @@ }; #endif +//+GPL + // (possibly) max. number of objects "per page" in the ground container #define FLOORBOX_PAGESIZE 50 @@ -100,12 +97,6 @@ * 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 @@ -148,6 +139,8 @@ int datalen; }; +//-GPL + /* how many times we are allowed to give the wrong password before being kicked. */ #define MAX_PASSWORD_FAILURES 5 @@ -174,35 +167,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, 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 + 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 */ - uint32 ACC (RW, cs_version), ACC (RW, sc_version); /* versions of the 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, faceset); // CF+ selected faceset + 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 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. @@ -215,13 +208,19 @@ 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 + int16_t pri; // higher means faces are sent earlier, default 0 faceidx idx; uint32_t ofs; // if != 0, need to send remaining bytes of partial_face }; @@ -230,6 +229,9 @@ 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; @@ -246,6 +248,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 @@ -256,7 +259,7 @@ char msg[MSG_BUF_SIZE]; } msgbuf[MSG_BUF_COUNT]; - MTH bool msg_suppressed (const char *msg); + MTH bool msg_suppressed (const_utf8_string msg); /* The following is the setup for a ring buffer for storing output * data that the OS can't handle right away. @@ -286,19 +289,20 @@ 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_packet (const char *buf); - void send_packet (const char *buf, int len); - void send_packet_printf (const char *format, ...); + 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))); void send_packet (packet &sl); - void send_drawinfo (const char *msg, int flags = NDI_BLACK); + void send_drawinfo (const_utf8_string msg, int flags = NDI_BLACK); MTH void send_face (faceidx facenum, int pri = 0); MTH void send_faces (object *ob); MTH void send_animation (short anim_num); - void send_msg (int color, const char *type, const char *msg); + void send_msg (int color, const_utf8_string type, const_utf8_string msg); MTH void play_sound (faceidx sound, int dx = 0, int dy = 0); // called when something under the player changes @@ -312,6 +316,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 (); @@ -349,19 +355,6 @@ ACC (RW, tcpi.tcpi_reordering); #endif -#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 - -#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 "Deliantra Server" - typedef object_vector sockvec; extern sockvec clients; @@ -372,7 +365,7 @@ // returns true when the message needs special (read: perl) treatment static inline bool -msg_is_special (const char *msg, bool nl_special = true) +msg_is_special (const_any_string msg, bool nl_special = true) { return msg [strcspn (msg, nl_special ? "<&\n" : "<&")]; }