--- deliantra/server/include/client.h 2012/10/30 17:07:50 1.108 +++ deliantra/server/include/client.h 2017/01/29 00:09:31 1.118 @@ -1,7 +1,7 @@ /* * This file is part of Deliantra, the Roguelike Realtime MMORPG. * - * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team + * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 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 @@ -91,12 +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. - */ - // states the socket can be in enum { ST_DEAD, // socket is dead @@ -109,15 +103,14 @@ // a handler for a specific type of packet enum { - PF_PLAYER = 0x01, // must have valid player / will by synchronised - PF_PLAYING = 0x02, // must be in playing state - PF_COMMAND0 = 0x04, // command starts at offset 0 - PF_COMMAND6 = 0x08, // command starts at offset 6 + PF_PLAYER = 0x01, // must have valid player / will by synchronised + PF_PLAYING = 0x02, // must be in playing state + PF_COMMAND = 0x04, // is a user command }; -// 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 @@ -144,6 +137,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 { @@ -153,7 +151,7 @@ object_vector_index ACC (RO, active); player_ptr ACC (RO, pl); - char *ACC (RW, host); /* Which host it is connected from (ip address) */ + char *ACC (RW, host); /* Which host it is connected from (ip:port) */ uint8 ACC (RW, state); /* Input state of the player (name, password, etc */ sint8 ACC (RW, last_level); /* Last level we sent to client */ @@ -170,19 +168,19 @@ 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, 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 */ - bool ACC (RW, monitor_spells); /* Client wishes to be informed when their spell list changes */ + uint8 ACC (RW, monitor_spells); /* Client wishes to be informed when their spell list changes */ bool ACC (RW, smoothing); // deliantra-style smoothing bool ACC (RW, force_newmap); // force a newmap before next map update @@ -190,10 +188,11 @@ uint16 ACC (RW, mss); // likely tcp maximum segment size 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, 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 tstamp ACC (RW, last_send); // last data send on socket. @@ -207,17 +206,27 @@ 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; // higher means faces are sent earlier, default 0 + 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 @@ -282,15 +291,14 @@ 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))); void send_packet (packet &sl); - 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); @@ -308,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 ();