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.2 by root, Thu Aug 24 13:13:49 2006 UTC vs.
Revision 1.5 by root, Sat Sep 9 21:48:29 2006 UTC

1 1
2/* 2/*
3 * static char *rcsid_loop_c = 3 * static char *rcsid_loop_c =
4 * "$Id: loop.C,v 1.2 2006/08/24 13:13:49 root Exp $"; 4 * "$Id: loop.C,v 1.5 2006/09/09 21:48:29 root Exp $";
5 */ 5 */
6 6
7/* 7/*
8 CrossFire, A Multiplayer game for X-windows 8 CrossFire, A Multiplayer game for X-windows
9 9
… …
156 156
157 /* find the first space, make it null, and update the 157 /* find the first space, make it null, and update the
158 * params pointer. 158 * params pointer.
159 */ 159 */
160 for (cp = buf; *cp != '\0'; cp++) 160 for (cp = buf; *cp != '\0'; cp++)
161 if (*cp==' ') { 161 if (*cp==' ') {
162 *cp = '\0'; 162 *cp = '\0';
163 params = cp + 1; 163 params = cp + 1;
164 break; 164 break;
165 } 165 }
166 if (!strcmp(buf, "image_info")) send_image_info(ns, params); 166 if (!strcmp(buf, "image_info")) send_image_info(ns, params);
167 else if (!strcmp(buf,"image_sums")) send_image_sums(ns, params); 167 else if (!strcmp(buf,"image_sums")) send_image_sums(ns, params);
168 else if (!strcmp(buf,"skill_info")) send_skill_info(ns, params); 168 else if (!strcmp(buf,"skill_info")) send_skill_info(ns, params);
169 else if (!strcmp(buf,"spell_paths")) send_spell_paths(ns, params); 169 else if (!strcmp(buf,"spell_paths")) send_spell_paths(ns, params);
170 else Write_String_To_Socket(ns, bigbuf, len); 170 else Write_String_To_Socket(ns, bigbuf, len);
171} 171}
172 172
173/** 173/**
174 * Handles old socket format.
175 */
176void Handle_Oldsocket(NewSocket *ns)
177{
178 int stat,i;
179 CommFunc command;
180 char buf[MAX_BUF],*cp;
181 object ob;
182 player pl;
183
184 /* This is not the most efficient block, but keeps the code simpler -
185 * we basically read a byte at a time until we get a newline, error,
186 * or no more characters to read.
187 */
188 do {
189 /* hack to disable old socket mode without creating too many conflicts */
190 if (1 || ns->inbuf.len >= MAXSOCKBUF-1) {
191 ns->status = Ns_Dead;
192 LOG(llevDebug, "Old input socket sent too much data without newline\n");
193 return;
194 }
195#ifdef WIN32 /* ***win32: change oldsocket read() to recv() */
196 stat = recv(ns->fd, ns->inbuf.buf + ns->inbuf.len, 1,0);
197
198 if (stat==-1 && WSAGetLastError() !=WSAEWOULDBLOCK) {
199#else
200 do {
201 stat = read(ns->fd, ns->inbuf.buf + ns->inbuf.len, 1);
202 } while ((stat<0) && (errno == EINTR));
203
204 if (stat<0 && errno != EAGAIN && errno !=EWOULDBLOCK) {
205#endif
206 LOG(llevError, "Cannot read from socket: %s\n", strerror_local(errno));
207 ns->status = Ns_Dead;
208 return;
209 }
210 if (stat == 0) return;
211 } while (ns->inbuf.buf[ns->inbuf.len++]!='\n');
212
213 ns->inbuf.buf[ns->inbuf.len]=0;
214
215 cp = strchr((const char*)ns->inbuf.buf, ' ');
216 if (cp) {
217 /* Replace the space with a null, skip any more spaces */
218 *cp++=0;
219 while (isspace(*cp)) cp++;
220 }
221
222 /* Strip off all spaces and control characters from end of line */
223 for (i=ns->inbuf.len-1; i>=0; i--) {
224 if (ns->inbuf.buf[i]<=32) ns->inbuf.buf[i]=0;
225 else break;
226 }
227 ns->inbuf.len=0; /* reset for next read */
228
229 /* If just a return, don't do anything */
230 if (ns->inbuf.buf[0] == 0) return;
231 if (!strcasecmp((const char*)ns->inbuf.buf,"quit")) {
232 ns->status = Ns_Dead;
233 return;
234 }
235 if (!strcasecmp((const char*)ns->inbuf.buf, "listen")) {
236 if (cp) {
237 char *buf="Socket switched to listen mode\n";
238
239 free(ns->comment);
240 ns->comment = strdup_local(cp);
241 ns->old_mode = Old_Listen;
242 cs_write_string(ns, buf, strlen(buf));
243 } else {
244 char *buf="Need to supply a comment/url to listen\n";
245 cs_write_string(ns, buf, strlen(buf));
246 }
247 return;
248 }
249 if (!strcasecmp((const char*)ns->inbuf.buf, "name")) {
250 char *cp1=NULL;
251 if (cp) cp1= strchr(cp, ' ');
252 if (cp1) {
253 *cp1++ = 0;
254 while (isspace(*cp1)) cp1++;
255 }
256 if (!cp || !cp1) {
257 char *buf="Need to provide a name/password to name\n";
258 cs_write_string(ns, buf, strlen(buf));
259 return;
260 }
261
262 if (verify_player(cp, cp1)==0) {
263 char *buf="Welcome back\n";
264 free(ns->comment);
265 ns->comment = strdup_local(cp);
266 ns->old_mode = Old_Player;
267 cs_write_string(ns, buf, strlen(buf));
268 }
269 else if (verify_player(cp, cp1)==2) {
270 ns->password_fails++;
271 if (ns->password_fails >= MAX_PASSWORD_FAILURES) {
272 char *buf="You failed to log in too many times, you will now be kicked.\n";
273 LOG(llevInfo, "A player connecting from %s in oldsocketmode has been dropped for password failure\n",
274 ns->host);
275 cs_write_string(ns, buf, strlen(buf));
276 ns->status = Ns_Dead;
277 }
278 else {
279 char *buf="Could not login you in. Check your name and password.\n";
280 cs_write_string(ns, buf, strlen(buf));
281 }
282 }
283 else {
284 char *buf="Could not login you in. Check your name and password.\n";
285 cs_write_string(ns, buf, strlen(buf));
286 }
287 return;
288 }
289
290 command = find_oldsocket_command((char*)ns->inbuf.buf);
291 if (!command && ns->old_mode==Old_Player) {
292 command = find_oldsocket_command2((char*)ns->inbuf.buf);
293 }
294 if (!command) {
295 snprintf(buf, sizeof(buf), "Could not find command: %s\n", ns->inbuf.buf);
296 cs_write_string(ns, buf, strlen(buf));
297 return;
298 }
299
300 /* This is a bit of a hack, but works. Basically, we make some
301 * fake object and player pointers and give at it.
302 * This works as long as the functions we are calling don't need
303 * to do anything to the object structure (ie, they are only
304 * outputting information and not actually updating anything much.)
305 */
306 ob.contr = &pl;
307 pl.ob = &ob;
308 ob.type = PLAYER;
309 pl.listening = 10;
310 pl.socket = *ns;
311 pl.outputs_count = 1;
312 ob.name = ns->comment;
313
314 command(&ob, cp);
315}
316
317
318/**
319 * Handle client input. 174 * Handle client input.
320 * 175 *
321 * HandleClient is actually not named really well - we only get here once 176 * HandleClient is actually not named really well - we only get here once
322 * there is input, so we don't do exception or other stuff here. 177 * there is input, so we don't do exception or other stuff here.
323 * sock is the output socket information. pl is the player associated 178 * sock is the output socket information. pl is the player associated
… …
331 char *data; 186 char *data;
332 187
333 /* Loop through this - maybe we have several complete packets here. */ 188 /* Loop through this - maybe we have several complete packets here. */
334 // 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
335 for (cnt = 16; cnt--; ) { 190 for (cnt = 16; cnt--; ) {
336 /* If it is a player, and they don't have any speed left, we 191 /* If it is a player, and they don't have any speed left, we
337 * return, and will read in the data when they do have time. 192 * return, and will read in the data when they do have time.
338 */ 193 */
339 if (pl && pl->state==ST_PLAYING && pl->ob != NULL && pl->ob->speed_left < 0) { 194 if (pl && pl->state==ST_PLAYING && pl->ob != NULL && pl->ob->speed_left < 0) {
340 return; 195 return;
341 } 196 }
342 197
343 if (ns->status == Ns_Old) {
344 Handle_Oldsocket(ns);
345 return;
346 }
347 i=SockList_ReadPacket(ns->fd, &ns->inbuf, MAXSOCKBUF-1); 198 i=SockList_ReadPacket(ns->fd, &ns->inbuf, MAXSOCKBUF-1);
348 /* Special hack - let the user switch to old mode if in the Ns_Add
349 * phase. Don't demand they add in the special length bytes
350 */
351 if (ns->status == Ns_Add) {
352 if (!strncasecmp((const char*)ns->inbuf.buf,"oldsocketmode", 13)) {
353 ns->status = Ns_Old;
354 ns->inbuf.len=0;
355 cs_write_string(ns, "Switched to old socket mode\n", 28);
356 LOG(llevDebug,"Switched socket to old socket mode\n");
357 return;
358 }
359 }
360 199
361 if (i<0) { 200 if (i<0) {
362#ifdef ESRV_DEBUG 201#ifdef ESRV_DEBUG
363 LOG(llevDebug,"HandleClient: Read error on connection player %s\n", (pl?pl->ob->name:"None")); 202 LOG(llevDebug,"HandleClient: Read error on connection player %s\n", (pl?pl->ob->name:"None"));
364#endif 203#endif
365 /* Caller will take care of cleaning this up */ 204 /* Caller will take care of cleaning this up */
366 ns->status =Ns_Dead; 205 ns->status =Ns_Dead;
367 return; 206 return;
368 } 207 }
369 /* Still dont have a full packet */ 208 /* Still dont have a full packet */
370 if (i==0) return; 209 if (i==0) return;
371 210
372// //D//TODO//temporarily log long commands 211// //D//TODO//temporarily log long commands
373// if (ns->inbuf.len >= 40 && pl && pl->ob) 212// if (ns->inbuf.len >= 40 && pl && pl->ob)
374// LOG (llevDebug, "HandleClient: long comamnd from <%s,%s> %d<%s>\n", pl->ob->name, ns->host, ns->inbuf.len, ns->inbuf.buf + 2); 213// LOG (llevDebug, "HandleClient: long comamnd from <%s,%s> %d<%s>\n", pl->ob->name, ns->host, ns->inbuf.len, ns->inbuf.buf + 2);
375 214
376 /* First, break out beginning word. There are at least 215 /* First, break out beginning word. There are at least
377 * a few commands that do not have any paremeters. If 216 * a few commands that do not have any paremeters. If
378 * we get such a command, don't worry about trying 217 * we get such a command, don't worry about trying
379 * to break it up. 218 * to break it up.
380 */ 219 */
381 data = (char *)strchr((char*)ns->inbuf.buf +2, ' '); 220 data = (char *)strchr((char*)ns->inbuf.buf +2, ' ');
382 if (data) { 221 if (data) {
383 *data='\0'; 222 *data='\0';
384 data++; 223 data++;
385 len = ns->inbuf.len - (data - (char*)ns->inbuf.buf); 224 len = ns->inbuf.len - (data - (char*)ns->inbuf.buf);
386 } 225 }
387 else len=0; 226 else len=0;
388 227
389 ns->inbuf.buf[ns->inbuf.len]='\0'; /* Terminate buffer - useful for string data */ 228 ns->inbuf.buf[ns->inbuf.len]='\0'; /* Terminate buffer - useful for string data */
390 for (i=0; nscommands[i].cmdname !=NULL; i++) { 229 for (i=0; nscommands[i].cmdname !=NULL; i++) {
391 if (strcmp((char*)ns->inbuf.buf+2,nscommands[i].cmdname)==0) { 230 if (strcmp((char*)ns->inbuf.buf+2,nscommands[i].cmdname)==0) {
392 nscommands[i].cmdproc((char*)data,len,ns); 231 nscommands[i].cmdproc((char*)data,len,ns);
393 ns->inbuf.len=0; 232 ns->inbuf.len=0;
394 return;//D// not doing this causes random memory corruption 233 return;//D// not doing this causes random memory corruption
395 goto next_packet; 234 goto next_packet;
396 } 235 }
397 } 236 }
398 /* Player must be in the playing state or the flag on the 237 /* Player must be in the playing state or the flag on the
399 * the command must be zero for the user to use the command - 238 * the command must be zero for the user to use the command -
400 * otherwise, a player cam save, be in the play_again state, and 239 * otherwise, a player cam save, be in the play_again state, and
401 * the map they were on gets swapped out, yet things that try to look 240 * the map they were on gets swapped out, yet things that try to look
402 * at the map causes a crash. If the command is valid, but 241 * at the map causes a crash. If the command is valid, but
403 * one they can't use, we still swallow it up. 242 * one they can't use, we still swallow it up.
404 */ 243 */
405 if (pl) for (i=0; plcommands[i].cmdname !=NULL; i++) { 244 if (pl) for (i=0; plcommands[i].cmdname !=NULL; i++) {
406 if (strcmp((char*)ns->inbuf.buf+2,plcommands[i].cmdname)==0) { 245 if (strcmp((char*)ns->inbuf.buf+2,plcommands[i].cmdname)==0) {
407 if (pl->state == ST_PLAYING || !(plcommands[i].flag & 1)) 246 if (pl->state == ST_PLAYING || !(plcommands[i].flag & 1))
408 plcommands[i].cmdproc((char*)data,len,pl); 247 plcommands[i].cmdproc((char*)data,len,pl);
409 ns->inbuf.len=0; 248 ns->inbuf.len=0;
410 //D// not doing this causes random memory corruption 249 //D// not doing this causes random memory corruption
411 if (plcommands[i].flag & 2) 250 if (plcommands[i].flag & 2)
412 goto next_packet; 251 goto next_packet;
413 return; 252 return;
414 } 253 }
415 } 254 }
416 /* If we get here, we didn't find a valid command. Logging 255 /* If we get here, we didn't find a valid command. Logging
417 * this might be questionable, because a broken client/malicious 256 * this might be questionable, because a broken client/malicious
418 * user could certainly send a whole bunch of invalid commands. 257 * user could certainly send a whole bunch of invalid commands.
419 */ 258 */
420 LOG(llevDebug,"Bad command from client (%s)\n",ns->inbuf.buf+2); 259 LOG(llevDebug,"Bad command from client (%s)\n",ns->inbuf.buf+2);
421 next_packet: 260 next_packet:
422 ; 261 ;
423 } 262 }
424} 263}
425 264
… …
485 socklen_t addrlen=sizeof(struct sockaddr); 324 socklen_t addrlen=sizeof(struct sockaddr);
486 player *pl, *next; 325 player *pl, *next;
487 326
488#ifdef CS_LOGSTATS 327#ifdef CS_LOGSTATS
489 if ((time(NULL)-cst_lst.time_start)>=CS_LOGTIME) 328 if ((time(NULL)-cst_lst.time_start)>=CS_LOGTIME)
490 write_cs_stats(); 329 write_cs_stats();
491#endif 330#endif
492 331
493 FD_ZERO(&tmp_read); 332 FD_ZERO(&tmp_read);
494 FD_ZERO(&tmp_write); 333 FD_ZERO(&tmp_write);
495 FD_ZERO(&tmp_exceptions); 334 FD_ZERO(&tmp_exceptions);
496 335
497 for(i=0;i<socket_info.allocated_sockets;i++) { 336 for(i=0;i<socket_info.allocated_sockets;i++) {
498 if (init_sockets[i].status == Ns_Dead) { 337 if (init_sockets[i].status == Ns_Dead) {
499 free_newsocket(&init_sockets[i]); 338 free_newsocket(&init_sockets[i]);
500 init_sockets[i].status = Ns_Avail; 339 init_sockets[i].status = Ns_Avail;
501 socket_info.nconns--; 340 socket_info.nconns--;
502 } else if (init_sockets[i].status != Ns_Avail){ 341 } else if (init_sockets[i].status != Ns_Avail){
503 FD_SET((uint32)init_sockets[i].fd, &tmp_read); 342 FD_SET((uint32)init_sockets[i].fd, &tmp_read);
504 FD_SET((uint32)init_sockets[i].fd, &tmp_write); 343 FD_SET((uint32)init_sockets[i].fd, &tmp_write);
505 FD_SET((uint32)init_sockets[i].fd, &tmp_exceptions); 344 FD_SET((uint32)init_sockets[i].fd, &tmp_exceptions);
506 } 345 }
507 } 346 }
508 347
509 /* Go through the players. Let the loop set the next pl value, 348 /* Go through the players. Let the loop set the next pl value,
510 * since we may remove some 349 * since we may remove some
511 */ 350 */
512 for (pl=first_player; pl!=NULL; ) { 351 for (pl=first_player; pl!=NULL; ) {
513 if (pl->socket.status == Ns_Dead) { 352 if (pl->socket.status == Ns_Dead) {
514 player *npl=pl->next; 353 player *npl=pl->next;
515 354
516 save_player(pl->ob, 0); 355 save_player(pl->ob, 0);
517 if(!QUERY_FLAG(pl->ob,FLAG_REMOVED)) { 356 if(!QUERY_FLAG(pl->ob,FLAG_REMOVED)) {
518 terminate_all_pets(pl->ob); 357 terminate_all_pets(pl->ob);
519 remove_ob(pl->ob); 358 remove_ob(pl->ob);
520 } 359 }
521 leave(pl,1); 360 leave(pl,1);
522 final_free_player(pl); 361 final_free_player(pl);
523 pl=npl; 362 pl=npl;
524 } 363 }
525 else { 364 else {
526 FD_SET((uint32)pl->socket.fd, &tmp_read); 365 FD_SET((uint32)pl->socket.fd, &tmp_read);
527 FD_SET((uint32)pl->socket.fd, &tmp_write); 366 FD_SET((uint32)pl->socket.fd, &tmp_write);
528 FD_SET((uint32)pl->socket.fd, &tmp_exceptions); 367 FD_SET((uint32)pl->socket.fd, &tmp_exceptions);
529 pl=pl->next; 368 pl=pl->next;
530 } 369 }
531 } 370 }
532 371
533 /* Reset timeout each time, since some OS's will change the values on 372 /* Reset timeout each time, since some OS's will change the values on
534 * the return from select. 373 * the return from select.
535 */ 374 */
536 socket_info.timeout.tv_sec = 0; 375 socket_info.timeout.tv_sec = 0;
537 socket_info.timeout.tv_usec = 0; 376 socket_info.timeout.tv_usec = 0;
538 377
539 pollret= select(socket_info.max_filedescriptor, &tmp_read, &tmp_write, 378 pollret= select(socket_info.max_filedescriptor, &tmp_read, &tmp_write,
540 &tmp_exceptions, &socket_info.timeout); 379 &tmp_exceptions, &socket_info.timeout);
541 380
542 if (pollret==-1) { 381 if (pollret==-1) {
543 LOG(llevError, "select failed: %s\n", strerror_local(errno)); 382 LOG(llevError, "select failed: %s\n", strerror(errno));
544 return; 383 return;
545 } 384 }
546 385
547 /* We need to do some of the processing below regardless */ 386 /* We need to do some of the processing below regardless */
548/* if (!pollret) return;*/ 387/* if (!pollret) return;*/
549 388
550 /* Following adds a new connection */ 389 /* Following adds a new connection */
551 if (pollret && FD_ISSET(init_sockets[0].fd, &tmp_read)) { 390 if (pollret && FD_ISSET(init_sockets[0].fd, &tmp_read)) {
552 int newsocknum=0; 391 int newsocknum=0;
553 392
554#ifdef ESRV_DEBUG 393#ifdef ESRV_DEBUG
555 LOG(llevDebug,"doeric_server: New Connection\n"); 394 LOG(llevDebug,"doeric_server: New Connection\n");
556#endif 395#endif
557 /* If this is the case, all sockets currently in used */ 396 /* If this is the case, all sockets currently in used */
558 if (socket_info.allocated_sockets <= socket_info.nconns) { 397 if (socket_info.allocated_sockets <= socket_info.nconns) {
559 init_sockets = (NewSocket *) realloc(init_sockets,sizeof(NewSocket)*(socket_info.nconns+1)); 398 init_sockets = (NewSocket *) realloc(init_sockets,sizeof(NewSocket)*(socket_info.nconns+1));
560 if (!init_sockets) fatal(OUT_OF_MEMORY); 399 if (!init_sockets) fatal(OUT_OF_MEMORY);
561 newsocknum = socket_info.allocated_sockets; 400 newsocknum = socket_info.allocated_sockets;
562 socket_info.allocated_sockets++; 401 socket_info.allocated_sockets++;
563 init_sockets[newsocknum].faces_sent_len = nrofpixmaps; 402 init_sockets[newsocknum].faces_sent_len = nrofpixmaps;
564 init_sockets[newsocknum].faces_sent = (uint8*) malloc(nrofpixmaps*sizeof(*init_sockets[newsocknum].faces_sent)); 403 init_sockets[newsocknum].faces_sent = (uint8*) malloc(nrofpixmaps*sizeof(*init_sockets[newsocknum].faces_sent));
565 if (!init_sockets[newsocknum].faces_sent) fatal(OUT_OF_MEMORY); 404 if (!init_sockets[newsocknum].faces_sent) fatal(OUT_OF_MEMORY);
566 init_sockets[newsocknum].status = Ns_Avail; 405 init_sockets[newsocknum].status = Ns_Avail;
567 } 406 }
568 else { 407 else {
569 int j; 408 int j;
570 409
571 for (j=1; j<socket_info.allocated_sockets; j++) 410 for (j=1; j<socket_info.allocated_sockets; j++)
572 if (init_sockets[j].status == Ns_Avail) { 411 if (init_sockets[j].status == Ns_Avail) {
573 newsocknum=j; 412 newsocknum=j;
574 break; 413 break;
575 } 414 }
576 } 415 }
577 init_sockets[newsocknum].fd=accept(init_sockets[0].fd, (struct sockaddr *)&addr, &addrlen); 416 init_sockets[newsocknum].fd=accept(init_sockets[0].fd, (struct sockaddr *)&addr, &addrlen);
578 if (init_sockets[newsocknum].fd==-1) { 417 if (init_sockets[newsocknum].fd==-1) {
579 LOG(llevError, "accept failed: %s\n", strerror_local(errno)); 418 LOG(llevError, "accept failed: %s\n", strerror(errno));
580 } 419 }
581 else { 420 else {
582 char buf[MAX_BUF]; 421 char buf[MAX_BUF];
583 long ip; 422 long ip;
584 NewSocket *ns; 423 NewSocket *ns;
585 424
586 ns = &init_sockets[newsocknum]; 425 ns = &init_sockets[newsocknum];
587 426
588 ip = ntohl(addr.sin_addr.s_addr); 427 ip = ntohl(addr.sin_addr.s_addr);
589 sprintf(buf, "%ld.%ld.%ld.%ld", (ip>>24)&255, (ip>>16)&255, (ip>>8)&255, ip&255); 428 sprintf(buf, "%ld.%ld.%ld.%ld", (ip>>24)&255, (ip>>16)&255, (ip>>8)&255, ip&255);
590 429
591 if (checkbanned(NULL, buf)) { 430 if (checkbanned(NULL, buf)) {
592 LOG(llevInfo, "Banned host tried to connect: [%s]\n", buf); 431 LOG(llevInfo, "Banned host tried to connect: [%s]\n", buf);
593 close(init_sockets[newsocknum].fd); 432 close(init_sockets[newsocknum].fd);
594 init_sockets[newsocknum].fd = -1; 433 init_sockets[newsocknum].fd = -1;
595 } 434 }
596 else { 435 else {
597 InitConnection(ns, buf); 436 InitConnection(ns, buf);
598 socket_info.nconns++; 437 socket_info.nconns++;
599 } 438 }
600 } 439 }
601 } 440 }
602 441
603 /* Check for any exceptions/input on the sockets */ 442 /* Check for any exceptions/input on the sockets */
604 if (pollret) for(i=1;i<socket_info.allocated_sockets;i++) { 443 if (pollret) for(i=1;i<socket_info.allocated_sockets;i++) {
605 if (init_sockets[i].status == Ns_Avail) continue; 444 if (init_sockets[i].status == Ns_Avail) continue;
606 if (FD_ISSET(init_sockets[i].fd,&tmp_exceptions)) { 445 if (FD_ISSET(init_sockets[i].fd,&tmp_exceptions)) {
607 free_newsocket(&init_sockets[i]); 446 free_newsocket(&init_sockets[i]);
608 init_sockets[i].status = Ns_Avail; 447 init_sockets[i].status = Ns_Avail;
609 socket_info.nconns--; 448 socket_info.nconns--;
610 continue; 449 continue;
611 } 450 }
612 if (FD_ISSET(init_sockets[i].fd, &tmp_read)) { 451 if (FD_ISSET(init_sockets[i].fd, &tmp_read)) {
613 HandleClient(&init_sockets[i], NULL); 452 HandleClient(&init_sockets[i], NULL);
614 } 453 }
615 if (FD_ISSET(init_sockets[i].fd, &tmp_write)) { 454 if (FD_ISSET(init_sockets[i].fd, &tmp_write)) {
616 init_sockets[i].can_write=1; 455 init_sockets[i].can_write=1;
617 } 456 }
618 } 457 }
619 458
620 /* This does roughly the same thing, but for the players now */ 459 /* This does roughly the same thing, but for the players now */
621 for (pl=first_player; pl!=NULL; pl=next) { 460 for (pl=first_player; pl!=NULL; pl=next) {
622 461
623 next=pl->next; 462 next=pl->next;
624 if (pl->socket.status==Ns_Dead) continue; 463 if (pl->socket.status==Ns_Dead) continue;
625 464
626 if (FD_ISSET(pl->socket.fd,&tmp_write)) { 465 if (FD_ISSET(pl->socket.fd,&tmp_write)) {
627 if (!pl->socket.can_write) { 466 if (!pl->socket.can_write) {
628#if 0 467#if 0
629 LOG(llevDebug,"Player %s socket now write enabled\n", pl->ob->name); 468 LOG(llevDebug,"Player %s socket now write enabled\n", pl->ob->name);
630#endif 469#endif
631 pl->socket.can_write=1; 470 pl->socket.can_write=1;
632 write_socket_buffer(&pl->socket); 471 write_socket_buffer(&pl->socket);
633 } 472 }
634 /* if we get an error on the write_socket buffer, no reason to 473 /* if we get an error on the write_socket buffer, no reason to
635 * continue on this socket. 474 * continue on this socket.
636 */ 475 */
637 if (pl->socket.status==Ns_Dead) continue; 476 if (pl->socket.status==Ns_Dead) continue;
638 } 477 }
639 else pl->socket.can_write=0; 478 else pl->socket.can_write=0;
640 479
641 if (FD_ISSET(pl->socket.fd,&tmp_exceptions)) { 480 if (FD_ISSET(pl->socket.fd,&tmp_exceptions)) {
642 save_player(pl->ob, 0); 481 save_player(pl->ob, 0);
643 if(!QUERY_FLAG(pl->ob,FLAG_REMOVED)) { 482 if(!QUERY_FLAG(pl->ob,FLAG_REMOVED)) {
644 terminate_all_pets(pl->ob); 483 terminate_all_pets(pl->ob);
645 remove_ob(pl->ob); 484 remove_ob(pl->ob);
646 } 485 }
647 leave(pl,1); 486 leave(pl,1);
648 final_free_player(pl); 487 final_free_player(pl);
649 } 488 }
650 else { 489 else {
651 HandleClient(&pl->socket, pl); 490 HandleClient(&pl->socket, pl);
652 /* If the player has left the game, then the socket status 491 /* If the player has left the game, then the socket status
653 * will be set to this be the leave function. We don't 492 * will be set to this be the leave function. We don't
654 * need to call leave again, as it has already been called 493 * need to call leave again, as it has already been called
655 * once. 494 * once.
656 */ 495 */
657 if (pl->socket.status==Ns_Dead) { 496 if (pl->socket.status==Ns_Dead) {
658 save_player(pl->ob, 0); 497 save_player(pl->ob, 0);
659 if(!QUERY_FLAG(pl->ob,FLAG_REMOVED)) { 498 if(!QUERY_FLAG(pl->ob,FLAG_REMOVED)) {
660 terminate_all_pets(pl->ob); 499 terminate_all_pets(pl->ob);
661 remove_ob(pl->ob); 500 remove_ob(pl->ob);
662 } 501 }
663 leave(pl,1); 502 leave(pl,1);
664 final_free_player(pl); 503 final_free_player(pl);
665 } else { 504 } else {
666 505
667 /* Update the players stats once per tick. More efficient than 506 /* Update the players stats once per tick. More efficient than
668 * sending them whenever they change, and probably just as useful 507 * sending them whenever they change, and probably just as useful
669 */ 508 */
670 esrv_update_stats(pl); 509 esrv_update_stats(pl);
671 if (pl->last_weight != -1 && pl->last_weight != WEIGHT(pl->ob)) { 510 if (pl->last_weight != -1 && pl->last_weight != WEIGHT(pl->ob)) {
672 esrv_update_item(UPD_WEIGHT, pl->ob, pl->ob); 511 esrv_update_item(UPD_WEIGHT, pl->ob, pl->ob);
673 if(pl->last_weight != WEIGHT(pl->ob)) 512 if(pl->last_weight != WEIGHT(pl->ob))
674 LOG(llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n", (unsigned long)pl->last_weight, WEIGHT(pl->ob)); 513 LOG(llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n", (unsigned long)pl->last_weight, WEIGHT(pl->ob));
675 } 514 }
676 /* draw_client_map does sanity checking that map is 515 /* draw_client_map does sanity checking that map is
677 * valid, so don't do it here. 516 * valid, so don't do it here.
678 */ 517 */
679 draw_client_map(pl->ob); 518 draw_client_map(pl->ob);
680 if (pl->socket.update_look) esrv_draw_look(pl->ob); 519 if (pl->socket.update_look) esrv_draw_look(pl->ob);
681 } 520 }
682 } 521 }
683 } 522 }
684} 523}

Diff Legend

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