… | |
… | |
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> |
… | |
… | |
67 | * before player joins, and those happen after the player has joined. |
65 | * before player joins, and those happen after the player has joined. |
68 | * As such, we have function types that might be called, so |
66 | * As such, we have function types that might be called, so |
69 | * we end up having 2 tables. |
67 | * we end up having 2 tables. |
70 | */ |
68 | */ |
71 | |
69 | |
72 | typedef void (*func_uint8_int_ns) (char *, int, NewSocket *); |
70 | typedef void (*func_uint8_int_ns) (char *, int, client_socket *); |
73 | |
71 | |
74 | struct NsCmdMapping |
72 | struct NsCmdMapping |
75 | { |
73 | { |
76 | const char *cmdname; |
74 | const char *cmdname; |
77 | func_uint8_int_ns cmdproc; |
75 | func_uint8_int_ns cmdproc; |
|
|
76 | uint8 flag; |
78 | }; |
77 | }; |
79 | |
78 | |
80 | typedef void (*func_uint8_int_pl) (char *, int, player *); |
79 | typedef void (*func_uint8_int_pl) (char *, int, player *); |
81 | struct PlCmdMapping |
80 | struct PlCmdMapping |
82 | { |
81 | { |
… | |
… | |
109 | {"lock", (func_uint8_int_pl) LockItem, 1}, |
108 | {"lock", (func_uint8_int_pl) LockItem, 1}, |
110 | {"mark", (func_uint8_int_pl) MarkItem, 1}, |
109 | {"mark", (func_uint8_int_pl) MarkItem, 1}, |
111 | {"mapredraw", MapRedrawCmd, 0}, /* Added: phil */ |
110 | {"mapredraw", MapRedrawCmd, 0}, /* Added: phil */ |
112 | {"mapinfo", MapInfoCmd, 2}, /* CF+ */ |
111 | {"mapinfo", MapInfoCmd, 2}, /* CF+ */ |
113 | {"ext", ExtCmd, 2}, /* CF+ */ |
112 | {"ext", ExtCmd, 2}, /* CF+ */ |
114 | {NULL, NULL, 0} /* terminator */ |
113 | { 0 } /* terminator */ |
115 | }; |
114 | }; |
116 | |
115 | |
117 | /** Face-related commands */ |
116 | /** Face-related commands */ |
118 | static struct NsCmdMapping nscommands[] = { |
117 | static struct NsCmdMapping nscommands[] = { |
119 | {"addme", AddMeCmd}, |
118 | {"addme", AddMeCmd, 2}, |
120 | {"askface", SendFaceCmd}, /* Added: phil */ |
119 | {"askface", SendFaceCmd}, /* Added: phil */ |
121 | {"requestinfo", RequestInfo}, |
120 | {"requestinfo", RequestInfo}, |
122 | {"setfacemode", SetFaceMode}, |
121 | {"setfacemode", SetFaceMode, 2}, |
123 | {"setsound", SetSound}, |
122 | {"setsound", SetSound, 2}, |
124 | {"setup", SetUp}, |
123 | {"setup", SetUp, 2}, |
125 | {"version", VersionCmd}, |
124 | {"version", VersionCmd, 2}, |
126 | {"toggleextendedinfos", ToggleExtendedInfos}, /*Added: tchize */ |
125 | {"toggleextendedinfos", ToggleExtendedInfos, 2}, /*Added: tchize */ |
127 | {"toggleextendedtext", ToggleExtendedText}, /*Added: tchize */ |
126 | {"toggleextendedtext", ToggleExtendedText, 2}, /*Added: tchize */ |
128 | {"asksmooth", AskSmooth}, /*Added: tchize (smoothing technologies) */ |
127 | {"asksmooth", AskSmooth}, /*Added: tchize (smoothing technologies) */ |
129 | {NULL, NULL} /* terminator (I, II & III) */ |
128 | { 0 } /* terminator (I, II & III) */ |
130 | }; |
129 | }; |
131 | |
130 | |
132 | /** |
131 | /** |
133 | * RequestInfo is sort of a meta command. There is some specific |
132 | * RequestInfo is sort of a meta command. There is some specific |
134 | * request of information, but we call other functions to provide |
133 | * request of information, but we call other functions to provide |
135 | * that information. |
134 | * that information. |
136 | */ |
135 | */ |
137 | void |
136 | void |
138 | RequestInfo (char *buf, int len, NewSocket * ns) |
137 | RequestInfo (char *buf, int len, client_socket * ns) |
139 | { |
138 | { |
140 | char *params = NULL, *cp; |
139 | char *params = NULL, *cp; |
141 | |
140 | |
142 | /* No match */ |
141 | /* No match */ |
143 | char bigbuf[MAX_BUF]; |
142 | char bigbuf[MAX_BUF]; |
… | |
… | |
158 | { |
157 | { |
159 | *cp = '\0'; |
158 | *cp = '\0'; |
160 | params = cp + 1; |
159 | params = cp + 1; |
161 | break; |
160 | break; |
162 | } |
161 | } |
|
|
162 | |
163 | if (!strcmp (buf, "image_info")) |
163 | if (!strcmp (buf, "image_info")) |
164 | send_image_info (ns, params); |
164 | send_image_info (ns, params); |
165 | else if (!strcmp (buf, "image_sums")) |
165 | else if (!strcmp (buf, "image_sums")) |
166 | send_image_sums (ns, params); |
166 | send_image_sums (ns, params); |
167 | else if (!strcmp (buf, "skill_info")) |
167 | else if (!strcmp (buf, "skill_info")) |
168 | send_skill_info (ns, params); |
168 | send_skill_info (ns, params); |
169 | else if (!strcmp (buf, "spell_paths")) |
169 | else if (!strcmp (buf, "spell_paths")) |
170 | send_spell_paths (ns, params); |
170 | send_spell_paths (ns, params); |
171 | else |
171 | else |
172 | Write_String_To_Socket (ns, bigbuf, len); |
172 | ns->send_packet (bigbuf, len); |
173 | } |
173 | } |
174 | |
174 | |
175 | /** |
175 | /** |
176 | * Handle client input. |
176 | * Handle client input. |
177 | * |
177 | * |
… | |
… | |
181 | * 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 |
182 | * starting a connection) |
182 | * starting a connection) |
183 | */ |
183 | */ |
184 | |
184 | |
185 | void |
185 | void |
186 | HandleClient (NewSocket * ns, player *pl) |
186 | HandleClient (client_socket *ns, player *pl) |
187 | { |
187 | { |
188 | int len = 0, i, cnt; |
|
|
189 | char *data; |
|
|
190 | |
|
|
191 | /* Loop through this - maybe we have several complete packets here. */ |
188 | /* Loop through this - maybe we have several complete packets here. */ |
192 | // 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 |
193 | for (cnt = 16; cnt--;) |
190 | for (int repeat = 16; repeat--;) |
194 | { |
191 | { |
195 | /* 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 |
196 | * 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. |
197 | */ |
194 | */ |
198 | 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) |
199 | { |
|
|
200 | return; |
196 | return; |
|
|
197 | |
|
|
198 | int pkt_len = ns->read_packet (); |
|
|
199 | |
|
|
200 | if (pkt_len < 0) |
201 | } |
201 | { |
202 | |
202 | 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 */ |
203 | /* Caller will take care of cleaning this up */ |
211 | ns->status = Ns_Dead; |
204 | ns->status = Ns_Dead; |
212 | return; |
205 | return; |
213 | } |
206 | } |
|
|
207 | else if (pkt_len == 0) |
214 | /* Still dont have a full packet */ |
208 | /* Still dont have a full packet */ |
215 | if (i == 0) |
|
|
216 | return; |
209 | 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 | |
210 | |
222 | /* First, break out beginning word. There are at least |
211 | /* First, break out beginning word. There are at least |
223 | * a few commands that do not have any paremeters. If |
212 | * a few commands that do not have any paremeters. If |
224 | * we get such a command, don't worry about trying |
213 | * we get such a command, don't worry about trying |
225 | * to break it up. |
214 | * to break it up. |
226 | */ |
215 | */ |
|
|
216 | int datalen; |
227 | data = (char *) strchr ((char *) ns->inbuf.buf + 2, ' '); |
217 | char *data = strchr ((char *)ns->inbuf + 2, ' '); |
|
|
218 | |
228 | if (data) |
219 | if (data) |
229 | { |
220 | { |
230 | *data = '\0'; |
221 | *data++ = 0; |
231 | data++; |
222 | datalen = pkt_len - (data - (char *)ns->inbuf); |
232 | len = ns->inbuf.len - (data - (char *) ns->inbuf.buf); |
|
|
233 | } |
223 | } |
234 | else |
224 | else |
|
|
225 | { |
|
|
226 | data = (char *)ns->inbuf + 2; // better read garbage than segfault |
235 | len = 0; |
227 | 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 | { |
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 | { |
240 | if (strcmp ((char *) ns->inbuf.buf + 2, nscommands[i].cmdname) == 0) |
234 | if (!strcmp ((char *)ns->inbuf + 2, nscommands[i].cmdname)) |
241 | { |
235 | { |
242 | nscommands[i].cmdproc ((char *) data, len, ns); |
236 | nscommands[i].cmdproc (data, datalen, ns); |
243 | ns->inbuf.len = 0; |
237 | ns->skip_packet (pkt_len); |
244 | return; //D// not doing this causes random memory corruption |
238 | //D// not doing this causes random memory corruption |
|
|
239 | if (nscommands[i].flag & 2) |
245 | goto next_packet; |
240 | goto next_packet; |
246 | } |
241 | return; |
247 | } |
242 | } |
|
|
243 | } |
|
|
244 | |
248 | /* 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 |
249 | * 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 - |
250 | * 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 |
251 | * 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 |
252 | * 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 |
253 | * one they can't use, we still swallow it up. |
250 | * one they can't use, we still swallow it up. |
254 | */ |
251 | */ |
255 | if (pl) |
252 | if (pl) |
256 | for (i = 0; plcommands[i].cmdname != NULL; i++) |
253 | for (int i = 0; plcommands[i].cmdname; i++) |
257 | { |
254 | { |
258 | if (strcmp ((char *) ns->inbuf.buf + 2, plcommands[i].cmdname) == 0) |
255 | if (!strcmp ((char *)ns->inbuf + 2, plcommands[i].cmdname)) |
259 | { |
256 | { |
260 | if (pl->state == ST_PLAYING || !(plcommands[i].flag & 1)) |
257 | if (pl->state == ST_PLAYING || !(plcommands[i].flag & 1)) |
261 | plcommands[i].cmdproc ((char *) data, len, pl); |
258 | plcommands[i].cmdproc ((char *) data, datalen, pl); |
262 | ns->inbuf.len = 0; |
259 | |
|
|
260 | ns->skip_packet (pkt_len); |
263 | //D// not doing this causes random memory corruption |
261 | //D// not doing this causes random memory corruption |
264 | if (plcommands[i].flag & 2) |
262 | if (plcommands[i].flag & 2) |
265 | goto next_packet; |
263 | goto next_packet; |
|
|
264 | |
266 | return; |
265 | return; |
267 | } |
266 | } |
268 | } |
267 | } |
|
|
268 | |
|
|
269 | printf ("BP34n");//D |
269 | /* If we get here, we didn't find a valid command. Logging |
270 | /* If we get here, we didn't find a valid command. Logging |
270 | * this might be questionable, because a broken client/malicious |
271 | * this might be questionable, because a broken client/malicious |
271 | * user could certainly send a whole bunch of invalid commands. |
272 | * user could certainly send a whole bunch of invalid commands. |
272 | */ |
273 | */ |
273 | LOG (llevDebug, "Bad command from client (%s)\n", ns->inbuf.buf + 2); |
274 | LOG (llevDebug, "Bad command from client (%s)\n", ns->inbuf + 2); |
|
|
275 | ns->skip_packet (pkt_len); |
274 | next_packet: |
276 | next_packet: |
275 | ; |
277 | ; |
276 | } |
278 | } |
277 | } |
279 | } |
278 | |
280 | |
… | |
… | |
324 | if (pl->socket.status != Ns_Dead) |
326 | if (pl->socket.status != Ns_Dead) |
325 | Socket_Flush (&pl->socket); |
327 | Socket_Flush (&pl->socket); |
326 | } |
328 | } |
327 | |
329 | |
328 | /** |
330 | /** |
329 | * This checks the sockets for input and exceptions, does the right thing. |
331 | * This checks the sockets for input, does the right thing. |
330 | * |
332 | * |
331 | * A bit of this code is grabbed out of socket.c |
333 | * 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 |
334 | * There are 2 lists we need to look through - init_sockets is a list |
333 | * |
335 | * |
334 | */ |
336 | */ |
335 | void |
337 | void |
336 | doeric_server (void) |
338 | doeric_server (void) |
337 | { |
339 | { |
338 | int i, pollret; |
340 | int i, pollret; |
339 | fd_set tmp_read, tmp_exceptions, tmp_write; |
341 | fd_set tmp_read, tmp_write; |
340 | struct sockaddr_in addr; |
342 | struct sockaddr_in addr; |
341 | socklen_t addrlen = sizeof (struct sockaddr); |
343 | socklen_t addrlen = sizeof (struct sockaddr); |
342 | player *pl, *next; |
344 | player *pl, *next; |
343 | |
345 | |
344 | #ifdef CS_LOGSTATS |
346 | #ifdef CS_LOGSTATS |
… | |
… | |
346 | write_cs_stats (); |
348 | write_cs_stats (); |
347 | #endif |
349 | #endif |
348 | |
350 | |
349 | FD_ZERO (&tmp_read); |
351 | FD_ZERO (&tmp_read); |
350 | FD_ZERO (&tmp_write); |
352 | FD_ZERO (&tmp_write); |
351 | FD_ZERO (&tmp_exceptions); |
|
|
352 | |
353 | |
353 | for (i = 0; i < socket_info.allocated_sockets; i++) |
354 | for (i = 0; i < socket_info.allocated_sockets; i++) |
354 | { |
355 | { |
355 | if (init_sockets[i].status == Ns_Dead) |
356 | if (init_sockets[i].status == Ns_Dead) |
356 | { |
357 | { |
… | |
… | |
358 | init_sockets[i].status = Ns_Avail; |
359 | init_sockets[i].status = Ns_Avail; |
359 | socket_info.nconns--; |
360 | socket_info.nconns--; |
360 | } |
361 | } |
361 | else if (init_sockets[i].status != Ns_Avail) |
362 | else if (init_sockets[i].status != Ns_Avail) |
362 | { |
363 | { |
363 | FD_SET ((uint32) init_sockets[i].fd, &tmp_read); |
364 | FD_SET (init_sockets[i].fd, &tmp_read); |
364 | FD_SET ((uint32) init_sockets[i].fd, &tmp_write); |
365 | FD_SET (init_sockets[i].fd, &tmp_write); |
365 | FD_SET ((uint32) init_sockets[i].fd, &tmp_exceptions); |
|
|
366 | } |
366 | } |
367 | } |
367 | } |
368 | |
368 | |
369 | /* Go through the players. Let the loop set the next pl value, |
369 | /* Go through the players. Let the loop set the next pl value, |
370 | * since we may remove some |
370 | * since we may remove some |
… | |
… | |
374 | if (pl->socket.status == Ns_Dead) |
374 | if (pl->socket.status == Ns_Dead) |
375 | { |
375 | { |
376 | player *npl = pl->next; |
376 | player *npl = pl->next; |
377 | |
377 | |
378 | save_player (pl->ob, 0); |
378 | save_player (pl->ob, 0); |
|
|
379 | |
379 | if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) |
380 | if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) |
380 | { |
381 | { |
381 | terminate_all_pets (pl->ob); |
382 | terminate_all_pets (pl->ob); |
382 | pl->ob->remove (); |
383 | pl->ob->remove (); |
383 | } |
384 | } |
|
|
385 | |
384 | leave (pl, 1); |
386 | leave (pl, 1); |
385 | final_free_player (pl); |
387 | final_free_player (pl); |
386 | pl = npl; |
388 | pl = npl; |
387 | } |
389 | } |
388 | else |
390 | else |
389 | { |
391 | { |
390 | FD_SET ((uint32) pl->socket.fd, &tmp_read); |
392 | FD_SET ((uint32) pl->socket.fd, &tmp_read); |
391 | FD_SET ((uint32) pl->socket.fd, &tmp_write); |
393 | FD_SET ((uint32) pl->socket.fd, &tmp_write); |
392 | FD_SET ((uint32) pl->socket.fd, &tmp_exceptions); |
|
|
393 | pl = pl->next; |
394 | pl = pl->next; |
394 | } |
395 | } |
395 | } |
396 | } |
396 | |
397 | |
397 | /* Reset timeout each time, since some OS's will change the values on |
398 | /* Reset timeout each time, since some OS's will change the values on |
398 | * the return from select. |
399 | * the return from select. |
399 | */ |
400 | */ |
400 | socket_info.timeout.tv_sec = 0; |
401 | socket_info.timeout.tv_sec = 0; |
401 | socket_info.timeout.tv_usec = 0; |
402 | socket_info.timeout.tv_usec = 0; |
402 | |
403 | |
403 | pollret = select (socket_info.max_filedescriptor, &tmp_read, &tmp_write, &tmp_exceptions, &socket_info.timeout); |
404 | pollret = select (socket_info.max_filedescriptor, |
|
|
405 | &tmp_read, &tmp_write, 0, |
|
|
406 | &socket_info.timeout); |
404 | |
407 | |
405 | if (pollret == -1) |
408 | if (pollret == -1) |
406 | { |
409 | { |
407 | LOG (llevError, "select failed: %s\n", strerror (errno)); |
410 | LOG (llevError, "select failed: %s\n", strerror (errno)); |
408 | return; |
411 | return; |
… | |
… | |
421 | LOG (llevDebug, "doeric_server: New Connection\n"); |
424 | LOG (llevDebug, "doeric_server: New Connection\n"); |
422 | #endif |
425 | #endif |
423 | /* If this is the case, all sockets currently in used */ |
426 | /* If this is the case, all sockets currently in used */ |
424 | if (socket_info.allocated_sockets <= socket_info.nconns) |
427 | if (socket_info.allocated_sockets <= socket_info.nconns) |
425 | { |
428 | { |
426 | init_sockets = (NewSocket *) realloc (init_sockets, sizeof (NewSocket) * (socket_info.nconns + 1)); |
429 | init_sockets = (client_socket *) realloc (init_sockets, sizeof (client_socket) * (socket_info.nconns + 1)); |
427 | if (!init_sockets) |
430 | if (!init_sockets) |
428 | fatal (OUT_OF_MEMORY); |
431 | fatal (OUT_OF_MEMORY); |
429 | newsocknum = socket_info.allocated_sockets; |
432 | newsocknum = socket_info.allocated_sockets; |
430 | socket_info.allocated_sockets++; |
433 | socket_info.allocated_sockets++; |
431 | init_sockets[newsocknum].faces_sent_len = nrofpixmaps; |
434 | init_sockets[newsocknum].faces_sent_len = nrofpixmaps; |
… | |
… | |
443 | { |
446 | { |
444 | newsocknum = j; |
447 | newsocknum = j; |
445 | break; |
448 | break; |
446 | } |
449 | } |
447 | } |
450 | } |
|
|
451 | |
448 | init_sockets[newsocknum].fd = accept (init_sockets[0].fd, (struct sockaddr *) &addr, &addrlen); |
452 | init_sockets[newsocknum].fd = accept (init_sockets[0].fd, (struct sockaddr *) &addr, &addrlen); |
|
|
453 | |
449 | if (init_sockets[newsocknum].fd == -1) |
454 | if (init_sockets[newsocknum].fd == -1) |
450 | { |
|
|
451 | LOG (llevError, "accept failed: %s\n", strerror (errno)); |
455 | LOG (llevError, "accept failed: %s\n", strerror (errno)); |
452 | } |
|
|
453 | else |
456 | else |
454 | { |
457 | { |
455 | char buf[MAX_BUF]; |
458 | char buf[MAX_BUF]; |
456 | long ip; |
459 | long ip; |
457 | NewSocket *ns; |
460 | client_socket *ns; |
458 | |
461 | |
459 | ns = &init_sockets[newsocknum]; |
462 | ns = &init_sockets[newsocknum]; |
460 | |
463 | |
461 | ip = ntohl (addr.sin_addr.s_addr); |
464 | 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); |
465 | sprintf (buf, "%ld.%ld.%ld.%ld", (ip >> 24) & 255, (ip >> 16) & 255, (ip >> 8) & 255, ip & 255); |
… | |
… | |
467 | close (init_sockets[newsocknum].fd); |
470 | close (init_sockets[newsocknum].fd); |
468 | init_sockets[newsocknum].fd = -1; |
471 | init_sockets[newsocknum].fd = -1; |
469 | } |
472 | } |
470 | else |
473 | else |
471 | { |
474 | { |
472 | InitConnection (ns, buf); |
475 | ns->init (buf); |
473 | socket_info.nconns++; |
476 | socket_info.nconns++; |
474 | } |
477 | } |
475 | } |
478 | } |
476 | } |
479 | } |
477 | |
480 | |
478 | /* Check for any exceptions/input on the sockets */ |
481 | /* Check for any input on the sockets */ |
479 | if (pollret) |
482 | if (pollret) |
480 | for (i = 1; i < socket_info.allocated_sockets; i++) |
483 | for (i = 1; i < socket_info.allocated_sockets; i++) |
481 | { |
484 | { |
482 | if (init_sockets[i].status == Ns_Avail) |
485 | if (init_sockets[i].status == Ns_Avail) |
483 | continue; |
486 | continue; |
484 | if (FD_ISSET (init_sockets[i].fd, &tmp_exceptions)) |
487 | |
485 | { |
488 | //TODO: disassociate handleclient from socket readin |
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)) |
489 | if (init_sockets[i].inbuf_len || FD_ISSET (init_sockets[i].fd, &tmp_read)) |
492 | { |
|
|
493 | HandleClient (&init_sockets[i], NULL); |
490 | HandleClient (&init_sockets[i], NULL); |
494 | } |
491 | |
495 | if (FD_ISSET (init_sockets[i].fd, &tmp_write)) |
492 | if (FD_ISSET (init_sockets[i].fd, &tmp_write)) |
496 | { |
|
|
497 | init_sockets[i].can_write = 1; |
493 | init_sockets[i].can_write = 1; |
498 | } |
|
|
499 | } |
494 | } |
500 | |
495 | |
501 | /* This does roughly the same thing, but for the players now */ |
496 | /* This does roughly the same thing, but for the players now */ |
502 | for (pl = first_player; pl != NULL; pl = next) |
497 | for (pl = first_player; pl != NULL; pl = next) |
503 | { |
498 | { |
… | |
… | |
514 | LOG (llevDebug, "Player %s socket now write enabled\n", pl->ob->name); |
509 | LOG (llevDebug, "Player %s socket now write enabled\n", pl->ob->name); |
515 | #endif |
510 | #endif |
516 | pl->socket.can_write = 1; |
511 | pl->socket.can_write = 1; |
517 | write_socket_buffer (&pl->socket); |
512 | write_socket_buffer (&pl->socket); |
518 | } |
513 | } |
|
|
514 | |
519 | /* if we get an error on the write_socket buffer, no reason to |
515 | /* if we get an error on the write_socket buffer, no reason to |
520 | * continue on this socket. |
516 | * continue on this socket. |
521 | */ |
517 | */ |
522 | if (pl->socket.status == Ns_Dead) |
518 | if (pl->socket.status == Ns_Dead) |
523 | continue; |
519 | continue; |
524 | } |
520 | } |
525 | else |
521 | else |
526 | pl->socket.can_write = 0; |
522 | pl->socket.can_write = 0; |
527 | |
523 | |
528 | if (FD_ISSET (pl->socket.fd, &tmp_exceptions)) |
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) |
529 | { |
531 | { |
530 | save_player (pl->ob, 0); |
532 | save_player (pl->ob, 0); |
|
|
533 | |
531 | if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) |
534 | if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) |
532 | { |
535 | { |
533 | terminate_all_pets (pl->ob); |
536 | terminate_all_pets (pl->ob); |
534 | pl->ob->remove (); |
537 | pl->ob->remove (); |
535 | } |
538 | } |
|
|
539 | |
536 | leave (pl, 1); |
540 | leave (pl, 1); |
537 | final_free_player (pl); |
541 | final_free_player (pl); |
538 | } |
542 | } |
539 | else |
543 | else |
540 | { |
544 | { |
541 | HandleClient (&pl->socket, pl); |
545 | /* Update the players stats once per tick. More efficient than |
542 | /* If the player has left the game, then the socket status |
546 | * sending them whenever they change, and probably just as useful |
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 | */ |
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); |
548 | esrv_update_stats (pl); |
565 | if (pl->last_weight != -1 && pl->last_weight != WEIGHT (pl->ob)) |
549 | if (pl->last_weight != -1 && pl->last_weight != WEIGHT (pl->ob)) |
566 | { |
550 | { |
567 | esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob); |
551 | esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob); |
568 | if (pl->last_weight != WEIGHT (pl->ob)) |
552 | 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", |
553 | 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)); |
554 | (unsigned long) pl->last_weight, WEIGHT (pl->ob)); |
571 | } |
555 | } |
|
|
556 | |
572 | /* draw_client_map does sanity checking that map is |
557 | /* draw_client_map does sanity checking that map is |
573 | * valid, so don't do it here. |
558 | * valid, so don't do it here. |
574 | */ |
559 | */ |
575 | draw_client_map (pl->ob); |
560 | draw_client_map (pl->ob); |
576 | if (pl->socket.update_look) |
561 | if (pl->socket.update_look) |
577 | esrv_draw_look (pl->ob); |
562 | esrv_draw_look (pl->ob); |
578 | } |
|
|
579 | } |
563 | } |
580 | } |
564 | } |
581 | } |
565 | } |
|
|
566 | |