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.64 by root, Thu Jul 26 00:27:08 2007 UTC vs.
Revision 1.70 by root, Wed Nov 14 08:09:46 2007 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
… …
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24#ifndef CLIENT_H 24#ifndef CLIENT_H
25#define CLIENT_H 25#define CLIENT_H
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
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
30 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
… …
198 shstr ACC (RW, version); // CF+ client name/version 235 shstr ACC (RW, version); // CF+ client name/version
199 uint8 ACC (RW, faceset); // CF+ selected faceset 236 uint8 ACC (RW, faceset); // CF+ selected faceset
200 237
201 tstamp ACC (RW, last_send); // last data send on socket. 238 tstamp ACC (RW, last_send); // last data send on socket.
202 239
203 int ACC (RW, rtt), ACC (RW, rttvar); /* round-trip time and -variance, if known */
204 int ACC (RW, outq); // current socket outq length, or 0 if indeterminable
205
206 int ACC (RW, rate_avail); // current rate balance 240 int ACC (RW, rate_avail); // current rate balance
207 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
208 faceidx ACC (RW, scrub_idx); // which face to send next 242 faceidx ACC (RW, scrub_idx); // which face to send next
209 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);
210 252
211 struct ixsend { 253 struct ixsend {
212 int16_t pri; // unused 254 int16_t pri; // unused
213 faceidx idx; 255 faceidx idx;
214 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
… …
219 MTH void flush_fx (); // send fx if required 261 MTH void flush_fx (); // send fx if required
220 262
221 void do_destroy (); 263 void do_destroy ();
222 void gather_callbacks (AV *&callbacks, event_type event) const; 264 void gather_callbacks (AV *&callbacks, event_type event) const;
223 265
224 iow socket_ev; void socket_cb (iow &w, int got); 266 iow socket_ev; void socket_cb (iow &w, int revents);
225 iw cmd_ev; void cmd_cb (iw &w);
226 267
227 std::deque< command, slice_allocator<command> > cmd_queue; 268 std::deque< command, slice_allocator<command> > cmd_queue;
228 269
229 // large structures at the end please 270 // large structures at the end please
230 struct Map lastmap; 271 struct Map lastmap;
… …
286 MTH void floorbox_reset () { look_position = 0; floorbox_update (); } 327 MTH void floorbox_reset () { look_position = 0; floorbox_update (); }
287 328
288 MTH void tick (); // called every server tick to do housekeeping etc. 329 MTH void tick (); // called every server tick to do housekeeping etc.
289 330
290 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 ();
291 334
292protected: 335protected:
293 client (int fd, const char *from_ip); 336 client (int fd, const char *from_ip);
294 ~client (); 337 ~client ();
295}; 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
296 371
297#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\ 372#define CLIENT_SUPPORT_READABLES(__sockPtr,__type)\
298 ( ((__type)>0) &&\ 373 ( ((__type)>0) &&\
299 ((__sockPtr)->has_readable_type) && \ 374 ((__sockPtr)->has_readable_type) && \
300 ((__sockPtr)->supported_readables & (1<<(__type))) ) 375 ((__sockPtr)->supported_readables & (1<<(__type))) )
… …
329#define PNG_FACE_INDEX 0 404#define PNG_FACE_INDEX 0
330 405
331#define VERSION_CS 1023 /* version >= 1023 understand setup cmd */ 406#define VERSION_CS 1023 /* version >= 1023 understand setup cmd */
332#define VERSION_SC 1026 407#define VERSION_SC 1026
333//#define VERSION_SC 1027 // requestinfo image_info and image_sums, makes extending faces on the fly impossible 408//#define VERSION_SC 1027 // requestinfo image_info and image_sums, makes extending faces on the fly impossible
334#define VERSION_INFO "Crossfire TRT Server" 409#define VERSION_INFO "Deliantra Server"
335 410
336typedef object_vector<client, &client::active> sockvec; 411typedef object_vector<client, &client::active> sockvec;
337 412
338extern sockvec clients; 413extern sockvec clients;
339 414

Diff Legend

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