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.9 by root, Tue Dec 12 20:53:03 2006 UTC vs.
Revision 1.16 by root, Thu Dec 14 22:45:41 2006 UTC

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

Diff Legend

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