ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/client.h
(Generate patch)

Comparing deliantra/server/include/client.h (file contents):
Revision 1.107 by root, Mon Oct 29 23:55:53 2012 UTC vs.
Revision 1.110 by root, Fri Nov 9 00:11:49 2012 UTC

… …
89struct statsinfo 89struct statsinfo
90{ 90{
91 char *range, *title; 91 char *range, *title;
92}; 92};
93 93
94/* This contains basic information on the socket structure. status is its
95 * current state. we set up our on buffers for sending/receiving, so we can
96 * handle some higher level functions. fd is the actual file descriptor we
97 * are using.
98 */
99
100// states the socket can be in 94// states the socket can be in
101enum { 95enum {
102 ST_DEAD, // socket is dead 96 ST_DEAD, // socket is dead
103 ST_SETUP, // initial handshake / setup / login 97 ST_SETUP, // initial handshake / setup / login
104 ST_PLAYING, // logged in an playing 98 ST_PLAYING, // logged in an playing
… …
113 PF_PLAYING = 0x02, // must be in playing state 107 PF_PLAYING = 0x02, // must be in playing state
114 PF_COMMAND0 = 0x04, // command starts at offset 0 108 PF_COMMAND0 = 0x04, // command starts at offset 0
115 PF_COMMAND6 = 0x08, // command starts at offset 6 109 PF_COMMAND6 = 0x08, // command starts at offset 6
116}; 110};
117 111
118// face type.s bit 0 means "has meta info prepended" 112// face types. bit 0 means "has meta info prepended"
119enum { 113enum {
120 FT_FACE = 0 * 2 + 0, // faces (images) 114 FT_FACE = 0 * 2 + 0, // faces (images)
121 FT_MUSIC = 1 * 2 + 1, // background music 115 FT_MUSIC = 1 * 2 + 1, // background music
122 FT_SOUND = 2 * 2 + 1, // effects 116 FT_SOUND = 2 * 2 + 1, // effects
123 FT_RSRC = 3 * 2 + 0, // generic data files 117 FT_RSRC = 3 * 2 + 0, // generic data files
… …
142//-GPL 136//-GPL
143 137
144/* how many times we are allowed to give the wrong password before being kicked. */ 138/* how many times we are allowed to give the wrong password before being kicked. */
145#define MAX_PASSWORD_FAILURES 5 139#define MAX_PASSWORD_FAILURES 5
146 140
141/* This contains basic information on the socket connection. status is its
142 * current state. we set up our on buffers for sending/receiving, so we can
143 * handle some higher level functions. fd is the actual file descriptor we
144 * are using.
145 */
147INTERFACE_CLASS (client) // should become player when newsocket is a baseclass of player 146INTERFACE_CLASS (client) // should become player when newsocket is a baseclass of player
148struct client : zero_initialised, attachable 147struct client : zero_initialised, attachable
149{ 148{
150 int ACC (RW, fd); 149 int ACC (RW, fd);
151 unsigned int inbuf_len; // number of bytes valid in inbuf 150 unsigned int inbuf_len; // number of bytes valid in inbuf
… …
189 uint16 ACC (RW, look_position); /* start of drawing of look window */ 188 uint16 ACC (RW, look_position); /* start of drawing of look window */
190 uint16 ACC (RW, mss); // likely tcp maximum segment size 189 uint16 ACC (RW, mss); // likely tcp maximum segment size
191 uint8 ACC (RW, mapx), ACC (RW, mapy); /* How large a map the client wants */ 190 uint8 ACC (RW, mapx), ACC (RW, mapy); /* How large a map the client wants */
192 uint8 ACC (RW, itemcmd); /* What version of the 'item' protocol command to use */ 191 uint8 ACC (RW, itemcmd); /* What version of the 'item' protocol command to use */
193 uint8 ACC (RW, faceset); // CF+ selected faceset 192 uint8 ACC (RW, faceset); // CF+ selected faceset
193 uint8 ACC (RW, ws_version); // websocket protocol versio for framing
194 194
195 maptile_ptr ACC (RW, current_map); // CF+ last/current player map 195 maptile_ptr ACC (RW, current_map); // CF+ last/current player map
196 region_ptr ACC (RW, current_region); // CF+ last/current player region 196 region_ptr ACC (RW, current_region); // CF+ last/current player region
197 int ACC (RW, current_x), ACC (RW, current_y); // CF+ last/current map position 197 int ACC (RW, current_x), ACC (RW, current_y); // CF+ last/current map position
198 198
… …
205 int ACC (RW, bg_scrub); // how many ticks till the next background face send 205 int ACC (RW, bg_scrub); // how many ticks till the next background face send
206 206
207 struct tcp_info tcpi; 207 struct tcp_info tcpi;
208 tstamp next_rate_adjust; 208 tstamp next_rate_adjust;
209 209
210 // websocket frame buffer
211 uint8 ws_inbuf_type; // current frame type
212 uint8 *ws_inbuf;
213 uint32 ws_inbuf_len;
214 uint32 ws_inbuf_alloc;
215
210 unordered_vector<char *> mapinfo_queue; 216 unordered_vector<char *> mapinfo_queue;
211 void mapinfo_queue_clear (); 217 void mapinfo_queue_clear ();
212 void mapinfo_queue_run (); 218 void mapinfo_queue_run ();
213 bool mapinfo_try (char *buf); 219 bool mapinfo_try (char *buf);
214 220
215 struct ixsend { 221 struct ixsend {
216 int16_t pri; // higher means faces are sent earlier, default 0 222 int16_t pri; // higher means faces are sent earlier, default 0
217 faceidx idx; 223 faceidx idx;
218 uint32_t ofs; // if != 0, need to send remaining bytes of partial_face 224 uint32_t ofs; // if != 0, need to send remaining bytes of partial_face
225 refcnt_buf data;
219 }; 226 };
220 std::vector<ixsend, slice_allocator<ixsend> > ixface; // which faces to send to the client using ix 227 std::vector<ixsend, slice_allocator<ixsend> > ixface; // which faces to send to the client using ix
221 228
222 std::vector<faceidx, slice_allocator<faceidx> > fxface; // which faces to send using fx 229 std::vector<faceidx, slice_allocator<faceidx> > fxface; // which faces to send using fx
223 MTH void flush_fx (); // send fx if required 230 MTH void flush_fx (); // send fx if required
… …
239 std::bitset<FT_NUM> fx_want; 246 std::bitset<FT_NUM> fx_want;
240 247
241 // if we get an incomplete packet, this is used to hold the data. 248 // if we get an incomplete packet, this is used to hold the data.
242 // we add 2 byte for the header, one for the trailing 0 byte 249 // we add 2 byte for the header, one for the trailing 0 byte
243 uint8 inbuf[MAXSOCKBUF + 2 + 1]; 250 uint8 inbuf[MAXSOCKBUF + 2 + 1];
251 void inbuf_handle ();
244 252
245 enum { MSG_BUF_SIZE = 80, MSG_BUF_COUNT = 10 }; 253 enum { MSG_BUF_SIZE = 80, MSG_BUF_COUNT = 10 };
246 struct msg_buf 254 struct msg_buf
247 { 255 {
248 tick_t expire; 256 tick_t expire;
… …
279 void skip_packet (int len); // we have processed the packet, skip it 287 void skip_packet (int len); // we have processed the packet, skip it
280 288
281 MTH void flush (); 289 MTH void flush ();
282 MTH void write_outputbuffer (); 290 MTH void write_outputbuffer ();
283 MTH int outputbuffer_len () const { return outputbuffer.len; } 291 MTH int outputbuffer_len () const { return outputbuffer.len; }
292 void send_raw (void *buf_, int len);
293
284 void send (void *buf_, int len); 294 void send (void *buf_, int len);
285
286 void send_packet (const_octet_string buf); 295 void send_packet (const_octet_string buf);
287 void send_packet (const_octet_string buf, int len); 296 void send_packet (const_octet_string buf, int len);
288 void send_packet_printf (const_utf8_string format, ...) attribute ((format (printf, 2, 3))); 297 void send_packet_printf (const_utf8_string format, ...) attribute ((format (printf, 2, 3)));
289 void send_packet (packet &sl); 298 void send_packet (packet &sl);
290 299
… …
304 MTH void tick (); // called every server tick to do housekeeping etc. 313 MTH void tick (); // called every server tick to do housekeeping etc.
305 314
306 MTH static client *create (int fd, const char *peername); 315 MTH static client *create (int fd, const char *peername);
307 MTH static void clock (); 316 MTH static void clock ();
308 MTH static void flush_sockets (); 317 MTH static void flush_sockets ();
318
319 MTH void run (); // start handshake after init
309 320
310protected: 321protected:
311 client (int fd, const char *from_ip); 322 client (int fd, const char *from_ip);
312 ~client (); 323 ~client ();
313}; 324};

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines