ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/loop.C
(Generate patch)

Comparing deliantra/server/socket/loop.C (file contents):
Revision 1.12 by root, Thu Dec 14 01:12:35 2006 UTC vs.
Revision 1.70 by root, Thu Nov 8 19:43:30 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2002-2003 Mark Wedel & The Crossfire Development Team 5 * Copyright (©) 2002-2003,2007 Mark Wedel & The Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
8 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23 23
24/** 24/**
25 * \file 25 * \file
26 * Main client/server loops. 26 * Main client/server loops.
27 * 27 *
28 * \date 2003-12-02 28 * \date 2003-12-02
29 * 29 *
30 * loop.c mainly deals with initialization and higher level socket 30 * loop.c mainly deals with initialization and higher level socket
31 * maintenance (checking for lost connections and if data has arrived.) 31 * maintanance (checking for lost connections and if data has arrived.)
32 * The reading of data is handled in ericserver.c
33 */ 32 */
34
35 33
36#include <global.h> 34#include <global.h>
37#include <sproto.h> 35#include <sproto.h>
38#include <sockproto.h> 36#include <sockproto.h>
39 37
41#include <sys/time.h> 39#include <sys/time.h>
42#include <sys/socket.h> 40#include <sys/socket.h>
43#include <netinet/in.h> 41#include <netinet/in.h>
44#include <netdb.h> 42#include <netdb.h>
45 43
46#ifdef HAVE_UNISTD_H
47# include <unistd.h> 44#include <unistd.h>
48#endif
49
50#ifdef HAVE_ARPA_INET_H
51# include <arpa/inet.h> 45#include <arpa/inet.h>
52#endif
53 46
54#include <loader.h> 47#include <loader.h>
55#include <newserver.h>
56 48
57/***************************************************************************** 49#define BG_SCRUB_RATE 4 // how often to send a face in the background
58 * Start of command dispatch area.
59 * The commands here are protocol commands.
60 ****************************************************************************/
61 50
62/* Either keep this near the start or end of the file so it is 51#define MAX_QUEUE_DEPTH 50
63 * at least reasonablye easy to find. 52#define MAX_QUEUE_BACKLOG 3.
64 * There are really 2 commands - those which are sent/received
65 * before player joins, and those happen after the player has joined.
66 * As such, we have function types that might be called, so
67 * we end up having 2 tables.
68 */
69 53
70typedef void (*func_uint8_int_ns) (char *, int, NewSocket *); 54// disconnect a socket after this many seconds without an ack
55#define SOCKET_TIMEOUT 8.
71 56
72struct NsCmdMapping
73{
74 const char *cmdname;
75 func_uint8_int_ns cmdproc;
76 uint8 flag;
77};
78
79typedef void (*func_uint8_int_pl) (char *, int, player *);
80struct PlCmdMapping
81{
82 const char *cmdname;
83 func_uint8_int_pl cmdproc;
84 uint8 flag;
85};
86
87/**
88 * Dispatch table for the server.
89 *
90 * CmdMapping is the dispatch table for the server, used in HandleClient,
91 * which gets called when the client has input. All commands called here
92 * use the same parameter form (char* data, int len, int clientnum.
93 * We do implicit casts, because the data that is being passed is
94 * unsigned (pretty much needs to be for binary data), however, most
95 * of these treat it only as strings, so it makes things easier
96 * to cast it here instead of a bunch of times in the function itself.
97 * flag is 1 if the player must be in the playing state to issue the
98 * command, 0 if they can issue it at any time.
99 */
100static struct PlCmdMapping plcommands[] = {
101 {"examine", ExamineCmd, 1},
102 {"apply", ApplyCmd, 1},
103 {"move", MoveCmd, 1},
104 {"reply", ReplyCmd, 0},
105 {"command", PlayerCmd, 1},
106 {"ncom", (func_uint8_int_pl) NewPlayerCmd, 1},
107 {"lookat", LookAt, 1},
108 {"lock", (func_uint8_int_pl) LockItem, 1},
109 {"mark", (func_uint8_int_pl) MarkItem, 1},
110 {"mapredraw", MapRedrawCmd, 0}, /* Added: phil */
111 {"mapinfo", MapInfoCmd, 2}, /* CF+ */
112 {"ext", ExtCmd, 2}, /* CF+ */
113 { 0 } /* terminator */
114};
115
116/** Face-related commands */
117static struct NsCmdMapping nscommands[] = {
118 {"addme", AddMeCmd, 2},
119 {"askface", SendFaceCmd}, /* Added: phil */
120 {"requestinfo", RequestInfo},
121 {"setfacemode", SetFaceMode, 2},
122 {"setsound", SetSound, 2},
123 {"setup", SetUp, 2},
124 {"version", VersionCmd, 2},
125 {"toggleextendedinfos", ToggleExtendedInfos, 2}, /*Added: tchize */
126 {"toggleextendedtext", ToggleExtendedText, 2}, /*Added: tchize */
127 {"asksmooth", AskSmooth}, /*Added: tchize (smoothing technologies) */
128 { 0 } /* terminator (I, II & III) */
129};
130
131/**
132 * RequestInfo is sort of a meta command. There is some specific
133 * request of information, but we call other functions to provide
134 * that information.
135 */
136void 57void
137RequestInfo (char *buf, int len, NewSocket * ns) 58client::reset_state ()
138{ 59{
139 char *params = NULL, *cp; 60 if (!pl)
61 return;
140 62
141 /* No match */ 63 pl->run_on = 0;
142 char bigbuf[MAX_BUF]; 64 pl->fire_on = 0;
143 int slen; 65}
144 66
145 /* Set up replyinfo before we modify any of the buffers - this is used 67void
146 * if we don't find a match. 68client::queue_command (packet_type *handler, char *data, int datalen)
147 */ 69{
148 strcpy (bigbuf, "replyinfo "); 70 tstamp stamp = NOW;
149 slen = strlen (bigbuf);
150 safe_strcat (bigbuf, buf, &slen, MAX_BUF);
151 71
152 /* find the first space, make it null, and update the 72 if (cmd_queue.size () >= MAX_QUEUE_DEPTH)
153 * params pointer.
154 */
155 for (cp = buf; *cp != '\0'; cp++)
156 if (*cp == ' ')
157 { 73 {
158 *cp = '\0'; 74 //TODO: just disconnect here?
159 params = cp + 1; 75 reset_state ();
160 break; 76 send_packet_printf ("drawinfo %d command queue overflow, ignoring.", NDI_RED);
161 } 77 }
162
163 if (!strcmp (buf, "image_info"))
164 send_image_info (ns, params);
165 else if (!strcmp (buf, "image_sums"))
166 send_image_sums (ns, params);
167 else if (!strcmp (buf, "skill_info"))
168 send_skill_info (ns, params);
169 else if (!strcmp (buf, "spell_paths"))
170 send_spell_paths (ns, params);
171 else 78 else
172 ns->send_packet (bigbuf, len); 79 {
173} 80 cmd_queue.push_back (command ());
174 81 command &cmd = cmd_queue.back ();
175/** 82 cmd.stamp = stamp;
176 * Handle client input. 83 cmd.handler = handler;
177 * 84 cmd.data = salloc<char> (datalen + 1, data);
178 * HandleClient is actually not named really well - we only get here once 85 cmd.datalen = datalen;
179 * there is input, so we don't do exception or other stuff here.
180 * sock is the output socket information. pl is the player associated
181 * with this socket, null if no player (one of the init_sockets for just
182 * starting a connection)
183 */
184
185void
186HandleClient (NewSocket *ns, player *pl)
187{
188 /* Loop through this - maybe we have several complete packets here. */
189 // limit to a few commands only, though, as to not monopolise the server
190 for (int repeat = 16; repeat--;)
191 { 86 }
192 /* If it is a player, and they don't have any speed left, we 87}
193 * return, and will read in the data when they do have time.
194 */
195 if (pl && pl->state == ST_PLAYING && pl->ob && pl->ob->speed_left < 0)
196 return;
197 88
198 int pkt_len = ns->read_packet (); 89bool
90client::handle_command ()
91{
92 if (!cmd_queue.empty ()
93 && state == ST_PLAYING
94 && pl->ob->speed_left > 0.f)
95 {
96 command &cmd = cmd_queue.front ();
199 97
200 if (pkt_len < 0) 98 if (cmd.stamp + MAX_QUEUE_BACKLOG < NOW)
201 { 99 {
202 LOG (llevError, "read error on player %s\n", &pl->ob->name); 100 reset_state ();
203 /* Caller will take care of cleaning this up */ 101 send_packet_printf ("drawinfo %d ignoring delayed commands.", NDI_RED);
204 ns->status = Ns_Dead;
205 return;
206 }
207 else if (pkt_len == 0)
208 /* Still dont have a full packet */
209 return;
210
211 /* First, break out beginning word. There are at least
212 * a few commands that do not have any paremeters. If
213 * we get such a command, don't worry about trying
214 * to break it up.
215 */
216 int datalen;
217 char *data = strchr ((char *)ns->inbuf + 2, ' ');
218
219 if (data)
220 {
221 *data++ = 0;
222 datalen = pkt_len - (data - (char *)ns->inbuf);
223 } 102 }
224 else 103 else
104 execute (cmd.handler, cmd.data, cmd.datalen);
105
106 cmd_queue.pop_front ();
107 return true;
108 }
109 else
110 return false;
111}
112
113void
114client::tick ()
115{
116 if (!pl || destroyed ())
117 return;
118
119 /* Update the players stats once per tick. More efficient than
120 * sending them whenever they change, and probably just as useful
121 */
122 esrv_update_stats (pl);
123
124 if (last_weight != -1 && last_weight != WEIGHT (pl->ob))
125 {
126 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
127 if (last_weight != WEIGHT (pl->ob))
128 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n",
129 (unsigned long) last_weight, WEIGHT (pl->ob));
130 }
131
132 draw_client_map (pl);
133
134 if (update_look)
135 esrv_draw_look (pl);
136
137 mapinfo_queue_run ();
138
139#if HAVE_TCP_INFO
140 // check time of last ack, and, if too old, kill connection
141 socklen_t len = sizeof (tcpi);
142
143 if (!getsockopt (fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi))
144 {
145 if (tcpi.tcpi_snd_mss)
146 mss = tcpi.tcpi_snd_mss;
147
148#if 0
149 fprintf (stderr, "uack %d ack %d lost %d ret %d fack %d sst %d cwnd %d mss %d pmtu %d advmss %d EXC %d\n",
150 tcpi.tcpi_unacked,
151 tcpi.tcpi_sacked,
152 tcpi.tcpi_lost,
153 tcpi.tcpi_retrans,
154 tcpi.tcpi_fackets,
155 tcpi.tcpi_snd_ssthresh, tcpi.tcpi_snd_cwnd, tcpi.tcpi_advmss, tcpi.tcpi_pmtu, tcpi.tcpi_advmss,
156
157 tcpi.tcpi_snd_cwnd - (tcpi.tcpi_unacked - tcpi.tcpi_sacked));
158#endif
159
160 // fast-time-out a player by checking for missign acks
161 // do this only when player is active
162 if (pl && pl->active
163 && tcpi.tcpi_last_ack_recv > int (SOCKET_TIMEOUT * 1000))
225 { 164 {
226 data = (char *)ns->inbuf + 2; // better read garbage than segfault 165 send_msg (NDI_RED | NDI_REPLY, "connection-timeout", "safety disconnect due to tcp/ip timeout (no packets received)");
227 datalen = 0; 166 write_outputbuffer ();
167
168 LOG (llevDebug, "connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd,
169 (unsigned)tcpi.tcpi_last_ack_recv, (unsigned)tcpi.tcpi_last_data_sent, (unsigned)tcpi.tcpi_unacked);
170 destroy ();
228 } 171 }
172 }
173#endif
229 174
230 ns->inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */ 175 rate_avail = min (max_rate + mss, rate_avail + max_rate);
231 176
232 for (int i = 0; nscommands[i].cmdname; i++) 177 int max_send = rate_avail;
178
179#if HAVE_TCP_INFO
180 // further restrict the available bandwidth by the excess bandwidth available
181 max_send = min (max_send, (tcpi.tcpi_snd_cwnd - tcpi.tcpi_unacked + tcpi.tcpi_sacked) * mss);
182#endif
183
184 // if we can split images, round to next-lowest mss
185 if (fxix) max_send -= max_send % mss;
186
187 if (ixface.empty ())
188 {
189 // regularly send a new face when queue is empty
190 if (bg_scrub && !--bg_scrub && enable_bg_scrub)
191 while (scrub_idx < faces.size () - 1)
192 {
193 ++scrub_idx;
194
195 if (!faces_sent [scrub_idx])
196 if (faceinfo *f = face_info (scrub_idx))
197 if (f->type == FT_FACE || f->type == FT_SOUND) // only scrub faces and sounds for now
198 {
199 send_face (scrub_idx, -120);
200 flush_fx ();
201
202 bg_scrub = 1; // send up to one fx per tick, unless an image was requested
203 break;
204 }
205 }
206 }
207 else
208 {
209 bg_scrub = BG_SCRUB_RATE;
210
211 for (;;)
233 { 212 {
234 if (!strcmp ((char *)ns->inbuf + 2, nscommands[i].cmdname)) 213 int avail = max_send - outputbuffer_len ();
214
215 if (avail <= 0)
216 break;
217
218 ixsend &ix = ixface.back ();
219
220 if (facedata *d = face_data (ix.idx, faceset))
235 { 221 {
236 nscommands[i].cmdproc (data, datalen, ns); 222 if (fxix)
237 ns->skip_packet (pkt_len); 223 {
238 //D// not doing this causes random memory corruption 224 // estimate the packet header overhead "ix " + idx + (new)ofs
239 if (nscommands[i].flag & 2) 225 int pktlen = 3 + ber32::encoded_size (ix.idx) + ber32::encoded_size (ix.ofs);
240 goto next_packet; 226 int chunk = min (avail - packet::hdrlen, MAXSOCKBUF) - pktlen;
227
228 // only transfer something if the amount of data transferred
229 // has a healthy relation to the header overhead
230 if (chunk < 64)
231 break;
232
233 chunk = min (chunk, (int)ix.ofs);
234
235 ix.ofs -= chunk;
236
237 //fprintf (stderr, "i%dx %6d: %5d+%4d (%4d)\n", fxix, ix.idx,ix.ofs,chunk, ixface.size());//D
238
239 packet sl ("ix");
240
241 sl << ber32 (ix.idx)
242 << ber32 (ix.ofs)
243 << data (d->data.data () + ix.ofs, chunk);
244
245 send_packet (sl);
246 }
247 else
248 {
249 send_image (ix.idx);
250 ix.ofs = 0;
251 }
252 }
253 else
254 ix.ofs = 0;
255
256 if (!ix.ofs)
257 {
258 ixface.pop_back ();
259
260 if (ixface.empty ())
241 return; 261 break;
242 } 262 }
243 } 263 }
244
245 /* Player must be in the playing state or the flag on the
246 * the command must be zero for the user to use the command -
247 * otherwise, a player cam save, be in the play_again state, and
248 * the map they were on gets swapped out, yet things that try to look
249 * at the map causes a crash. If the command is valid, but
250 * one they can't use, we still swallow it up.
251 */
252 if (pl)
253 for (int i = 0; plcommands[i].cmdname; i++)
254 {
255 if (!strcmp ((char *)ns->inbuf + 2, plcommands[i].cmdname))
256 {
257 if (pl->state == ST_PLAYING || !(plcommands[i].flag & 1))
258 plcommands[i].cmdproc ((char *) data, datalen, pl);
259
260 ns->skip_packet (pkt_len);
261 //D// not doing this causes random memory corruption
262 if (plcommands[i].flag & 2)
263 goto next_packet;
264
265 return;
266 }
267 }
268
269 printf ("BP34n");//D
270 /* If we get here, we didn't find a valid command. Logging
271 * this might be questionable, because a broken client/malicious
272 * user could certainly send a whole bunch of invalid commands.
273 */
274 LOG (llevDebug, "Bad command from client (%s)\n", ns->inbuf + 2);
275 ns->skip_packet (pkt_len);
276 next_packet:
277 ;
278 }
279}
280
281
282/*****************************************************************************
283 *
284 * Low level socket looping - select calls and watchdog udp packet
285 * sending.
286 *
287 ******************************************************************************/
288
289#ifdef WATCHDOG
290
291/**
292 * Tell watchdog that we are still alive
293 *
294 * I put the function here since we should hopefully already be getting
295 * all the needed include files for socket support
296 */
297
298void
299watchdog (void)
300{
301 static int fd = -1;
302 static struct sockaddr_in insock;
303
304 if (fd == -1)
305 {
306 struct protoent *protoent;
307
308 if ((protoent = getprotobyname ("udp")) == NULL || (fd = socket (PF_INET, SOCK_DGRAM, protoent->p_proto)) == -1)
309 {
310 return;
311 }
312 insock.sin_family = AF_INET;
313 insock.sin_port = htons ((unsigned short) 13325);
314 insock.sin_addr.s_addr = inet_addr ("127.0.0.1");
315 }
316 sendto (fd, (void *) &fd, 1, 0, (struct sockaddr *) &insock, sizeof (insock));
317}
318#endif
319
320void
321flush_sockets (void)
322{
323 player *pl;
324
325 for (pl = first_player; pl != NULL; pl = pl->next)
326 if (pl->socket.status != Ns_Dead)
327 Socket_Flush (&pl->socket);
328}
329
330/**
331 * This checks the sockets for input, does the right thing.
332 *
333 * A bit of this code is grabbed out of socket.c
334 * There are 2 lists we need to look through - init_sockets is a list
335 *
336 */
337void
338doeric_server (void)
339{
340 int i, pollret;
341 fd_set tmp_read, tmp_write;
342 struct sockaddr_in addr;
343 socklen_t addrlen = sizeof (struct sockaddr);
344 player *pl, *next;
345
346#ifdef CS_LOGSTATS
347 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME)
348 write_cs_stats ();
349#endif
350
351 FD_ZERO (&tmp_read);
352 FD_ZERO (&tmp_write);
353
354 for (i = 0; i < socket_info.allocated_sockets; i++)
355 {
356 if (init_sockets[i].status == Ns_Dead)
357 {
358 free_newsocket (&init_sockets[i]);
359 init_sockets[i].status = Ns_Avail;
360 socket_info.nconns--;
361 }
362 else if (init_sockets[i].status != Ns_Avail)
363 {
364 FD_SET (init_sockets[i].fd, &tmp_read);
365 FD_SET (init_sockets[i].fd, &tmp_write);
366 }
367 }
368
369 /* Go through the players. Let the loop set the next pl value,
370 * since we may remove some
371 */
372 for (pl = first_player; pl != NULL;)
373 {
374 if (pl->socket.status == Ns_Dead)
375 {
376 player *npl = pl->next;
377
378 save_player (pl->ob, 0);
379
380 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
381 {
382 terminate_all_pets (pl->ob);
383 pl->ob->remove ();
384 }
385
386 leave (pl, 1);
387 final_free_player (pl);
388 pl = npl;
389 }
390 else
391 {
392 FD_SET ((uint32) pl->socket.fd, &tmp_read);
393 FD_SET ((uint32) pl->socket.fd, &tmp_write);
394 pl = pl->next;
395 }
396 }
397
398 /* Reset timeout each time, since some OS's will change the values on
399 * the return from select.
400 */
401 socket_info.timeout.tv_sec = 0;
402 socket_info.timeout.tv_usec = 0;
403
404 pollret = select (socket_info.max_filedescriptor,
405 &tmp_read, &tmp_write, 0,
406 &socket_info.timeout);
407
408 if (pollret == -1)
409 {
410 LOG (llevError, "select failed: %s\n", strerror (errno));
411 return;
412 }
413
414 /* We need to do some of the processing below regardless */
415
416/* if (!pollret) return;*/
417
418 /* Following adds a new connection */
419 if (pollret && FD_ISSET (init_sockets[0].fd, &tmp_read))
420 {
421 int newsocknum = 0;
422
423#ifdef ESRV_DEBUG
424 LOG (llevDebug, "doeric_server: New Connection\n");
425#endif
426 /* If this is the case, all sockets currently in used */
427 if (socket_info.allocated_sockets <= socket_info.nconns)
428 {
429 init_sockets = (NewSocket *) realloc (init_sockets, sizeof (NewSocket) * (socket_info.nconns + 1));
430 if (!init_sockets)
431 fatal (OUT_OF_MEMORY);
432 newsocknum = socket_info.allocated_sockets;
433 socket_info.allocated_sockets++;
434 init_sockets[newsocknum].faces_sent_len = nrofpixmaps;
435 init_sockets[newsocknum].faces_sent = (uint8 *) malloc (nrofpixmaps * sizeof (*init_sockets[newsocknum].faces_sent));
436 if (!init_sockets[newsocknum].faces_sent)
437 fatal (OUT_OF_MEMORY);
438 init_sockets[newsocknum].status = Ns_Avail;
439 }
440 else
441 {
442 int j;
443
444 for (j = 1; j < socket_info.allocated_sockets; j++)
445 if (init_sockets[j].status == Ns_Avail)
446 {
447 newsocknum = j;
448 break;
449 }
450 }
451
452 init_sockets[newsocknum].fd = accept (init_sockets[0].fd, (struct sockaddr *) &addr, &addrlen);
453
454 if (init_sockets[newsocknum].fd == -1)
455 LOG (llevError, "accept failed: %s\n", strerror (errno));
456 else
457 {
458 char buf[MAX_BUF];
459 long ip;
460 NewSocket *ns;
461
462 ns = &init_sockets[newsocknum];
463
464 ip = ntohl (addr.sin_addr.s_addr);
465 sprintf (buf, "%ld.%ld.%ld.%ld", (ip >> 24) & 255, (ip >> 16) & 255, (ip >> 8) & 255, ip & 255);
466
467 if (checkbanned (NULL, buf))
468 {
469 LOG (llevInfo, "Banned host tried to connect: [%s]\n", buf);
470 close (init_sockets[newsocknum].fd);
471 init_sockets[newsocknum].fd = -1;
472 }
473 else
474 {
475 InitConnection (ns, buf);
476 socket_info.nconns++;
477 }
478 }
479 }
480
481 /* Check for any input on the sockets */
482 if (pollret)
483 for (i = 1; i < socket_info.allocated_sockets; i++)
484 {
485 if (init_sockets[i].status == Ns_Avail)
486 continue;
487
488 //TODO: disassociate handleclient from socket readin
489 if (init_sockets[i].inbuf_len || FD_ISSET (init_sockets[i].fd, &tmp_read))
490 HandleClient (&init_sockets[i], NULL);
491
492 if (FD_ISSET (init_sockets[i].fd, &tmp_write))
493 init_sockets[i].can_write = 1;
494 } 264 }
495 265
496 /* This does roughly the same thing, but for the players now */ 266 rate_avail -= outputbuffer_len ();
497 for (pl = first_player; pl != NULL; pl = next)
498 {
499
500 next = pl->next;
501 if (pl->socket.status == Ns_Dead)
502 continue;
503
504 if (FD_ISSET (pl->socket.fd, &tmp_write))
505 {
506 if (!pl->socket.can_write)
507 {
508#if 0
509 LOG (llevDebug, "Player %s socket now write enabled\n", pl->ob->name);
510#endif
511 pl->socket.can_write = 1;
512 write_socket_buffer (&pl->socket);
513 }
514
515 /* if we get an error on the write_socket buffer, no reason to
516 * continue on this socket.
517 */
518 if (pl->socket.status == Ns_Dead)
519 continue;
520 }
521 else
522 pl->socket.can_write = 0;
523
524 HandleClient (&pl->socket, pl);
525 /* If the player has left the game, then the socket status
526 * will be set to this be the leave function. We don't
527 * need to call leave again, as it has already been called
528 * once.
529 */
530 if (pl->socket.status == Ns_Dead)
531 {
532 save_player (pl->ob, 0);
533
534 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
535 {
536 terminate_all_pets (pl->ob);
537 pl->ob->remove ();
538 }
539
540 leave (pl, 1);
541 final_free_player (pl);
542 }
543 else
544 {
545 /* Update the players stats once per tick. More efficient than
546 * sending them whenever they change, and probably just as useful
547 */
548 esrv_update_stats (pl);
549 if (pl->last_weight != -1 && pl->last_weight != WEIGHT (pl->ob))
550 {
551 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
552 if (pl->last_weight != WEIGHT (pl->ob))
553 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n",
554 (unsigned long) pl->last_weight, WEIGHT (pl->ob));
555 }
556
557 /* draw_client_map does sanity checking that map is
558 * valid, so don't do it here.
559 */
560 draw_client_map (pl->ob);
561 if (pl->socket.update_look)
562 esrv_draw_look (pl->ob);
563 }
564 }
565} 267}
566 268
269void
270client::flush_sockets (void)
271{
272 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
273 (*i)->flush ();
274}
275
276void
277client::clock (void)
278{
279 for (sockvec::iterator i = clients.begin (); i != clients.end (); ++i)
280 (*i)->tick ();
281
282 // give them all the same chances
283 flush_sockets ();
284
285 //TODO: should not be done here, either
286 for (unsigned i = 0; i < clients.size (); ++i)
287 clients[i]->refcnt_chk ();
288}
289

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines