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.62 by root, Mon Jul 23 21:02:50 2007 UTC vs.
Revision 1.68 by root, Mon Oct 1 01:09:10 2007 UTC

… …
26 26
27#include <deque> 27#include <deque>
28#include <bitset> 28#include <bitset>
29#include <tr1/unordered_set> 29#include <tr1/unordered_set>
30 30
31#if HAVE_TCP_INFO
32# include <netinet/tcp.h>
33#else
34 struct tcpi_info {
35 // dummy
36 char tcpi_state;
37 char tcpi_ca_state;
38 char tcpi_retransmits;
39 char tcpi_probes;
40 char tcpi_backoff;
41 char tcpi_options;
42 char tcpi_snd_wscale;
43 char tcpi_rcv_wscale;
44 char tcpi_rto;
45 char tcpi_ato;
46 char tcpi_snd_mss;
47 char tcpi_rcv_mss;
48 char tcpi_unacked;
49 char tcpi_sacked;
50 char tcpi_lost;
51 char tcpi_retrans;
52 char tcpi_fackets;
53 char tcpi_last_data_sent;
54 char tcpi_last_ack_sent;
55 char tcpi_last_data_recv;
56 char tcpi_last_ack_recv;
57 char tcpi_pmtu;
58 char tcpi_rcv_ssthresh;
59 char tcpi_rtt;
60 char tcpi_rttvar;
61 char tcpi_snd_ssthresh;
62 char tcpi_snd_cwnd;
63 char tcpi_advmss;
64 char tcpi_reordering;
65 };
66#endif
67
31// (possibly) max. number of objects "per page" in the ground container 68// (possibly) max. number of objects "per page" in the ground container
32#define FLOORBOX_PAGESIZE 50 69#define FLOORBOX_PAGESIZE 50
33 70
34struct MapCell 71struct MapCell
35{ 72{
… …
83enum { 120enum {
84 PF_PLAYER = 0x01, // must have valid player / will by synchronised 121 PF_PLAYER = 0x01, // must have valid player / will by synchronised
85 PF_PLAYING = 0x02, // must be in playing state 122 PF_PLAYING = 0x02, // must be in playing state
86 PF_COMMAND0 = 0x04, // command starts at offset 0 123 PF_COMMAND0 = 0x04, // command starts at offset 0
87 PF_COMMAND6 = 0x08, // command starts at offset 6 124 PF_COMMAND6 = 0x08, // command starts at offset 6
125};
126
127// face type.s bit 0 means "has meta info prepended"
128enum {
129 FT_FACE = 0 * 2 + 0, // faces (images)
130 FT_MUSIC = 1 * 2 + 1, // background music
131 FT_SOUND = 2 * 2 + 1, // effects
132 FT_RSRC = 3 * 2 + 0, // generic data files
133 FT_NUM,
88}; 134};
89 135
90struct packet_type 136struct packet_type
91{ 137{
92 const char *name; 138 const char *name;
… …
189 shstr ACC (RW, version); // CF+ client name/version 235 shstr ACC (RW, version); // CF+ client name/version
190 uint8 ACC (RW, faceset); // CF+ selected faceset 236 uint8 ACC (RW, faceset); // CF+ selected faceset
191 237
192 tstamp ACC (RW, last_send); // last data send on socket. 238 tstamp ACC (RW, last_send); // last data send on socket.
193 239
194 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */
195 int ACC (RW, outq); // current socket outq length, or 0 if indeterminable
196
197 int ACC (RW, rate_avail); // current rate balance 240 int ACC (RW, rate_avail); // current rate balance
198 int ACC (RW, max_rate); // max. # of bytes to send per tick 241 int ACC (RW, max_rate); // max. # of bytes to send per tick
199 faceidx ACC (RW, scrub_idx); // which face to send next 242 faceidx ACC (RW, scrub_idx); // which face to send next
200 int ACC (RW, bg_scrub); // how many ticks till the next background face send 243 int ACC (RW, bg_scrub); // how many ticks till the next background face send
244
245 struct tcp_info tcpi;
246 tstamp next_rate_adjust;
247
248 unordered_vector<char *> mapinfo_queue;
249 void mapinfo_queue_clear ();
250 void mapinfo_queue_run ();
251 bool mapinfo_try (char *buf);
201 252
202 struct ixsend { 253 struct ixsend {
203 int16_t pri; // unused 254 int16_t pri; // unused
204 faceidx idx; 255 faceidx idx;
205 uint32_t ofs; // if != 0, need to send remaining bytes of partial_face 256 uint32_t ofs; // if != 0, need to send remaining bytes of partial_face
… …
211 262
212 void do_destroy (); 263 void do_destroy ();
213 void gather_callbacks (AV *&callbacks, event_type event) const; 264 void gather_callbacks (AV *&callbacks, event_type event) const;
214 265
215 iow socket_ev; void socket_cb (iow &w, int got); 266 iow socket_ev; void socket_cb (iow &w, int got);
216 iw cmd_ev; void cmd_cb (iw &w);
217 267
218 std::deque< command, slice_allocator<command> > cmd_queue; 268 std::deque< command, slice_allocator<command> > cmd_queue;
219 269
220 // large structures at the end please 270 // large structures at the end please
221 struct Map lastmap; 271 struct Map lastmap;
222 std::bitset<MAXANIMNUM> anims_sent; 272 std::bitset<MAXANIMNUM> anims_sent;
223 std::bitset<MAX_FACES> faces_sent; 273 std::bitset<MAX_FACES> faces_sent;
274 std::bitset<FT_NUM> fx_want;
224 275
225 // if we get an incomplete packet, this is used to hold the data. 276 // if we get an incomplete packet, this is used to hold the data.
226 // we add 2 byte for the header, one for the trailing 0 byte 277 // we add 2 byte for the header, one for the trailing 0 byte
227 uint8 inbuf[MAXSOCKBUF + 2 + 1]; 278 uint8 inbuf[MAXSOCKBUF + 2 + 1];
228 279
… …
261 void send_packet_printf (const char *format, ...); 312 void send_packet_printf (const char *format, ...);
262 void send_packet (packet &sl); 313 void send_packet (packet &sl);
263 314
264 void send_drawinfo (const char *msg, int flags = NDI_BLACK); 315 void send_drawinfo (const char *msg, int flags = NDI_BLACK);
265 316
266 MTH bool must_send_face (faceidx facenum)
267 {
268 if (faces_sent[facenum])
269 return false;
270
271 faces_sent[facenum] = true;
272 return true;
273 }
274
275 MTH void send_face (faceidx facenum); 317 MTH void send_face (faceidx facenum, int pri = 0);
276 MTH void send_image (faceidx facenum); 318 MTH void send_image (faceidx facenum);
277 MTH void send_faces (object *ob); 319 MTH void send_faces (object *ob);
278 MTH void send_animation (short anim_num); 320 MTH void send_animation (short anim_num);
279 void send_msg (int color, const char *type, const char *msg); 321 void send_msg (int color, const char *type, const char *msg);
280 322
323 MTH void play_sound (faceidx sound, int dx = 0, int dy = 0);
281 // called when something under the player changes 324 // called when something under the player changes
282 MTH void floorbox_update () { update_look = 1; } 325 MTH void floorbox_update () { update_look = 1; }
283 // called when the player has been moved 326 // called when the player has been moved
284 MTH void floorbox_reset () { look_position = 0; floorbox_update (); } 327 MTH void floorbox_reset () { look_position = 0; floorbox_update (); }
285 328
286 MTH void tick (); // called every server tick to do housekeeping etc. 329 MTH void tick (); // called every server tick to do housekeeping etc.
287 330
288 MTH static client *create (int fd, const char *peername); 331 MTH static client *create (int fd, const char *peername);
332 MTH static void clock ();
333 MTH static void flush_sockets ();
289 334
290protected: 335protected:
291 client (int fd, const char *from_ip); 336 client (int fd, const char *from_ip);
292 ~client (); 337 ~client ();
293}; 338};
339
340#if FOR_PERL
341 ACC (RW, tcpi.tcpi_state);
342 ACC (RW, tcpi.tcpi_ca_state);
343 ACC (RW, tcpi.tcpi_retransmits);
344 ACC (RW, tcpi.tcpi_probes);
345 ACC (RW, tcpi.tcpi_backoff);
346 ACC (RW, tcpi.tcpi_options);
347 ACC (RO, tcpi.tcpi_snd_wscale);
348 ACC (RO, tcpi.tcpi_rcv_wscale);
349 ACC (RW, tcpi.tcpi_rto);
350 ACC (RW, tcpi.tcpi_ato);
351 ACC (RW, tcpi.tcpi_snd_mss);
352 ACC (RW, tcpi.tcpi_rcv_mss);
353 ACC (RW, tcpi.tcpi_unacked);
354 ACC (RW, tcpi.tcpi_sacked);
355 ACC (RW, tcpi.tcpi_lost);
356 ACC (RW, tcpi.tcpi_retrans);
357 ACC (RW, tcpi.tcpi_fackets);
358 ACC (RW, tcpi.tcpi_last_data_sent);
359 ACC (RW, tcpi.tcpi_last_ack_sent);
360 ACC (RW, tcpi.tcpi_last_data_recv);
361 ACC (RW, tcpi.tcpi_last_ack_recv);
362 ACC (RW, tcpi.tcpi_pmtu);
363 ACC (RW, tcpi.tcpi_rcv_ssthresh);
364 ACC (RW, tcpi.tcpi_rtt);
365 ACC (RW, tcpi.tcpi_rttvar);
366 ACC (RW, tcpi.tcpi_snd_ssthresh);
367 ACC (RW, tcpi.tcpi_snd_cwnd);
368 ACC (RW, tcpi.tcpi_advmss);
369 ACC (RW, tcpi.tcpi_reordering);
370#endif
294 371
295#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\ 372#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\
296 ( ((__type)>0) &&\ 373 ( ((__type)>0) &&\
297 ((__sockPtr)->has_readable_type) && \ 374 ((__sockPtr)->has_readable_type) && \
298 ((__sockPtr)->supported_readables & (1<<(__type))) ) 375 ((__sockPtr)->supported_readables & (1<<(__type))) )

Diff Legend

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