… | |
… | |
41 | #include <sys/time.h> |
41 | #include <sys/time.h> |
42 | #include <sys/socket.h> |
42 | #include <sys/socket.h> |
43 | #include <netinet/in.h> |
43 | #include <netinet/in.h> |
44 | #include <netdb.h> |
44 | #include <netdb.h> |
45 | |
45 | |
46 | #ifdef HAVE_UNISTD_H |
|
|
47 | # include <unistd.h> |
46 | #include <unistd.h> |
48 | #endif |
|
|
49 | |
|
|
50 | #ifdef HAVE_ARPA_INET_H |
|
|
51 | # include <arpa/inet.h> |
47 | #include <arpa/inet.h> |
52 | #endif |
|
|
53 | |
48 | |
54 | #include <loader.h> |
49 | #include <loader.h> |
55 | #include <newserver.h> |
50 | #include <newserver.h> |
56 | |
51 | |
57 | /***************************************************************************** |
52 | /***************************************************************************** |
… | |
… | |
65 | * before player joins, and those happen after the player has joined. |
60 | * before player joins, and those happen after the player has joined. |
66 | * As such, we have function types that might be called, so |
61 | * As such, we have function types that might be called, so |
67 | * we end up having 2 tables. |
62 | * we end up having 2 tables. |
68 | */ |
63 | */ |
69 | |
64 | |
70 | typedef void (*func_uint8_int_ns) (char *, int, client_socket *); |
65 | enum { |
71 | |
66 | PF_PLAYER = 0x01, // must have valid player |
72 | struct NsCmdMapping |
67 | PF_IMMEDIATE = 0x02, // TODO: hack, can be executed immediately |
73 | { |
68 | PF_PLAYING = 0x04, // must be in playing state |
74 | const char *cmdname; |
|
|
75 | func_uint8_int_ns cmdproc; |
|
|
76 | uint8 flag; |
|
|
77 | }; |
69 | }; |
78 | |
70 | |
79 | typedef void (*func_uint8_int_pl) (char *, int, player *); |
71 | struct pkt_type |
80 | struct PlCmdMapping |
|
|
81 | { |
72 | { |
82 | const char *cmdname; |
73 | const char *name; |
83 | func_uint8_int_pl cmdproc; |
74 | void *cb; |
84 | uint8 flag; |
75 | int flags; |
|
|
76 | |
|
|
77 | bool may_execute (client_socket *ns) |
|
|
78 | { |
|
|
79 | return (!(flags & PF_PLAYER) || ns->pl) |
|
|
80 | && (!(flags & PF_PLAYING) || (ns->pl && ns->pl->state == ST_PLAYING)); |
|
|
81 | } |
|
|
82 | |
|
|
83 | void execute (client_socket *ns, char *data, int datalen) |
|
|
84 | { |
|
|
85 | //TODO: only one format |
|
|
86 | if (flags & PF_PLAYER) |
|
|
87 | ((void (*)(char *, int, player * ))cb)((char *)data, datalen, ns->pl); |
|
|
88 | else |
|
|
89 | ((void (*)(char *, int, client_socket *))cb)((char *)data, datalen, ns); |
|
|
90 | } |
85 | }; |
91 | }; |
86 | |
92 | |
|
|
93 | // SocketCommand, PlayingCommand, should not exist with those ugly casts |
|
|
94 | #define SC(cb) (void *)static_cast<void (*)(char *, int, client_socket *)>(cb), |
|
|
95 | #define PC(cb) (void *)static_cast<void (*)(char *, int, player *)>(cb), PF_PLAYER | |
|
|
96 | |
87 | /** |
97 | /** |
88 | * Dispatch table for the server. |
98 | * Dispatch table for the server. |
89 | * |
99 | */ |
90 | * CmdMapping is the dispatch table for the server, used in HandleClient, |
100 | static struct pkt_type packets[] = { |
91 | * which gets called when the client has input. All commands called here |
101 | {"ncom", PC(NewPlayerCmd) PF_PLAYING }, |
92 | * use the same parameter form (char* data, int len, int clientnum. |
102 | {"command", PC(PlayerCmd) PF_PLAYING }, |
93 | * We do implicit casts, because the data that is being passed is |
103 | |
94 | * unsigned (pretty much needs to be for binary data), however, most |
104 | {"examine", PC(ExamineCmd) PF_PLAYING | PF_IMMEDIATE }, |
95 | * of these treat it only as strings, so it makes things easier |
105 | {"apply", PC(ApplyCmd) PF_PLAYING | PF_IMMEDIATE }, |
96 | * to cast it here instead of a bunch of times in the function itself. |
106 | {"reply", PC(ReplyCmd) PF_IMMEDIATE }, |
97 | * flag is 1 if the player must be in the playing state to issue the |
107 | {"lookat", PC(LookAt) PF_PLAYING | PF_IMMEDIATE }, |
98 | * command, 0 if they can issue it at any time. |
108 | {"lock", PC(LockItem) PF_PLAYING | PF_IMMEDIATE }, |
99 | */ |
109 | {"mark", PC(MarkItem) PF_PLAYING | PF_IMMEDIATE }, |
100 | static struct PlCmdMapping plcommands[] = { |
110 | {"move", PC(MoveCmd) PF_PLAYING | PF_IMMEDIATE }, |
101 | {"examine", ExamineCmd, 1}, |
111 | {"ext", PC(ExtCmd) PF_IMMEDIATE }, /* CF+ */ |
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 */ |
112 | {"mapredraw", PC(MapRedrawCmd) PF_IMMEDIATE }, /* Added: phil */ |
111 | {"mapinfo", MapInfoCmd, 2}, /* CF+ */ |
113 | {"mapinfo", PC(MapInfoCmd) PF_IMMEDIATE }, /* CF+ */ |
112 | {"ext", ExtCmd, 2}, /* CF+ */ |
|
|
113 | { 0 } /* terminator */ |
|
|
114 | }; |
|
|
115 | |
114 | |
116 | /** Face-related commands */ |
115 | {"addme", SC(AddMeCmd) PF_IMMEDIATE }, |
117 | static struct NsCmdMapping nscommands[] = { |
|
|
118 | {"addme", AddMeCmd, 2}, |
|
|
119 | {"askface", SendFaceCmd}, /* Added: phil */ |
116 | {"askface", SC(SendFaceCmd) 0 }, /* Added: phil */ |
120 | {"requestinfo", RequestInfo}, |
117 | {"requestinfo", SC(RequestInfo) 0 }, |
121 | {"setfacemode", SetFaceMode, 2}, |
118 | {"setfacemode", SC(SetFaceMode) PF_IMMEDIATE }, |
122 | {"setsound", SetSound, 2}, |
119 | {"setsound", SC(SetSound) PF_IMMEDIATE }, |
123 | {"setup", SetUp, 2}, |
120 | {"setup", SC(SetUp) PF_IMMEDIATE }, |
124 | {"version", VersionCmd, 2}, |
121 | {"version", SC(VersionCmd) PF_IMMEDIATE }, |
125 | {"toggleextendedinfos", ToggleExtendedInfos, 2}, /*Added: tchize */ |
122 | {"toggleextendedinfos", SC(ToggleExtendedInfos) PF_IMMEDIATE }, /*Added: tchize */ |
126 | {"toggleextendedtext", ToggleExtendedText, 2}, /*Added: tchize */ |
123 | {"toggleextendedtext", SC(ToggleExtendedText) PF_IMMEDIATE }, /*Added: tchize */ |
127 | {"asksmooth", AskSmooth}, /*Added: tchize (smoothing technologies) */ |
124 | {"asksmooth", SC(AskSmooth) 0 }, /*Added: tchize (smoothing technologies) */ |
128 | { 0 } /* terminator (I, II & III) */ |
|
|
129 | }; |
125 | }; |
130 | |
126 | |
131 | /** |
127 | /** |
132 | * RequestInfo is sort of a meta command. There is some specific |
128 | * RequestInfo is sort of a meta command. There is some specific |
133 | * request of information, but we call other functions to provide |
129 | * request of information, but we call other functions to provide |
… | |
… | |
227 | datalen = 0; |
223 | datalen = 0; |
228 | } |
224 | } |
229 | |
225 | |
230 | ns->inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */ |
226 | ns->inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */ |
231 | |
227 | |
232 | for (int i = 0; nscommands[i].cmdname; i++) |
228 | for (pkt_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt) |
233 | { |
|
|
234 | if (!strcmp ((char *)ns->inbuf + 2, nscommands[i].cmdname)) |
229 | if (!strcmp ((char *)ns->inbuf + 2, pkt->name)) |
235 | { |
|
|
236 | nscommands[i].cmdproc (data, datalen, ns); |
|
|
237 | ns->skip_packet (pkt_len); |
|
|
238 | //D// not doing this causes random memory corruption |
|
|
239 | if (nscommands[i].flag & 2) |
|
|
240 | goto next_packet; |
|
|
241 | return; |
|
|
242 | } |
|
|
243 | } |
|
|
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 | { |
230 | { |
255 | if (!strcmp ((char *)ns->inbuf + 2, plcommands[i].cmdname)) |
231 | if (pkt->may_execute (ns)) |
256 | { |
232 | { |
257 | if (pl->state == ST_PLAYING || !(plcommands[i].flag & 1)) |
233 | pkt->execute (ns, data, datalen); |
258 | plcommands[i].cmdproc ((char *) data, datalen, pl); |
|
|
259 | |
|
|
260 | ns->skip_packet (pkt_len); |
234 | ns->skip_packet (pkt_len); |
261 | //D// not doing this causes random memory corruption |
235 | //D//TODO not doing this causes random memory corruption |
262 | if (plcommands[i].flag & 2) |
236 | if (pkt->flags & PF_IMMEDIATE) |
263 | goto next_packet; |
237 | goto next_packet; |
264 | |
|
|
265 | return; |
238 | return; |
266 | } |
239 | } |
267 | } |
240 | } |
268 | |
241 | |
269 | printf ("BP34n");//D |
|
|
270 | /* If we get here, we didn't find a valid command. Logging |
242 | /* If we get here, we didn't find a valid command. Logging |
271 | * this might be questionable, because a broken client/malicious |
243 | * this might be questionable, because a broken client/malicious |
272 | * user could certainly send a whole bunch of invalid commands. |
244 | * user could certainly send a whole bunch of invalid commands. |
273 | */ |
245 | */ |
274 | LOG (llevDebug, "Bad command from client (%s)\n", ns->inbuf + 2); |
246 | LOG (llevDebug, "Bad command from client (%s)\n", ns->inbuf + 2); |
… | |
… | |
276 | next_packet: |
248 | next_packet: |
277 | ; |
249 | ; |
278 | } |
250 | } |
279 | } |
251 | } |
280 | |
252 | |
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 | |
|
|
298 | void |
|
|
299 | watchdog (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 | |
|
|
320 | void |
253 | void |
321 | flush_sockets (void) |
254 | flush_sockets (void) |
322 | { |
255 | { |
323 | player *pl; |
256 | for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); ++i) |
324 | |
|
|
325 | for (pl = first_player; pl != NULL; pl = pl->next) |
|
|
326 | if (pl->socket.status != Ns_Dead) |
257 | if ((*i)->status != Ns_Dead) |
327 | Socket_Flush (&pl->socket); |
258 | (*i)->flush (); |
328 | } |
259 | } |
329 | |
260 | |
330 | /** |
261 | /** |
331 | * This checks the sockets for input, does the right thing. |
262 | * This checks the sockets for input, does the right thing. |
332 | * |
263 | * |
… | |
… | |
336 | */ |
267 | */ |
337 | void |
268 | void |
338 | doeric_server (void) |
269 | doeric_server (void) |
339 | { |
270 | { |
340 | int i, pollret; |
271 | int i, pollret; |
341 | fd_set tmp_read, tmp_write; |
272 | fd_set tmp_read; |
342 | struct sockaddr_in addr; |
273 | struct sockaddr_in addr; |
343 | socklen_t addrlen = sizeof (struct sockaddr); |
274 | socklen_t addrlen = sizeof (struct sockaddr); |
344 | player *pl, *next; |
275 | player *pl, *next; |
|
|
276 | int maxfd = 0; |
345 | |
277 | |
346 | #ifdef CS_LOGSTATS |
278 | #ifdef CS_LOGSTATS |
347 | if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME) |
279 | if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME) |
348 | write_cs_stats (); |
280 | write_cs_stats (); |
349 | #endif |
281 | #endif |
350 | |
282 | |
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, |
283 | /* Go through the players. Let the loop set the next pl value, |
370 | * since we may remove some |
284 | * since we may remove some |
371 | */ |
285 | */ |
|
|
286 | //TODO: must be handled cleanly elsewhere |
372 | for (pl = first_player; pl != NULL;) |
287 | for (pl = first_player; pl; ) |
373 | { |
288 | { |
|
|
289 | player *npl = pl->next; |
|
|
290 | |
|
|
291 | //TODO: must be handled cleanly elsewhere |
374 | if (pl->socket.status == Ns_Dead) |
292 | if (pl->socket->status == Ns_Dead) |
375 | { |
293 | { |
376 | player *npl = pl->next; |
|
|
377 | |
|
|
378 | save_player (pl->ob, 0); |
294 | save_player (pl->ob, 0); |
379 | |
295 | |
380 | if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) |
296 | if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) |
381 | { |
297 | { |
382 | terminate_all_pets (pl->ob); |
298 | terminate_all_pets (pl->ob); |
383 | pl->ob->remove (); |
299 | pl->ob->remove (); |
384 | } |
300 | } |
385 | |
301 | |
386 | leave (pl, 1); |
302 | leave (pl, 1); |
387 | final_free_player (pl); |
303 | final_free_player (pl); |
|
|
304 | } |
|
|
305 | |
388 | pl = npl; |
306 | pl = npl; |
|
|
307 | } |
|
|
308 | |
|
|
309 | FD_ZERO (&tmp_read); |
|
|
310 | |
|
|
311 | for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); ) |
|
|
312 | { |
|
|
313 | client_socket *s = *i; |
|
|
314 | |
|
|
315 | if (s->status == Ns_Dead) |
|
|
316 | { |
|
|
317 | client_sockets.erase (i); |
|
|
318 | delete s; |
389 | } |
319 | } |
390 | else |
320 | else |
391 | { |
321 | { |
|
|
322 | if (s->fd > maxfd) maxfd = s->fd; |
|
|
323 | |
392 | FD_SET ((uint32) pl->socket.fd, &tmp_read); |
324 | FD_SET (s->fd, &tmp_read); |
393 | FD_SET ((uint32) pl->socket.fd, &tmp_write); |
|
|
394 | pl = pl->next; |
|
|
395 | } |
|
|
396 | } |
|
|
397 | |
325 | |
398 | /* Reset timeout each time, since some OS's will change the values on |
326 | ++i; |
399 | * the return from select. |
327 | } |
400 | */ |
328 | } |
|
|
329 | |
|
|
330 | struct timeval timeout; |
|
|
331 | |
401 | socket_info.timeout.tv_sec = 0; |
332 | timeout.tv_sec = 0; |
402 | socket_info.timeout.tv_usec = 0; |
333 | timeout.tv_usec = 0; |
403 | |
334 | |
404 | pollret = select (socket_info.max_filedescriptor, |
335 | pollret = select (maxfd + 1, |
405 | &tmp_read, &tmp_write, 0, |
336 | &tmp_read, 0, 0, |
406 | &socket_info.timeout); |
337 | &timeout); |
407 | |
338 | |
408 | if (pollret == -1) |
339 | if (pollret == -1) |
409 | { |
340 | { |
410 | LOG (llevError, "select failed: %s\n", strerror (errno)); |
341 | LOG (llevError, "select failed: %s\n", strerror (errno)); |
411 | return; |
342 | return; |
412 | } |
343 | } |
413 | |
344 | |
414 | /* We need to do some of the processing below regardless */ |
345 | /* We need to do some of the processing below regardless */ |
415 | |
346 | |
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 = (client_socket *) realloc (init_sockets, sizeof (client_socket) * (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 | client_socket *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 | ns->init (buf); |
|
|
476 | socket_info.nconns++; |
|
|
477 | } |
|
|
478 | } |
|
|
479 | } |
|
|
480 | |
|
|
481 | /* Check for any input on the sockets */ |
347 | /* Check for any input on the sockets */ |
482 | if (pollret) |
348 | for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); ++i) |
483 | for (i = 1; i < socket_info.allocated_sockets; i++) |
|
|
484 | { |
349 | { |
485 | if (init_sockets[i].status == Ns_Avail) |
350 | client_socket *s = *i; |
486 | continue; |
351 | player *pl = s->pl; |
487 | |
352 | |
488 | //TODO: disassociate handleclient from socket readin |
353 | //TODO: disassociate handleclient from socket readin |
489 | if (init_sockets[i].inbuf_len || FD_ISSET (init_sockets[i].fd, &tmp_read)) |
354 | if (s->inbuf_len || FD_ISSET (s->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 | } |
|
|
495 | |
|
|
496 | /* This does roughly the same thing, but for the players now */ |
|
|
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); |
355 | HandleClient (s, pl); |
525 | /* If the player has left the game, then the socket status |
356 | |
526 | * will be set to this be the leave function. We don't |
357 | //TODO: should not be done here, either |
527 | * need to call leave again, as it has already been called |
|
|
528 | * once. |
|
|
529 | */ |
|
|
530 | if (pl->socket.status == Ns_Dead) |
358 | if (s->status != Ns_Dead && pl) |
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 | { |
359 | { |
545 | /* Update the players stats once per tick. More efficient than |
360 | /* Update the players stats once per tick. More efficient than |
546 | * sending them whenever they change, and probably just as useful |
361 | * sending them whenever they change, and probably just as useful |
547 | */ |
362 | */ |
548 | esrv_update_stats (pl); |
363 | esrv_update_stats (pl); |
… | |
… | |
556 | |
371 | |
557 | /* draw_client_map does sanity checking that map is |
372 | /* draw_client_map does sanity checking that map is |
558 | * valid, so don't do it here. |
373 | * valid, so don't do it here. |
559 | */ |
374 | */ |
560 | draw_client_map (pl->ob); |
375 | draw_client_map (pl->ob); |
561 | if (pl->socket.update_look) |
376 | if (s->update_look) |
562 | esrv_draw_look (pl->ob); |
377 | esrv_draw_look (pl->ob); |
563 | } |
378 | } |
564 | } |
379 | } |
565 | } |
380 | } |
566 | |
381 | |