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.6 by root, Sun Sep 10 13:43:33 2006 UTC vs.
Revision 1.14 by root, Thu Dec 14 04:30:33 2006 UTC

1
2/*
3 * static char *rcsid_loop_c =
4 * "$Id: loop.C,v 1.6 2006/09/10 13:43:33 root Exp $";
5 */
6
7/* 1/*
8 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
9 3
10 Copyright (C) 2002-2003 Mark Wedel & The Crossfire Development Team 4 Copyright (C) 2002-2003 Mark Wedel & The Crossfire Development Team
11 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
… …
22 16
23 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
24 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
25 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
26 20
27 The author can be reached via e-mail to crossfire-devel@real-time.com 21 The author can be reached via e-mail to <crossfire@schmorp.de>
28*/ 22*/
29 23
30/** 24/**
31 * \file 25 * \file
32 * Main client/server loops. 26 * Main client/server loops.
… …
38 * The reading of data is handled in ericserver.c 32 * The reading of data is handled in ericserver.c
39 */ 33 */
40 34
41 35
42#include <global.h> 36#include <global.h>
43#ifndef __CEXTRACT__
44# include <sproto.h> 37#include <sproto.h>
45# include <sockproto.h> 38#include <sockproto.h>
46#endif
47 39
48#ifndef WIN32 /* ---win32 exclude unix headers */
49# include <sys/types.h> 40#include <sys/types.h>
50# include <sys/time.h> 41#include <sys/time.h>
51# include <sys/socket.h> 42#include <sys/socket.h>
52# include <netinet/in.h> 43#include <netinet/in.h>
53# include <netdb.h> 44#include <netdb.h>
54#endif /* end win32 */
55 45
56#ifdef HAVE_UNISTD_H 46#ifdef HAVE_UNISTD_H
57# include <unistd.h> 47# include <unistd.h>
58#endif 48#endif
59 49
… …
75 * before player joins, and those happen after the player has joined. 65 * before player joins, and those happen after the player has joined.
76 * As such, we have function types that might be called, so 66 * As such, we have function types that might be called, so
77 * we end up having 2 tables. 67 * we end up having 2 tables.
78 */ 68 */
79 69
80typedef void (*func_uint8_int_ns) (char *, int, NewSocket *); 70typedef void (*func_uint8_int_ns) (char *, int, client_socket *);
81 71
82struct NsCmdMapping 72struct NsCmdMapping
83{ 73{
84 const char *cmdname; 74 const char *cmdname;
85 func_uint8_int_ns cmdproc; 75 func_uint8_int_ns cmdproc;
76 uint8 flag;
86}; 77};
87 78
88typedef void (*func_uint8_int_pl) (char *, int, player *); 79typedef void (*func_uint8_int_pl) (char *, int, player *);
89struct PlCmdMapping 80struct PlCmdMapping
90{ 81{
… …
117 {"lock", (func_uint8_int_pl) LockItem, 1}, 108 {"lock", (func_uint8_int_pl) LockItem, 1},
118 {"mark", (func_uint8_int_pl) MarkItem, 1}, 109 {"mark", (func_uint8_int_pl) MarkItem, 1},
119 {"mapredraw", MapRedrawCmd, 0}, /* Added: phil */ 110 {"mapredraw", MapRedrawCmd, 0}, /* Added: phil */
120 {"mapinfo", MapInfoCmd, 2}, /* CF+ */ 111 {"mapinfo", MapInfoCmd, 2}, /* CF+ */
121 {"ext", ExtCmd, 2}, /* CF+ */ 112 {"ext", ExtCmd, 2}, /* CF+ */
122 {NULL, NULL, 0} /* terminator */ 113 { 0 } /* terminator */
123}; 114};
124 115
125/** Face-related commands */ 116/** Face-related commands */
126static struct NsCmdMapping nscommands[] = { 117static struct NsCmdMapping nscommands[] = {
127 {"addme", AddMeCmd}, 118 {"addme", AddMeCmd, 2},
128 {"askface", SendFaceCmd}, /* Added: phil */ 119 {"askface", SendFaceCmd}, /* Added: phil */
129 {"requestinfo", RequestInfo}, 120 {"requestinfo", RequestInfo},
130 {"setfacemode", SetFaceMode}, 121 {"setfacemode", SetFaceMode, 2},
131 {"setsound", SetSound}, 122 {"setsound", SetSound, 2},
132 {"setup", SetUp}, 123 {"setup", SetUp, 2},
133 {"version", VersionCmd}, 124 {"version", VersionCmd, 2},
134 {"toggleextendedinfos", ToggleExtendedInfos}, /*Added: tchize */ 125 {"toggleextendedinfos", ToggleExtendedInfos, 2}, /*Added: tchize */
135 {"toggleextendedtext", ToggleExtendedText}, /*Added: tchize */ 126 {"toggleextendedtext", ToggleExtendedText, 2}, /*Added: tchize */
136 {"asksmooth", AskSmooth}, /*Added: tchize (smoothing technologies) */ 127 {"asksmooth", AskSmooth}, /*Added: tchize (smoothing technologies) */
137 {NULL, NULL} /* terminator (I, II & III) */ 128 { 0 } /* terminator (I, II & III) */
138}; 129};
139 130
140/** 131/**
141 * RequestInfo is sort of a meta command. There is some specific 132 * RequestInfo is sort of a meta command. There is some specific
142 * request of information, but we call other functions to provide 133 * request of information, but we call other functions to provide
143 * that information. 134 * that information.
144 */ 135 */
145void 136void
146RequestInfo (char *buf, int len, NewSocket * ns) 137RequestInfo (char *buf, int len, client_socket * ns)
147{ 138{
148 char *params = NULL, *cp; 139 char *params = NULL, *cp;
149 140
150 /* No match */ 141 /* No match */
151 char bigbuf[MAX_BUF]; 142 char bigbuf[MAX_BUF];
… …
166 { 157 {
167 *cp = '\0'; 158 *cp = '\0';
168 params = cp + 1; 159 params = cp + 1;
169 break; 160 break;
170 } 161 }
162
171 if (!strcmp (buf, "image_info")) 163 if (!strcmp (buf, "image_info"))
172 send_image_info (ns, params); 164 send_image_info (ns, params);
173 else if (!strcmp (buf, "image_sums")) 165 else if (!strcmp (buf, "image_sums"))
174 send_image_sums (ns, params); 166 send_image_sums (ns, params);
175 else if (!strcmp (buf, "skill_info")) 167 else if (!strcmp (buf, "skill_info"))
176 send_skill_info (ns, params); 168 send_skill_info (ns, params);
177 else if (!strcmp (buf, "spell_paths")) 169 else if (!strcmp (buf, "spell_paths"))
178 send_spell_paths (ns, params); 170 send_spell_paths (ns, params);
179 else 171 else
180 Write_String_To_Socket (ns, bigbuf, len); 172 ns->send_packet (bigbuf, len);
181} 173}
182 174
183/** 175/**
184 * Handle client input. 176 * Handle client input.
185 * 177 *
… …
189 * with this socket, null if no player (one of the init_sockets for just 181 * with this socket, null if no player (one of the init_sockets for just
190 * starting a connection) 182 * starting a connection)
191 */ 183 */
192 184
193void 185void
194HandleClient (NewSocket * ns, player *pl) 186HandleClient (client_socket *ns, player *pl)
195{ 187{
196 int len = 0, i, cnt;
197 char *data;
198
199 /* Loop through this - maybe we have several complete packets here. */ 188 /* Loop through this - maybe we have several complete packets here. */
200 // limit to a few commands only, though, as to not monopolise the server 189 // limit to a few commands only, though, as to not monopolise the server
201 for (cnt = 16; cnt--;) 190 for (int repeat = 16; repeat--;)
202 { 191 {
203 /* If it is a player, and they don't have any speed left, we 192 /* If it is a player, and they don't have any speed left, we
204 * return, and will read in the data when they do have time. 193 * return, and will read in the data when they do have time.
205 */ 194 */
206 if (pl && pl->state == ST_PLAYING && pl->ob != NULL && pl->ob->speed_left < 0) 195 if (pl && pl->state == ST_PLAYING && pl->ob && pl->ob->speed_left < 0)
207 {
208 return; 196 return;
197
198 int pkt_len = ns->read_packet ();
199
200 if (pkt_len < 0)
209 } 201 {
210 202 LOG (llevError, "read error on player %s\n", &pl->ob->name);
211 i = SockList_ReadPacket (ns->fd, &ns->inbuf, MAXSOCKBUF - 1);
212
213 if (i < 0)
214 {
215#ifdef ESRV_DEBUG
216 LOG (llevDebug, "HandleClient: Read error on connection player %s\n", (pl ? pl->ob->name : "None"));
217#endif
218 /* Caller will take care of cleaning this up */ 203 /* Caller will take care of cleaning this up */
219 ns->status = Ns_Dead; 204 ns->status = Ns_Dead;
220 return; 205 return;
221 } 206 }
207 else if (pkt_len == 0)
222 /* Still dont have a full packet */ 208 /* Still dont have a full packet */
223 if (i == 0)
224 return; 209 return;
225
226// //D//TODO//temporarily log long commands
227// if (ns->inbuf.len >= 40 && pl && pl->ob)
228// LOG (llevDebug, "HandleClient: long comamnd from <%s,%s> %d<%s>\n", pl->ob->name, ns->host, ns->inbuf.len, ns->inbuf.buf + 2);
229 210
230 /* First, break out beginning word. There are at least 211 /* First, break out beginning word. There are at least
231 * a few commands that do not have any paremeters. If 212 * a few commands that do not have any paremeters. If
232 * we get such a command, don't worry about trying 213 * we get such a command, don't worry about trying
233 * to break it up. 214 * to break it up.
234 */ 215 */
216 int datalen;
235 data = (char *) strchr ((char *) ns->inbuf.buf + 2, ' '); 217 char *data = strchr ((char *)ns->inbuf + 2, ' ');
218
236 if (data) 219 if (data)
237 { 220 {
238 *data = '\0'; 221 *data++ = 0;
239 data++; 222 datalen = pkt_len - (data - (char *)ns->inbuf);
240 len = ns->inbuf.len - (data - (char *) ns->inbuf.buf);
241 } 223 }
242 else 224 else
225 {
226 data = (char *)ns->inbuf + 2; // better read garbage than segfault
243 len = 0; 227 datalen = 0;
244
245 ns->inbuf.buf[ns->inbuf.len] = '\0'; /* Terminate buffer - useful for string data */
246 for (i = 0; nscommands[i].cmdname != NULL; i++)
247 { 228 }
229
230 ns->inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */
231
232 for (int i = 0; nscommands[i].cmdname; i++)
233 {
248 if (strcmp ((char *) ns->inbuf.buf + 2, nscommands[i].cmdname) == 0) 234 if (!strcmp ((char *)ns->inbuf + 2, nscommands[i].cmdname))
249 { 235 {
250 nscommands[i].cmdproc ((char *) data, len, ns); 236 nscommands[i].cmdproc (data, datalen, ns);
251 ns->inbuf.len = 0; 237 ns->skip_packet (pkt_len);
252 return; //D// not doing this causes random memory corruption 238 //D// not doing this causes random memory corruption
239 if (nscommands[i].flag & 2)
253 goto next_packet; 240 goto next_packet;
241 return;
254 } 242 }
255 } 243 }
244
256 /* Player must be in the playing state or the flag on the 245 /* Player must be in the playing state or the flag on the
257 * the command must be zero for the user to use the command - 246 * the command must be zero for the user to use the command -
258 * otherwise, a player cam save, be in the play_again state, and 247 * otherwise, a player cam save, be in the play_again state, and
259 * the map they were on gets swapped out, yet things that try to look 248 * the map they were on gets swapped out, yet things that try to look
260 * at the map causes a crash. If the command is valid, but 249 * at the map causes a crash. If the command is valid, but
261 * one they can't use, we still swallow it up. 250 * one they can't use, we still swallow it up.
262 */ 251 */
263 if (pl) 252 if (pl)
264 for (i = 0; plcommands[i].cmdname != NULL; i++) 253 for (int i = 0; plcommands[i].cmdname; i++)
265 { 254 {
266 if (strcmp ((char *) ns->inbuf.buf + 2, plcommands[i].cmdname) == 0) 255 if (!strcmp ((char *)ns->inbuf + 2, plcommands[i].cmdname))
267 { 256 {
268 if (pl->state == ST_PLAYING || !(plcommands[i].flag & 1)) 257 if (pl->state == ST_PLAYING || !(plcommands[i].flag & 1))
269 plcommands[i].cmdproc ((char *) data, len, pl); 258 plcommands[i].cmdproc ((char *) data, datalen, pl);
270 ns->inbuf.len = 0; 259
260 ns->skip_packet (pkt_len);
271 //D// not doing this causes random memory corruption 261 //D// not doing this causes random memory corruption
272 if (plcommands[i].flag & 2) 262 if (plcommands[i].flag & 2)
273 goto next_packet; 263 goto next_packet;
264
274 return; 265 return;
275 } 266 }
276 } 267 }
268
277 /* If we get here, we didn't find a valid command. Logging 269 /* If we get here, we didn't find a valid command. Logging
278 * this might be questionable, because a broken client/malicious 270 * this might be questionable, because a broken client/malicious
279 * user could certainly send a whole bunch of invalid commands. 271 * user could certainly send a whole bunch of invalid commands.
280 */ 272 */
281 LOG (llevDebug, "Bad command from client (%s)\n", ns->inbuf.buf + 2); 273 LOG (llevDebug, "Bad command from client (%s)\n", ns->inbuf + 2);
274 ns->skip_packet (pkt_len);
282 next_packet: 275 next_packet:
283 ; 276 ;
284 } 277 }
285} 278}
286 279
… …
327flush_sockets (void) 320flush_sockets (void)
328{ 321{
329 player *pl; 322 player *pl;
330 323
331 for (pl = first_player; pl != NULL; pl = pl->next) 324 for (pl = first_player; pl != NULL; pl = pl->next)
332 if (pl->socket.status != Ns_Dead) 325 if (pl->socket->status != Ns_Dead)
333 Socket_Flush (&pl->socket); 326 Socket_Flush (pl->socket);
334} 327}
335 328
336/** 329/**
337 * This checks the sockets for input and exceptions, does the right thing. 330 * This checks the sockets for input, does the right thing.
338 * 331 *
339 * A bit of this code is grabbed out of socket.c 332 * A bit of this code is grabbed out of socket.c
340 * There are 2 lists we need to look through - init_sockets is a list 333 * There are 2 lists we need to look through - init_sockets is a list
341 * 334 *
342 */ 335 */
343void 336void
344doeric_server (void) 337doeric_server (void)
345{ 338{
346 int i, pollret; 339 int i, pollret;
347 fd_set tmp_read, tmp_exceptions, tmp_write; 340 fd_set tmp_read, tmp_write;
348 struct sockaddr_in addr; 341 struct sockaddr_in addr;
349 socklen_t addrlen = sizeof (struct sockaddr); 342 socklen_t addrlen = sizeof (struct sockaddr);
350 player *pl, *next; 343 player *pl, *next;
344 int maxfd = 0;
351 345
352#ifdef CS_LOGSTATS 346#ifdef CS_LOGSTATS
353 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME) 347 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME)
354 write_cs_stats (); 348 write_cs_stats ();
355#endif 349#endif
356 350
357 FD_ZERO (&tmp_read);
358 FD_ZERO (&tmp_write);
359 FD_ZERO (&tmp_exceptions);
360
361 for (i = 0; i < socket_info.allocated_sockets; i++)
362 {
363 if (init_sockets[i].status == Ns_Dead)
364 {
365 free_newsocket (&init_sockets[i]);
366 init_sockets[i].status = Ns_Avail;
367 socket_info.nconns--;
368 }
369 else if (init_sockets[i].status != Ns_Avail)
370 {
371 FD_SET ((uint32) init_sockets[i].fd, &tmp_read);
372 FD_SET ((uint32) init_sockets[i].fd, &tmp_write);
373 FD_SET ((uint32) init_sockets[i].fd, &tmp_exceptions);
374 }
375 }
376
377 /* Go through the players. Let the loop set the next pl value, 351 /* Go through the players. Let the loop set the next pl value,
378 * since we may remove some 352 * since we may remove some
379 */ 353 */
354 //TODO: must be handled cleanly elsewhere
380 for (pl = first_player; pl != NULL;) 355 for (pl = first_player; pl; )
381 { 356 {
357 player *npl = pl->next;
358
359 //TODO: must be handled cleanly elsewhere
382 if (pl->socket.status == Ns_Dead) 360 if (pl->socket->status == Ns_Dead)
383 { 361 {
384 player *npl = pl->next;
385
386 save_player (pl->ob, 0); 362 save_player (pl->ob, 0);
363
387 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) 364 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
388 { 365 {
389 terminate_all_pets (pl->ob); 366 terminate_all_pets (pl->ob);
390 remove_ob (pl->ob); 367 pl->ob->remove ();
391 } 368 }
369
392 leave (pl, 1); 370 leave (pl, 1);
393 final_free_player (pl); 371 final_free_player (pl);
372 }
373
394 pl = npl; 374 pl = npl;
375 }
376
377 FD_ZERO (&tmp_read);
378 FD_ZERO (&tmp_write);
379
380 for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); )
381 {
382 client_socket *s = *i;
383
384 if (s->status == Ns_Dead)
385 {
386 client_sockets.erase (i);
387 delete s;
395 } 388 }
396 else 389 else
397 { 390 {
391 if (s->fd > maxfd) maxfd = s->fd;
392
398 FD_SET ((uint32) pl->socket.fd, &tmp_read); 393 FD_SET (s->fd, &tmp_read);
394
395 if (s->outputbuffer.len)
399 FD_SET ((uint32) pl->socket.fd, &tmp_write); 396 FD_SET (s->fd, &tmp_write);
400 FD_SET ((uint32) pl->socket.fd, &tmp_exceptions);
401 pl = pl->next;
402 }
403 }
404 397
405 /* Reset timeout each time, since some OS's will change the values on 398 ++i;
406 * the return from select. 399 }
407 */ 400 }
401
402 struct timeval timeout;
403
408 socket_info.timeout.tv_sec = 0; 404 timeout.tv_sec = 0;
409 socket_info.timeout.tv_usec = 0; 405 timeout.tv_usec = 0;
410 406
411 pollret = select (socket_info.max_filedescriptor, &tmp_read, &tmp_write, &tmp_exceptions, &socket_info.timeout); 407 pollret = select (maxfd + 1,
408 &tmp_read, &tmp_write, 0,
409 &timeout);
412 410
413 if (pollret == -1) 411 if (pollret == -1)
414 { 412 {
415 LOG (llevError, "select failed: %s\n", strerror (errno)); 413 LOG (llevError, "select failed: %s\n", strerror (errno));
416 return; 414 return;
417 } 415 }
418 416
419 /* We need to do some of the processing below regardless */ 417 /* We need to do some of the processing below regardless */
420 418
421/* if (!pollret) return;*/ 419 /* Check for any input on the sockets */
422 420 for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); ++i)
423 /* Following adds a new connection */
424 if (pollret && FD_ISSET (init_sockets[0].fd, &tmp_read))
425 { 421 {
426 int newsocknum = 0; 422 client_socket *s = *i;
423 player *pl = s->pl;
427 424
428#ifdef ESRV_DEBUG 425 //TODO: writing should be independent of tick
429 LOG (llevDebug, "doeric_server: New Connection\n"); 426 if (FD_ISSET (s->fd, &tmp_write))
430#endif
431 /* If this is the case, all sockets currently in used */
432 if (socket_info.allocated_sockets <= socket_info.nconns)
433 {
434 init_sockets = (NewSocket *) realloc (init_sockets, sizeof (NewSocket) * (socket_info.nconns + 1));
435 if (!init_sockets)
436 fatal (OUT_OF_MEMORY);
437 newsocknum = socket_info.allocated_sockets;
438 socket_info.allocated_sockets++;
439 init_sockets[newsocknum].faces_sent_len = nrofpixmaps;
440 init_sockets[newsocknum].faces_sent = (uint8 *) malloc (nrofpixmaps * sizeof (*init_sockets[newsocknum].faces_sent));
441 if (!init_sockets[newsocknum].faces_sent)
442 fatal (OUT_OF_MEMORY);
443 init_sockets[newsocknum].status = Ns_Avail;
444 } 427 {
445 else 428 s->can_write = 1;
429 write_socket_buffer (s);
446 { 430 }
447 int j;
448 431
449 for (j = 1; j < socket_info.allocated_sockets; j++) 432 //TODO: disassociate handleclient from socket readin
450 if (init_sockets[j].status == Ns_Avail) 433 if (s->inbuf_len || FD_ISSET (s->fd, &tmp_read))
451 { 434 HandleClient (s, pl);
452 newsocknum = j; 435
453 break; 436 //TODO: should not be done here, either
454 } 437 if (s->status != Ns_Dead && pl)
455 } 438 {
456 init_sockets[newsocknum].fd = accept (init_sockets[0].fd, (struct sockaddr *) &addr, &addrlen); 439 /* Update the players stats once per tick. More efficient than
457 if (init_sockets[newsocknum].fd == -1) 440 * sending them whenever they change, and probably just as useful
458 { 441 */
459 LOG (llevError, "accept failed: %s\n", strerror (errno)); 442 esrv_update_stats (pl);
460 } 443 if (pl->last_weight != -1 && pl->last_weight != WEIGHT (pl->ob))
461 else
462 {
463 char buf[MAX_BUF];
464 long ip;
465 NewSocket *ns;
466
467 ns = &init_sockets[newsocknum];
468
469 ip = ntohl (addr.sin_addr.s_addr);
470 sprintf (buf, "%ld.%ld.%ld.%ld", (ip >> 24) & 255, (ip >> 16) & 255, (ip >> 8) & 255, ip & 255);
471
472 if (checkbanned (NULL, buf))
473 { 444 {
474 LOG (llevInfo, "Banned host tried to connect: [%s]\n", buf); 445 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
475 close (init_sockets[newsocknum].fd); 446 if (pl->last_weight != WEIGHT (pl->ob))
476 init_sockets[newsocknum].fd = -1; 447 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n",
448 (unsigned long) pl->last_weight, WEIGHT (pl->ob));
477 } 449 }
478 else
479 {
480 InitConnection (ns, buf);
481 socket_info.nconns++;
482 }
483 }
484 }
485 450
486 /* Check for any exceptions/input on the sockets */ 451 /* draw_client_map does sanity checking that map is
487 if (pollret) 452 * valid, so don't do it here.
488 for (i = 1; i < socket_info.allocated_sockets; i++)
489 {
490 if (init_sockets[i].status == Ns_Avail)
491 continue;
492 if (FD_ISSET (init_sockets[i].fd, &tmp_exceptions))
493 {
494 free_newsocket (&init_sockets[i]);
495 init_sockets[i].status = Ns_Avail;
496 socket_info.nconns--;
497 continue;
498 }
499 if (FD_ISSET (init_sockets[i].fd, &tmp_read))
500 {
501 HandleClient (&init_sockets[i], NULL);
502 }
503 if (FD_ISSET (init_sockets[i].fd, &tmp_write))
504 {
505 init_sockets[i].can_write = 1;
506 }
507 }
508
509 /* This does roughly the same thing, but for the players now */
510 for (pl = first_player; pl != NULL; pl = next)
511 {
512
513 next = pl->next;
514 if (pl->socket.status == Ns_Dead)
515 continue;
516
517 if (FD_ISSET (pl->socket.fd, &tmp_write))
518 {
519 if (!pl->socket.can_write)
520 {
521#if 0
522 LOG (llevDebug, "Player %s socket now write enabled\n", pl->ob->name);
523#endif
524 pl->socket.can_write = 1;
525 write_socket_buffer (&pl->socket);
526 }
527 /* if we get an error on the write_socket buffer, no reason to
528 * continue on this socket.
529 */ 453 */
530 if (pl->socket.status == Ns_Dead)
531 continue;
532 }
533 else
534 pl->socket.can_write = 0;
535
536 if (FD_ISSET (pl->socket.fd, &tmp_exceptions))
537 {
538 save_player (pl->ob, 0);
539 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
540 {
541 terminate_all_pets (pl->ob);
542 remove_ob (pl->ob);
543 }
544 leave (pl, 1);
545 final_free_player (pl);
546 }
547 else
548 {
549 HandleClient (&pl->socket, pl);
550 /* If the player has left the game, then the socket status
551 * will be set to this be the leave function. We don't
552 * need to call leave again, as it has already been called
553 * once.
554 */
555 if (pl->socket.status == Ns_Dead)
556 {
557 save_player (pl->ob, 0);
558 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
559 {
560 terminate_all_pets (pl->ob);
561 remove_ob (pl->ob);
562 }
563 leave (pl, 1);
564 final_free_player (pl);
565 }
566 else
567 {
568
569 /* Update the players stats once per tick. More efficient than
570 * sending them whenever they change, and probably just as useful
571 */
572 esrv_update_stats (pl);
573 if (pl->last_weight != -1 && pl->last_weight != WEIGHT (pl->ob))
574 {
575 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
576 if (pl->last_weight != WEIGHT (pl->ob))
577 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n",
578 (unsigned long) pl->last_weight, WEIGHT (pl->ob));
579 }
580 /* draw_client_map does sanity checking that map is
581 * valid, so don't do it here.
582 */
583 draw_client_map (pl->ob); 454 draw_client_map (pl->ob);
584 if (pl->socket.update_look) 455 if (s->update_look)
585 esrv_draw_look (pl->ob); 456 esrv_draw_look (pl->ob);
586 }
587 } 457 }
588 } 458 }
589} 459}
460

Diff Legend

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