--- deliantra/server/socket/loop.C 2006/08/24 13:13:49 1.2 +++ deliantra/server/socket/loop.C 2006/12/12 20:53:03 1.9 @@ -1,9 +1,3 @@ - -/* - * static char *rcsid_loop_c = - * "$Id: loop.C,v 1.2 2006/08/24 13:13:49 root Exp $"; - */ - /* CrossFire, A Multiplayer game for X-windows @@ -24,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - The author can be reached via e-mail to crossfire-devel@real-time.com + The author can be reached via e-mail to */ /** @@ -41,24 +35,22 @@ #include #ifndef __CEXTRACT__ -#include -#include +# include +# include #endif -#ifndef WIN32 /* ---win32 exclude unix headers */ #include #include #include #include #include -#endif /* end win32 */ #ifdef HAVE_UNISTD_H -#include +# include #endif #ifdef HAVE_ARPA_INET_H -#include +# include #endif #include @@ -77,18 +69,20 @@ * we end up having 2 tables. */ -typedef void (*func_uint8_int_ns) (char*, int, NewSocket *); +typedef void (*func_uint8_int_ns) (char *, int, NewSocket *); -struct NsCmdMapping { - const char *cmdname; - func_uint8_int_ns cmdproc; +struct NsCmdMapping +{ + const char *cmdname; + func_uint8_int_ns cmdproc; }; -typedef void (*func_uint8_int_pl)(char*, int, player *); -struct PlCmdMapping { - const char *cmdname; - func_uint8_int_pl cmdproc; - uint8 flag; +typedef void (*func_uint8_int_pl) (char *, int, player *); +struct PlCmdMapping +{ + const char *cmdname; + func_uint8_int_pl cmdproc; + uint8 flag; }; /** @@ -105,34 +99,34 @@ * command, 0 if they can issue it at any time. */ static struct PlCmdMapping plcommands[] = { - { "examine", ExamineCmd, 1}, - { "apply", ApplyCmd, 1}, - { "move", MoveCmd, 1}, - { "reply", ReplyCmd, 0}, - { "command", PlayerCmd, 1}, - { "ncom", (func_uint8_int_pl)NewPlayerCmd, 1}, - { "lookat", LookAt, 1}, - { "lock", (func_uint8_int_pl)LockItem, 1}, - { "mark", (func_uint8_int_pl)MarkItem, 1}, - { "mapredraw", MapRedrawCmd, 0}, /* Added: phil */ - { "mapinfo", MapInfoCmd, 2}, /* CF+ */ - { "ext", ExtCmd, 2}, /* CF+ */ - { NULL, NULL, 0} /* terminator */ + {"examine", ExamineCmd, 1}, + {"apply", ApplyCmd, 1}, + {"move", MoveCmd, 1}, + {"reply", ReplyCmd, 0}, + {"command", PlayerCmd, 1}, + {"ncom", (func_uint8_int_pl) NewPlayerCmd, 1}, + {"lookat", LookAt, 1}, + {"lock", (func_uint8_int_pl) LockItem, 1}, + {"mark", (func_uint8_int_pl) MarkItem, 1}, + {"mapredraw", MapRedrawCmd, 0}, /* Added: phil */ + {"mapinfo", MapInfoCmd, 2}, /* CF+ */ + {"ext", ExtCmd, 2}, /* CF+ */ + {NULL, NULL, 0} /* terminator */ }; /** Face-related commands */ static struct NsCmdMapping nscommands[] = { - { "addme", AddMeCmd }, - { "askface", SendFaceCmd}, /* Added: phil */ - { "requestinfo", RequestInfo}, - { "setfacemode", SetFaceMode}, - { "setsound", SetSound}, - { "setup", SetUp}, - { "version", VersionCmd }, - { "toggleextendedinfos", ToggleExtendedInfos}, /*Added: tchize*/ - { "toggleextendedtext", ToggleExtendedText}, /*Added: tchize*/ - { "asksmooth", AskSmooth}, /*Added: tchize (smoothing technologies)*/ - { NULL, NULL} /* terminator (I, II & III)*/ + {"addme", AddMeCmd}, + {"askface", SendFaceCmd}, /* Added: phil */ + {"requestinfo", RequestInfo}, + {"setfacemode", SetFaceMode}, + {"setsound", SetSound}, + {"setup", SetUp}, + {"version", VersionCmd}, + {"toggleextendedinfos", ToggleExtendedInfos}, /*Added: tchize */ + {"toggleextendedtext", ToggleExtendedText}, /*Added: tchize */ + {"asksmooth", AskSmooth}, /*Added: tchize (smoothing technologies) */ + {NULL, NULL} /* terminator (I, II & III) */ }; /** @@ -140,181 +134,44 @@ * request of information, but we call other functions to provide * that information. */ -void RequestInfo(char *buf, int len, NewSocket *ns) +void +RequestInfo (char *buf, int len, NewSocket * ns) { - char *params=NULL, *cp; - /* No match */ - char bigbuf[MAX_BUF]; - int slen; - - /* Set up replyinfo before we modify any of the buffers - this is used - * if we don't find a match. - */ - strcpy(bigbuf,"replyinfo "); - slen = strlen(bigbuf); - safe_strcat(bigbuf, buf, &slen, MAX_BUF); - - /* find the first space, make it null, and update the - * params pointer. - */ - for (cp = buf; *cp != '\0'; cp++) - if (*cp==' ') { - *cp = '\0'; - params = cp + 1; - break; - } - if (!strcmp(buf, "image_info")) send_image_info(ns, params); - else if (!strcmp(buf,"image_sums")) send_image_sums(ns, params); - else if (!strcmp(buf,"skill_info")) send_skill_info(ns, params); - else if (!strcmp(buf,"spell_paths")) send_spell_paths(ns, params); - else Write_String_To_Socket(ns, bigbuf, len); -} - -/** - * Handles old socket format. - */ -void Handle_Oldsocket(NewSocket *ns) -{ - int stat,i; - CommFunc command; - char buf[MAX_BUF],*cp; - object ob; - player pl; - - /* This is not the most efficient block, but keeps the code simpler - - * we basically read a byte at a time until we get a newline, error, - * or no more characters to read. - */ - do { - /* hack to disable old socket mode without creating too many conflicts */ - if (1 || ns->inbuf.len >= MAXSOCKBUF-1) { - ns->status = Ns_Dead; - LOG(llevDebug, "Old input socket sent too much data without newline\n"); - return; - } -#ifdef WIN32 /* ***win32: change oldsocket read() to recv() */ - stat = recv(ns->fd, ns->inbuf.buf + ns->inbuf.len, 1,0); - - if (stat==-1 && WSAGetLastError() !=WSAEWOULDBLOCK) { -#else - do { - stat = read(ns->fd, ns->inbuf.buf + ns->inbuf.len, 1); - } while ((stat<0) && (errno == EINTR)); - - if (stat<0 && errno != EAGAIN && errno !=EWOULDBLOCK) { -#endif - LOG(llevError, "Cannot read from socket: %s\n", strerror_local(errno)); - ns->status = Ns_Dead; - return; - } - if (stat == 0) return; - } while (ns->inbuf.buf[ns->inbuf.len++]!='\n'); - - ns->inbuf.buf[ns->inbuf.len]=0; - - cp = strchr((const char*)ns->inbuf.buf, ' '); - if (cp) { - /* Replace the space with a null, skip any more spaces */ - *cp++=0; - while (isspace(*cp)) cp++; - } + char *params = NULL, *cp; - /* Strip off all spaces and control characters from end of line */ - for (i=ns->inbuf.len-1; i>=0; i--) { - if (ns->inbuf.buf[i]<=32) ns->inbuf.buf[i]=0; - else break; - } - ns->inbuf.len=0; /* reset for next read */ - - /* If just a return, don't do anything */ - if (ns->inbuf.buf[0] == 0) return; - if (!strcasecmp((const char*)ns->inbuf.buf,"quit")) { - ns->status = Ns_Dead; - return; - } - if (!strcasecmp((const char*)ns->inbuf.buf, "listen")) { - if (cp) { - char *buf="Socket switched to listen mode\n"; - - free(ns->comment); - ns->comment = strdup_local(cp); - ns->old_mode = Old_Listen; - cs_write_string(ns, buf, strlen(buf)); - } else { - char *buf="Need to supply a comment/url to listen\n"; - cs_write_string(ns, buf, strlen(buf)); - } - return; - } - if (!strcasecmp((const char*)ns->inbuf.buf, "name")) { - char *cp1=NULL; - if (cp) cp1= strchr(cp, ' '); - if (cp1) { - *cp1++ = 0; - while (isspace(*cp1)) cp1++; - } - if (!cp || !cp1) { - char *buf="Need to provide a name/password to name\n"; - cs_write_string(ns, buf, strlen(buf)); - return; - } - - if (verify_player(cp, cp1)==0) { - char *buf="Welcome back\n"; - free(ns->comment); - ns->comment = strdup_local(cp); - ns->old_mode = Old_Player; - cs_write_string(ns, buf, strlen(buf)); - } - else if (verify_player(cp, cp1)==2) { - ns->password_fails++; - if (ns->password_fails >= MAX_PASSWORD_FAILURES) { - char *buf="You failed to log in too many times, you will now be kicked.\n"; - LOG(llevInfo, "A player connecting from %s in oldsocketmode has been dropped for password failure\n", - ns->host); - cs_write_string(ns, buf, strlen(buf)); - ns->status = Ns_Dead; - } - else { - char *buf="Could not login you in. Check your name and password.\n"; - cs_write_string(ns, buf, strlen(buf)); - } - } - else { - char *buf="Could not login you in. Check your name and password.\n"; - cs_write_string(ns, buf, strlen(buf)); - } - return; - } - - command = find_oldsocket_command((char*)ns->inbuf.buf); - if (!command && ns->old_mode==Old_Player) { - command = find_oldsocket_command2((char*)ns->inbuf.buf); - } - if (!command) { - snprintf(buf, sizeof(buf), "Could not find command: %s\n", ns->inbuf.buf); - cs_write_string(ns, buf, strlen(buf)); - return; - } - - /* This is a bit of a hack, but works. Basically, we make some - * fake object and player pointers and give at it. - * This works as long as the functions we are calling don't need - * to do anything to the object structure (ie, they are only - * outputting information and not actually updating anything much.) - */ - ob.contr = &pl; - pl.ob = &ob; - ob.type = PLAYER; - pl.listening = 10; - pl.socket = *ns; - pl.outputs_count = 1; - ob.name = ns->comment; - - command(&ob, cp); + /* No match */ + char bigbuf[MAX_BUF]; + int slen; + + /* Set up replyinfo before we modify any of the buffers - this is used + * if we don't find a match. + */ + strcpy (bigbuf, "replyinfo "); + slen = strlen (bigbuf); + safe_strcat (bigbuf, buf, &slen, MAX_BUF); + + /* find the first space, make it null, and update the + * params pointer. + */ + for (cp = buf; *cp != '\0'; cp++) + if (*cp == ' ') + { + *cp = '\0'; + params = cp + 1; + break; + } + if (!strcmp (buf, "image_info")) + send_image_info (ns, params); + else if (!strcmp (buf, "image_sums")) + send_image_sums (ns, params); + else if (!strcmp (buf, "skill_info")) + send_skill_info (ns, params); + else if (!strcmp (buf, "spell_paths")) + send_spell_paths (ns, params); + else + Write_String_To_Socket (ns, bigbuf, len); } - /** * Handle client input. * @@ -325,101 +182,97 @@ * starting a connection) */ -void HandleClient(NewSocket *ns, player *pl) +void +HandleClient (NewSocket * ns, player *pl) { - int len=0,i,cnt; - char *data; + int len = 0, i, cnt; + char *data; + + /* Loop through this - maybe we have several complete packets here. */ + // limit to a few commands only, though, as to not monopolise the server + for (cnt = 16; cnt--;) + { + /* If it is a player, and they don't have any speed left, we + * return, and will read in the data when they do have time. + */ + if (pl && pl->state == ST_PLAYING && pl->ob != NULL && pl->ob->speed_left < 0) + { + return; + } - /* Loop through this - maybe we have several complete packets here. */ - // limit to a few commands only, though, as to not monopolise the server - for (cnt = 16; cnt--; ) { - /* If it is a player, and they don't have any speed left, we - * return, and will read in the data when they do have time. - */ - if (pl && pl->state==ST_PLAYING && pl->ob != NULL && pl->ob->speed_left < 0) { - return; - } - - if (ns->status == Ns_Old) { - Handle_Oldsocket(ns); - return; - } - i=SockList_ReadPacket(ns->fd, &ns->inbuf, MAXSOCKBUF-1); - /* Special hack - let the user switch to old mode if in the Ns_Add - * phase. Don't demand they add in the special length bytes - */ - if (ns->status == Ns_Add) { - if (!strncasecmp((const char*)ns->inbuf.buf,"oldsocketmode", 13)) { - ns->status = Ns_Old; - ns->inbuf.len=0; - cs_write_string(ns, "Switched to old socket mode\n", 28); - LOG(llevDebug,"Switched socket to old socket mode\n"); - return; - } - } + i = SockList_ReadPacket (ns->fd, &ns->inbuf, MAXSOCKBUF - 1); - if (i<0) { + if (i < 0) + { #ifdef ESRV_DEBUG - LOG(llevDebug,"HandleClient: Read error on connection player %s\n", (pl?pl->ob->name:"None")); + LOG (llevDebug, "HandleClient: Read error on connection player %s\n", (pl ? pl->ob->name : "None")); #endif - /* Caller will take care of cleaning this up */ - ns->status =Ns_Dead; - return; - } - /* Still dont have a full packet */ - if (i==0) return; + /* Caller will take care of cleaning this up */ + ns->status = Ns_Dead; + return; + } + /* Still dont have a full packet */ + if (i == 0) + return; // //D//TODO//temporarily log long commands // if (ns->inbuf.len >= 40 && pl && pl->ob) // LOG (llevDebug, "HandleClient: long comamnd from <%s,%s> %d<%s>\n", pl->ob->name, ns->host, ns->inbuf.len, ns->inbuf.buf + 2); - /* First, break out beginning word. There are at least - * a few commands that do not have any paremeters. If - * we get such a command, don't worry about trying - * to break it up. - */ - data = (char *)strchr((char*)ns->inbuf.buf +2, ' '); - if (data) { - *data='\0'; - data++; - len = ns->inbuf.len - (data - (char*)ns->inbuf.buf); - } - else len=0; - - ns->inbuf.buf[ns->inbuf.len]='\0'; /* Terminate buffer - useful for string data */ - for (i=0; nscommands[i].cmdname !=NULL; i++) { - if (strcmp((char*)ns->inbuf.buf+2,nscommands[i].cmdname)==0) { - nscommands[i].cmdproc((char*)data,len,ns); - ns->inbuf.len=0; - return;//D// not doing this causes random memory corruption - goto next_packet; - } - } - /* Player must be in the playing state or the flag on the - * the command must be zero for the user to use the command - - * otherwise, a player cam save, be in the play_again state, and - * the map they were on gets swapped out, yet things that try to look - * at the map causes a crash. If the command is valid, but - * one they can't use, we still swallow it up. - */ - if (pl) for (i=0; plcommands[i].cmdname !=NULL; i++) { - if (strcmp((char*)ns->inbuf.buf+2,plcommands[i].cmdname)==0) { - if (pl->state == ST_PLAYING || !(plcommands[i].flag & 1)) - plcommands[i].cmdproc((char*)data,len,pl); - ns->inbuf.len=0; + /* First, break out beginning word. There are at least + * a few commands that do not have any paremeters. If + * we get such a command, don't worry about trying + * to break it up. + */ + data = (char *) strchr ((char *) ns->inbuf.buf + 2, ' '); + if (data) + { + *data = '\0'; + data++; + len = ns->inbuf.len - (data - (char *) ns->inbuf.buf); + } + else + len = 0; + + ns->inbuf.buf[ns->inbuf.len] = '\0'; /* Terminate buffer - useful for string data */ + for (i = 0; nscommands[i].cmdname != NULL; i++) + { + if (strcmp ((char *) ns->inbuf.buf + 2, nscommands[i].cmdname) == 0) + { + nscommands[i].cmdproc ((char *) data, len, ns); + ns->inbuf.len = 0; + return; //D// not doing this causes random memory corruption + goto next_packet; + } + } + /* Player must be in the playing state or the flag on the + * the command must be zero for the user to use the command - + * otherwise, a player cam save, be in the play_again state, and + * the map they were on gets swapped out, yet things that try to look + * at the map causes a crash. If the command is valid, but + * one they can't use, we still swallow it up. + */ + if (pl) + for (i = 0; plcommands[i].cmdname != NULL; i++) + { + if (strcmp ((char *) ns->inbuf.buf + 2, plcommands[i].cmdname) == 0) + { + if (pl->state == ST_PLAYING || !(plcommands[i].flag & 1)) + plcommands[i].cmdproc ((char *) data, len, pl); + ns->inbuf.len = 0; //D// not doing this causes random memory corruption if (plcommands[i].flag & 2) goto next_packet; return; - } - } - /* If we get here, we didn't find a valid command. Logging - * this might be questionable, because a broken client/malicious - * user could certainly send a whole bunch of invalid commands. - */ - LOG(llevDebug,"Bad command from client (%s)\n",ns->inbuf.buf+2); + } + } + /* If we get here, we didn't find a valid command. Logging + * this might be questionable, because a broken client/malicious + * user could certainly send a whole bunch of invalid commands. + */ + LOG (llevDebug, "Bad command from client (%s)\n", ns->inbuf.buf + 2); next_packet: - ; + ; } } @@ -432,6 +285,7 @@ ******************************************************************************/ #ifdef WATCHDOG + /** * Tell watchdog that we are still alive * @@ -439,29 +293,30 @@ * all the needed include files for socket support */ -void watchdog(void) +void +watchdog (void) { - static int fd=-1; + static int fd = -1; static struct sockaddr_in insock; - if (fd==-1) + if (fd == -1) { struct protoent *protoent; - if ((protoent=getprotobyname("udp"))==NULL || - (fd=socket(PF_INET, SOCK_DGRAM, protoent->p_proto))==-1) - { - return; - } - insock.sin_family=AF_INET; - insock.sin_port=htons((unsigned short)13325); - insock.sin_addr.s_addr=inet_addr("127.0.0.1"); + if ((protoent = getprotobyname ("udp")) == NULL || (fd = socket (PF_INET, SOCK_DGRAM, protoent->p_proto)) == -1) + { + return; + } + insock.sin_family = AF_INET; + insock.sin_port = htons ((unsigned short) 13325); + insock.sin_addr.s_addr = inet_addr ("127.0.0.1"); } - sendto(fd,(void *)&fd,1,0,(struct sockaddr *)&insock,sizeof(insock)); + sendto (fd, (void *) &fd, 1, 0, (struct sockaddr *) &insock, sizeof (insock)); } #endif -void flush_sockets(void) +void +flush_sockets (void) { player *pl; @@ -477,208 +332,250 @@ * There are 2 lists we need to look through - init_sockets is a list * */ -void doeric_server(void) +void +doeric_server (void) { - int i, pollret; - fd_set tmp_read, tmp_exceptions, tmp_write; - struct sockaddr_in addr; - socklen_t addrlen=sizeof(struct sockaddr); - player *pl, *next; + int i, pollret; + fd_set tmp_read, tmp_exceptions, tmp_write; + struct sockaddr_in addr; + socklen_t addrlen = sizeof (struct sockaddr); + player *pl, *next; #ifdef CS_LOGSTATS - if ((time(NULL)-cst_lst.time_start)>=CS_LOGTIME) - write_cs_stats(); + if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME) + write_cs_stats (); #endif - FD_ZERO(&tmp_read); - FD_ZERO(&tmp_write); - FD_ZERO(&tmp_exceptions); - - for(i=0;isocket.status == Ns_Dead) { - player *npl=pl->next; - - save_player(pl->ob, 0); - if(!QUERY_FLAG(pl->ob,FLAG_REMOVED)) { - terminate_all_pets(pl->ob); - remove_ob(pl->ob); - } - leave(pl,1); - final_free_player(pl); - pl=npl; - } - else { - FD_SET((uint32)pl->socket.fd, &tmp_read); - FD_SET((uint32)pl->socket.fd, &tmp_write); - FD_SET((uint32)pl->socket.fd, &tmp_exceptions); - pl=pl->next; - } - } + for (i = 0; i < socket_info.allocated_sockets; i++) + { + if (init_sockets[i].status == Ns_Dead) + { + free_newsocket (&init_sockets[i]); + init_sockets[i].status = Ns_Avail; + socket_info.nconns--; + } + else if (init_sockets[i].status != Ns_Avail) + { + FD_SET ((uint32) init_sockets[i].fd, &tmp_read); + FD_SET ((uint32) init_sockets[i].fd, &tmp_write); + FD_SET ((uint32) init_sockets[i].fd, &tmp_exceptions); + } + } + + /* Go through the players. Let the loop set the next pl value, + * since we may remove some + */ + for (pl = first_player; pl != NULL;) + { + if (pl->socket.status == Ns_Dead) + { + player *npl = pl->next; + + save_player (pl->ob, 0); + if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) + { + terminate_all_pets (pl->ob); + pl->ob->remove (); + } + leave (pl, 1); + final_free_player (pl); + pl = npl; + } + else + { + FD_SET ((uint32) pl->socket.fd, &tmp_read); + FD_SET ((uint32) pl->socket.fd, &tmp_write); + FD_SET ((uint32) pl->socket.fd, &tmp_exceptions); + pl = pl->next; + } + } + + /* Reset timeout each time, since some OS's will change the values on + * the return from select. + */ + socket_info.timeout.tv_sec = 0; + socket_info.timeout.tv_usec = 0; - /* Reset timeout each time, since some OS's will change the values on - * the return from select. - */ - socket_info.timeout.tv_sec = 0; - socket_info.timeout.tv_usec = 0; - - pollret= select(socket_info.max_filedescriptor, &tmp_read, &tmp_write, - &tmp_exceptions, &socket_info.timeout); - - if (pollret==-1) { - LOG(llevError, "select failed: %s\n", strerror_local(errno)); - return; + pollret = select (socket_info.max_filedescriptor, &tmp_read, &tmp_write, &tmp_exceptions, &socket_info.timeout); + + if (pollret == -1) + { + LOG (llevError, "select failed: %s\n", strerror (errno)); + return; } - /* We need to do some of the processing below regardless */ + /* We need to do some of the processing below regardless */ + /* if (!pollret) return;*/ - /* Following adds a new connection */ - if (pollret && FD_ISSET(init_sockets[0].fd, &tmp_read)) { - int newsocknum=0; + /* Following adds a new connection */ + if (pollret && FD_ISSET (init_sockets[0].fd, &tmp_read)) + { + int newsocknum = 0; #ifdef ESRV_DEBUG - LOG(llevDebug,"doeric_server: New Connection\n"); + LOG (llevDebug, "doeric_server: New Connection\n"); #endif - /* If this is the case, all sockets currently in used */ - if (socket_info.allocated_sockets <= socket_info.nconns) { - init_sockets = (NewSocket *) realloc(init_sockets,sizeof(NewSocket)*(socket_info.nconns+1)); - if (!init_sockets) fatal(OUT_OF_MEMORY); - newsocknum = socket_info.allocated_sockets; - socket_info.allocated_sockets++; - init_sockets[newsocknum].faces_sent_len = nrofpixmaps; - init_sockets[newsocknum].faces_sent = (uint8*) malloc(nrofpixmaps*sizeof(*init_sockets[newsocknum].faces_sent)); - if (!init_sockets[newsocknum].faces_sent) fatal(OUT_OF_MEMORY); - init_sockets[newsocknum].status = Ns_Avail; - } - else { - int j; - - for (j=1; j>24)&255, (ip>>16)&255, (ip>>8)&255, ip&255); - - if (checkbanned(NULL, buf)) { - LOG(llevInfo, "Banned host tried to connect: [%s]\n", buf); - close(init_sockets[newsocknum].fd); - init_sockets[newsocknum].fd = -1; - } - else { - InitConnection(ns, buf); - socket_info.nconns++; - } - } - } - - /* Check for any exceptions/input on the sockets */ - if (pollret) for(i=1;i> 24) & 255, (ip >> 16) & 255, (ip >> 8) & 255, ip & 255); + + if (checkbanned (NULL, buf)) + { + LOG (llevInfo, "Banned host tried to connect: [%s]\n", buf); + close (init_sockets[newsocknum].fd); + init_sockets[newsocknum].fd = -1; + } + else + { + InitConnection (ns, buf); + socket_info.nconns++; + } + } + } + + /* Check for any exceptions/input on the sockets */ + if (pollret) + for (i = 1; i < socket_info.allocated_sockets; i++) + { + if (init_sockets[i].status == Ns_Avail) + continue; + if (FD_ISSET (init_sockets[i].fd, &tmp_exceptions)) + { + free_newsocket (&init_sockets[i]); + init_sockets[i].status = Ns_Avail; + socket_info.nconns--; + continue; + } + if (FD_ISSET (init_sockets[i].fd, &tmp_read)) + { + HandleClient (&init_sockets[i], NULL); + } + if (FD_ISSET (init_sockets[i].fd, &tmp_write)) + { + init_sockets[i].can_write = 1; + } + } - next=pl->next; - if (pl->socket.status==Ns_Dead) continue; + /* This does roughly the same thing, but for the players now */ + for (pl = first_player; pl != NULL; pl = next) + { - if (FD_ISSET(pl->socket.fd,&tmp_write)) { - if (!pl->socket.can_write) { + next = pl->next; + if (pl->socket.status == Ns_Dead) + continue; + + if (FD_ISSET (pl->socket.fd, &tmp_write)) + { + if (!pl->socket.can_write) + { #if 0 - LOG(llevDebug,"Player %s socket now write enabled\n", pl->ob->name); + LOG (llevDebug, "Player %s socket now write enabled\n", pl->ob->name); #endif - pl->socket.can_write=1; - write_socket_buffer(&pl->socket); - } - /* if we get an error on the write_socket buffer, no reason to - * continue on this socket. - */ - if (pl->socket.status==Ns_Dead) continue; - } - else pl->socket.can_write=0; - - if (FD_ISSET(pl->socket.fd,&tmp_exceptions)) { - save_player(pl->ob, 0); - if(!QUERY_FLAG(pl->ob,FLAG_REMOVED)) { - terminate_all_pets(pl->ob); - remove_ob(pl->ob); - } - leave(pl,1); - final_free_player(pl); - } - else { - HandleClient(&pl->socket, pl); - /* If the player has left the game, then the socket status - * will be set to this be the leave function. We don't - * need to call leave again, as it has already been called - * once. - */ - if (pl->socket.status==Ns_Dead) { - save_player(pl->ob, 0); - if(!QUERY_FLAG(pl->ob,FLAG_REMOVED)) { - terminate_all_pets(pl->ob); - remove_ob(pl->ob); - } - leave(pl,1); - final_free_player(pl); - } else { - - /* Update the players stats once per tick. More efficient than - * sending them whenever they change, and probably just as useful - */ - esrv_update_stats(pl); - if (pl->last_weight != -1 && pl->last_weight != WEIGHT(pl->ob)) { - esrv_update_item(UPD_WEIGHT, pl->ob, pl->ob); - if(pl->last_weight != WEIGHT(pl->ob)) - 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)); - } - /* draw_client_map does sanity checking that map is - * valid, so don't do it here. - */ - draw_client_map(pl->ob); - if (pl->socket.update_look) esrv_draw_look(pl->ob); - } - } + pl->socket.can_write = 1; + write_socket_buffer (&pl->socket); + } + /* if we get an error on the write_socket buffer, no reason to + * continue on this socket. + */ + if (pl->socket.status == Ns_Dead) + continue; + } + else + pl->socket.can_write = 0; + + if (FD_ISSET (pl->socket.fd, &tmp_exceptions)) + { + save_player (pl->ob, 0); + if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) + { + terminate_all_pets (pl->ob); + pl->ob->remove (); + } + leave (pl, 1); + final_free_player (pl); + } + else + { + HandleClient (&pl->socket, pl); + /* If the player has left the game, then the socket status + * will be set to this be the leave function. We don't + * need to call leave again, as it has already been called + * once. + */ + if (pl->socket.status == Ns_Dead) + { + save_player (pl->ob, 0); + if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) + { + terminate_all_pets (pl->ob); + pl->ob->remove (); + } + leave (pl, 1); + final_free_player (pl); + } + else + { + + /* Update the players stats once per tick. More efficient than + * sending them whenever they change, and probably just as useful + */ + esrv_update_stats (pl); + if (pl->last_weight != -1 && pl->last_weight != WEIGHT (pl->ob)) + { + esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob); + if (pl->last_weight != WEIGHT (pl->ob)) + 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)); + } + /* draw_client_map does sanity checking that map is + * valid, so don't do it here. + */ + draw_client_map (pl->ob); + if (pl->socket.update_look) + esrv_draw_look (pl->ob); + } + } } }