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.5 by root, Sat Sep 9 21:48:29 2006 UTC vs.
Revision 1.16 by root, Thu Dec 14 22:45:41 2006 UTC

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

Diff Legend

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