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.6 by root, Sun Sep 10 13:43:33 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.6 2006/09/10 13:43:33 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
83{ 68{
84 const char *cmdname; 69 const char *cmdname;
85 func_uint8_int_ns cmdproc; 70 func_uint8_int_ns cmdproc;
71 uint8 flag;
86}; 72};
87 73
88typedef void (*func_uint8_int_pl) (char *, int, player *); 74typedef void (*func_uint8_int_pl) (char *, int, player *);
89struct PlCmdMapping 75struct PlCmdMapping
90{ 76{
… …
117 {"lock", (func_uint8_int_pl) LockItem, 1}, 103 {"lock", (func_uint8_int_pl) LockItem, 1},
118 {"mark", (func_uint8_int_pl) MarkItem, 1}, 104 {"mark", (func_uint8_int_pl) MarkItem, 1},
119 {"mapredraw", MapRedrawCmd, 0}, /* Added: phil */ 105 {"mapredraw", MapRedrawCmd, 0}, /* Added: phil */
120 {"mapinfo", MapInfoCmd, 2}, /* CF+ */ 106 {"mapinfo", MapInfoCmd, 2}, /* CF+ */
121 {"ext", ExtCmd, 2}, /* CF+ */ 107 {"ext", ExtCmd, 2}, /* CF+ */
122 {NULL, NULL, 0} /* terminator */ 108 { 0 } /* terminator */
123}; 109};
124 110
125/** Face-related commands */ 111/** Face-related commands */
126static struct NsCmdMapping nscommands[] = { 112static struct NsCmdMapping nscommands[] = {
127 {"addme", AddMeCmd}, 113 {"addme", AddMeCmd, 2},
128 {"askface", SendFaceCmd}, /* Added: phil */ 114 {"askface", SendFaceCmd}, /* Added: phil */
129 {"requestinfo", RequestInfo}, 115 {"requestinfo", RequestInfo},
130 {"setfacemode", SetFaceMode}, 116 {"setfacemode", SetFaceMode, 2},
131 {"setsound", SetSound}, 117 {"setsound", SetSound, 2},
132 {"setup", SetUp}, 118 {"setup", SetUp, 2},
133 {"version", VersionCmd}, 119 {"version", VersionCmd, 2},
134 {"toggleextendedinfos", ToggleExtendedInfos}, /*Added: tchize */ 120 {"toggleextendedinfos", ToggleExtendedInfos, 2}, /*Added: tchize */
135 {"toggleextendedtext", ToggleExtendedText}, /*Added: tchize */ 121 {"toggleextendedtext", ToggleExtendedText, 2}, /*Added: tchize */
136 {"asksmooth", AskSmooth}, /*Added: tchize (smoothing technologies) */ 122 {"asksmooth", AskSmooth}, /*Added: tchize (smoothing technologies) */
137 {NULL, NULL} /* terminator (I, II & III) */ 123 { 0 } /* terminator (I, II & III) */
138}; 124};
139 125
140/** 126/**
141 * RequestInfo is sort of a meta command. There is some specific 127 * RequestInfo is sort of a meta command. There is some specific
142 * request of information, but we call other functions to provide 128 * request of information, but we call other functions to provide
143 * that information. 129 * that information.
144 */ 130 */
145void 131void
146RequestInfo (char *buf, int len, NewSocket * ns) 132RequestInfo (char *buf, int len, client_socket * ns)
147{ 133{
148 char *params = NULL, *cp; 134 char *params = NULL, *cp;
149 135
150 /* No match */ 136 /* No match */
151 char bigbuf[MAX_BUF]; 137 char bigbuf[MAX_BUF];
… …
166 { 152 {
167 *cp = '\0'; 153 *cp = '\0';
168 params = cp + 1; 154 params = cp + 1;
169 break; 155 break;
170 } 156 }
157
171 if (!strcmp (buf, "image_info")) 158 if (!strcmp (buf, "image_info"))
172 send_image_info (ns, params); 159 send_image_info (ns, params);
173 else if (!strcmp (buf, "image_sums")) 160 else if (!strcmp (buf, "image_sums"))
174 send_image_sums (ns, params); 161 send_image_sums (ns, params);
175 else if (!strcmp (buf, "skill_info")) 162 else if (!strcmp (buf, "skill_info"))
176 send_skill_info (ns, params); 163 send_skill_info (ns, params);
177 else if (!strcmp (buf, "spell_paths")) 164 else if (!strcmp (buf, "spell_paths"))
178 send_spell_paths (ns, params); 165 send_spell_paths (ns, params);
179 else 166 else
180 Write_String_To_Socket (ns, bigbuf, len); 167 ns->send_packet (bigbuf, len);
181} 168}
182 169
183/** 170/**
184 * Handle client input. 171 * Handle client input.
185 * 172 *
… …
189 * 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
190 * starting a connection) 177 * starting a connection)
191 */ 178 */
192 179
193void 180void
194HandleClient (NewSocket * ns, player *pl) 181HandleClient (client_socket *ns, player *pl)
195{ 182{
196 int len = 0, i, cnt;
197 char *data;
198
199 /* Loop through this - maybe we have several complete packets here. */ 183 /* Loop through this - maybe we have several complete packets here. */
200 // 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
201 for (cnt = 16; cnt--;) 185 for (int repeat = 16; repeat--;)
202 { 186 {
203 /* 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
204 * 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.
205 */ 189 */
206 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)
207 {
208 return; 191 return;
192
193 int pkt_len = ns->read_packet ();
194
195 if (pkt_len < 0)
209 } 196 {
210 197 LOG (llevError, "read error on player %s\n", &pl->ob->name);
211 i = SockList_ReadPacket (ns->fd, &ns->inbuf, MAXSOCKBUF - 1);
212
213 if (i < 0)
214 {
215#ifdef ESRV_DEBUG
216 LOG (llevDebug, "HandleClient: Read error on connection player %s\n", (pl ? pl->ob->name : "None"));
217#endif
218 /* Caller will take care of cleaning this up */ 198 /* Caller will take care of cleaning this up */
219 ns->status = Ns_Dead; 199 ns->status = Ns_Dead;
220 return; 200 return;
221 } 201 }
202 else if (pkt_len == 0)
222 /* Still dont have a full packet */ 203 /* Still dont have a full packet */
223 if (i == 0)
224 return; 204 return;
225
226// //D//TODO//temporarily log long commands
227// if (ns->inbuf.len >= 40 && pl && pl->ob)
228// LOG (llevDebug, "HandleClient: long comamnd from <%s,%s> %d<%s>\n", pl->ob->name, ns->host, ns->inbuf.len, ns->inbuf.buf + 2);
229 205
230 /* First, break out beginning word. There are at least 206 /* First, break out beginning word. There are at least
231 * a few commands that do not have any paremeters. If 207 * a few commands that do not have any paremeters. If
232 * we get such a command, don't worry about trying 208 * we get such a command, don't worry about trying
233 * to break it up. 209 * to break it up.
234 */ 210 */
211 int datalen;
235 data = (char *) strchr ((char *) ns->inbuf.buf + 2, ' '); 212 char *data = strchr ((char *)ns->inbuf + 2, ' ');
213
236 if (data) 214 if (data)
237 { 215 {
238 *data = '\0'; 216 *data++ = 0;
239 data++; 217 datalen = pkt_len - (data - (char *)ns->inbuf);
240 len = ns->inbuf.len - (data - (char *) ns->inbuf.buf);
241 } 218 }
242 else 219 else
220 {
221 data = (char *)ns->inbuf + 2; // better read garbage than segfault
243 len = 0; 222 datalen = 0;
244
245 ns->inbuf.buf[ns->inbuf.len] = '\0'; /* Terminate buffer - useful for string data */
246 for (i = 0; nscommands[i].cmdname != NULL; i++)
247 { 223 }
224
225 ns->inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */
226
227 for (int i = 0; nscommands[i].cmdname; i++)
228 {
248 if (strcmp ((char *) ns->inbuf.buf + 2, nscommands[i].cmdname) == 0) 229 if (!strcmp ((char *)ns->inbuf + 2, nscommands[i].cmdname))
249 { 230 {
250 nscommands[i].cmdproc ((char *) data, len, ns); 231 nscommands[i].cmdproc (data, datalen, ns);
251 ns->inbuf.len = 0; 232 ns->skip_packet (pkt_len);
252 return; //D// not doing this causes random memory corruption 233 //D// not doing this causes random memory corruption
234 if (nscommands[i].flag & 2)
253 goto next_packet; 235 goto next_packet;
236 return;
254 } 237 }
255 } 238 }
239
256 /* 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
257 * 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 -
258 * 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
259 * 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
260 * 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
261 * one they can't use, we still swallow it up. 245 * one they can't use, we still swallow it up.
262 */ 246 */
263 if (pl) 247 if (pl)
264 for (i = 0; plcommands[i].cmdname != NULL; i++) 248 for (int i = 0; plcommands[i].cmdname; i++)
265 { 249 {
266 if (strcmp ((char *) ns->inbuf.buf + 2, plcommands[i].cmdname) == 0) 250 if (!strcmp ((char *)ns->inbuf + 2, plcommands[i].cmdname))
267 { 251 {
268 if (pl->state == ST_PLAYING || !(plcommands[i].flag & 1)) 252 if (pl->state == ST_PLAYING || !(plcommands[i].flag & 1))
269 plcommands[i].cmdproc ((char *) data, len, pl); 253 plcommands[i].cmdproc ((char *) data, datalen, pl);
270 ns->inbuf.len = 0; 254
255 ns->skip_packet (pkt_len);
271 //D// not doing this causes random memory corruption 256 //D// not doing this causes random memory corruption
272 if (plcommands[i].flag & 2) 257 if (plcommands[i].flag & 2)
273 goto next_packet; 258 goto next_packet;
259
274 return; 260 return;
275 } 261 }
276 } 262 }
263
277 /* 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
278 * this might be questionable, because a broken client/malicious 265 * this might be questionable, because a broken client/malicious
279 * user could certainly send a whole bunch of invalid commands. 266 * user could certainly send a whole bunch of invalid commands.
280 */ 267 */
281 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);
282 next_packet: 270 next_packet:
283 ; 271 ;
284 } 272 }
285} 273}
286 274
287
288/*****************************************************************************
289 *
290 * Low level socket looping - select calls and watchdog udp packet
291 * sending.
292 *
293 ******************************************************************************/
294
295#ifdef WATCHDOG
296
297/**
298 * Tell watchdog that we are still alive
299 *
300 * I put the function here since we should hopefully already be getting
301 * all the needed include files for socket support
302 */
303
304void
305watchdog (void)
306{
307 static int fd = -1;
308 static struct sockaddr_in insock;
309
310 if (fd == -1)
311 {
312 struct protoent *protoent;
313
314 if ((protoent = getprotobyname ("udp")) == NULL || (fd = socket (PF_INET, SOCK_DGRAM, protoent->p_proto)) == -1)
315 {
316 return;
317 }
318 insock.sin_family = AF_INET;
319 insock.sin_port = htons ((unsigned short) 13325);
320 insock.sin_addr.s_addr = inet_addr ("127.0.0.1");
321 }
322 sendto (fd, (void *) &fd, 1, 0, (struct sockaddr *) &insock, sizeof (insock));
323}
324#endif
325
326void 275void
327flush_sockets (void) 276flush_sockets (void)
328{ 277{
329 player *pl; 278 for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); ++i)
330
331 for (pl = first_player; pl != NULL; pl = pl->next)
332 if (pl->socket.status != Ns_Dead) 279 if ((*i)->status != Ns_Dead)
333 Socket_Flush (&pl->socket); 280 (*i)->flush ();
334} 281}
335 282
336/** 283/**
337 * This checks the sockets for input and exceptions, does the right thing. 284 * This checks the sockets for input, does the right thing.
338 * 285 *
339 * A bit of this code is grabbed out of socket.c 286 * A bit of this code is grabbed out of socket.c
340 * 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
341 * 288 *
342 */ 289 */
343void 290void
344doeric_server (void) 291doeric_server (void)
345{ 292{
346 int i, pollret; 293 int i, pollret;
347 fd_set tmp_read, tmp_exceptions, tmp_write; 294 fd_set tmp_read;
348 struct sockaddr_in addr; 295 struct sockaddr_in addr;
349 socklen_t addrlen = sizeof (struct sockaddr); 296 socklen_t addrlen = sizeof (struct sockaddr);
350 player *pl, *next; 297 player *pl, *next;
298 int maxfd = 0;
351 299
352#ifdef CS_LOGSTATS 300#ifdef CS_LOGSTATS
353 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME) 301 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME)
354 write_cs_stats (); 302 write_cs_stats ();
355#endif 303#endif
356 304
357 FD_ZERO (&tmp_read);
358 FD_ZERO (&tmp_write);
359 FD_ZERO (&tmp_exceptions);
360
361 for (i = 0; i < socket_info.allocated_sockets; i++)
362 {
363 if (init_sockets[i].status == Ns_Dead)
364 {
365 free_newsocket (&init_sockets[i]);
366 init_sockets[i].status = Ns_Avail;
367 socket_info.nconns--;
368 }
369 else if (init_sockets[i].status != Ns_Avail)
370 {
371 FD_SET ((uint32) init_sockets[i].fd, &tmp_read);
372 FD_SET ((uint32) init_sockets[i].fd, &tmp_write);
373 FD_SET ((uint32) init_sockets[i].fd, &tmp_exceptions);
374 }
375 }
376
377 /* Go through the players. Let the loop set the next pl value, 305 /* Go through the players. Let the loop set the next pl value,
378 * since we may remove some 306 * since we may remove some
379 */ 307 */
308 //TODO: must be handled cleanly elsewhere
380 for (pl = first_player; pl != NULL;) 309 for (pl = first_player; pl; )
381 { 310 {
311 player *npl = pl->next;
312
313 //TODO: must be handled cleanly elsewhere
382 if (pl->socket.status == Ns_Dead) 314 if (pl->socket->status == Ns_Dead)
383 { 315 {
384 player *npl = pl->next;
385
386 save_player (pl->ob, 0); 316 save_player (pl->ob, 0);
317
387 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) 318 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
388 { 319 {
389 terminate_all_pets (pl->ob); 320 terminate_all_pets (pl->ob);
390 remove_ob (pl->ob); 321 pl->ob->remove ();
391 } 322 }
323
392 leave (pl, 1); 324 leave (pl, 1);
393 final_free_player (pl); 325 final_free_player (pl);
326 }
327
394 pl = npl; 328 pl = npl;
329 }
330
331 FD_ZERO (&tmp_read);
332
333 for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); )
334 {
335 client_socket *s = *i;
336
337 if (s->status == Ns_Dead)
338 {
339 client_sockets.erase (i);
340 delete s;
395 } 341 }
396 else 342 else
397 { 343 {
344 if (s->fd > maxfd) maxfd = s->fd;
345
398 FD_SET ((uint32) pl->socket.fd, &tmp_read); 346 FD_SET (s->fd, &tmp_read);
399 FD_SET ((uint32) pl->socket.fd, &tmp_write); 347
400 FD_SET ((uint32) pl->socket.fd, &tmp_exceptions); 348 ++i;
401 pl = pl->next;
402 } 349 }
403 } 350 }
404 351
405 /* Reset timeout each time, since some OS's will change the values on 352 struct timeval timeout;
406 * the return from select. 353
407 */
408 socket_info.timeout.tv_sec = 0; 354 timeout.tv_sec = 0;
409 socket_info.timeout.tv_usec = 0; 355 timeout.tv_usec = 0;
410 356
411 pollret = select (socket_info.max_filedescriptor, &tmp_read, &tmp_write, &tmp_exceptions, &socket_info.timeout); 357 pollret = select (maxfd + 1,
358 &tmp_read, 0, 0,
359 &timeout);
412 360
413 if (pollret == -1) 361 if (pollret == -1)
414 { 362 {
415 LOG (llevError, "select failed: %s\n", strerror (errno)); 363 LOG (llevError, "select failed: %s\n", strerror (errno));
416 return; 364 return;
417 } 365 }
418 366
419 /* We need to do some of the processing below regardless */ 367 /* We need to do some of the processing below regardless */
420 368
421/* if (!pollret) return;*/ 369 /* Check for any input on the sockets */
422 370 for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); ++i)
423 /* Following adds a new connection */
424 if (pollret && FD_ISSET (init_sockets[0].fd, &tmp_read))
425 { 371 {
426 int newsocknum = 0; 372 client_socket *s = *i;
373 player *pl = s->pl;
427 374
428#ifdef ESRV_DEBUG 375 //TODO: disassociate handleclient from socket readin
429 LOG (llevDebug, "doeric_server: New Connection\n"); 376 if (s->inbuf_len || FD_ISSET (s->fd, &tmp_read))
430#endif 377 HandleClient (s, pl);
431 /* If this is the case, all sockets currently in used */ 378
432 if (socket_info.allocated_sockets <= socket_info.nconns) 379 //TODO: should not be done here, either
433 { 380 if (s->status != Ns_Dead && pl)
434 init_sockets = (NewSocket *) realloc (init_sockets, sizeof (NewSocket) * (socket_info.nconns + 1));
435 if (!init_sockets)
436 fatal (OUT_OF_MEMORY);
437 newsocknum = socket_info.allocated_sockets;
438 socket_info.allocated_sockets++;
439 init_sockets[newsocknum].faces_sent_len = nrofpixmaps;
440 init_sockets[newsocknum].faces_sent = (uint8 *) malloc (nrofpixmaps * sizeof (*init_sockets[newsocknum].faces_sent));
441 if (!init_sockets[newsocknum].faces_sent)
442 fatal (OUT_OF_MEMORY);
443 init_sockets[newsocknum].status = Ns_Avail;
444 } 381 {
445 else 382 /* Update the players stats once per tick. More efficient than
446 { 383 * sending them whenever they change, and probably just as useful
447 int j;
448
449 for (j = 1; j < socket_info.allocated_sockets; j++)
450 if (init_sockets[j].status == Ns_Avail)
451 { 384 */
452 newsocknum = j; 385 esrv_update_stats (pl);
453 break; 386 if (pl->last_weight != -1 && pl->last_weight != WEIGHT (pl->ob))
454 }
455 }
456 init_sockets[newsocknum].fd = accept (init_sockets[0].fd, (struct sockaddr *) &addr, &addrlen);
457 if (init_sockets[newsocknum].fd == -1)
458 {
459 LOG (llevError, "accept failed: %s\n", strerror (errno));
460 }
461 else
462 {
463 char buf[MAX_BUF];
464 long ip;
465 NewSocket *ns;
466
467 ns = &init_sockets[newsocknum];
468
469 ip = ntohl (addr.sin_addr.s_addr);
470 sprintf (buf, "%ld.%ld.%ld.%ld", (ip >> 24) & 255, (ip >> 16) & 255, (ip >> 8) & 255, ip & 255);
471
472 if (checkbanned (NULL, buf))
473 { 387 {
474 LOG (llevInfo, "Banned host tried to connect: [%s]\n", buf); 388 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
475 close (init_sockets[newsocknum].fd); 389 if (pl->last_weight != WEIGHT (pl->ob))
476 init_sockets[newsocknum].fd = -1; 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));
477 } 392 }
478 else
479 {
480 InitConnection (ns, buf);
481 socket_info.nconns++;
482 }
483 }
484 }
485 393
486 /* Check for any exceptions/input on the sockets */ 394 /* draw_client_map does sanity checking that map is
487 if (pollret) 395 * valid, so don't do it here.
488 for (i = 1; i < socket_info.allocated_sockets; i++)
489 {
490 if (init_sockets[i].status == Ns_Avail)
491 continue;
492 if (FD_ISSET (init_sockets[i].fd, &tmp_exceptions))
493 {
494 free_newsocket (&init_sockets[i]);
495 init_sockets[i].status = Ns_Avail;
496 socket_info.nconns--;
497 continue;
498 }
499 if (FD_ISSET (init_sockets[i].fd, &tmp_read))
500 {
501 HandleClient (&init_sockets[i], NULL);
502 }
503 if (FD_ISSET (init_sockets[i].fd, &tmp_write))
504 {
505 init_sockets[i].can_write = 1;
506 }
507 }
508
509 /* This does roughly the same thing, but for the players now */
510 for (pl = first_player; pl != NULL; pl = next)
511 {
512
513 next = pl->next;
514 if (pl->socket.status == Ns_Dead)
515 continue;
516
517 if (FD_ISSET (pl->socket.fd, &tmp_write))
518 {
519 if (!pl->socket.can_write)
520 {
521#if 0
522 LOG (llevDebug, "Player %s socket now write enabled\n", pl->ob->name);
523#endif
524 pl->socket.can_write = 1;
525 write_socket_buffer (&pl->socket);
526 }
527 /* if we get an error on the write_socket buffer, no reason to
528 * continue on this socket.
529 */ 396 */
530 if (pl->socket.status == Ns_Dead)
531 continue;
532 }
533 else
534 pl->socket.can_write = 0;
535
536 if (FD_ISSET (pl->socket.fd, &tmp_exceptions))
537 {
538 save_player (pl->ob, 0);
539 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
540 {
541 terminate_all_pets (pl->ob);
542 remove_ob (pl->ob);
543 }
544 leave (pl, 1);
545 final_free_player (pl);
546 }
547 else
548 {
549 HandleClient (&pl->socket, pl);
550 /* If the player has left the game, then the socket status
551 * will be set to this be the leave function. We don't
552 * need to call leave again, as it has already been called
553 * once.
554 */
555 if (pl->socket.status == Ns_Dead)
556 {
557 save_player (pl->ob, 0);
558 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
559 {
560 terminate_all_pets (pl->ob);
561 remove_ob (pl->ob);
562 }
563 leave (pl, 1);
564 final_free_player (pl);
565 }
566 else
567 {
568
569 /* Update the players stats once per tick. More efficient than
570 * sending them whenever they change, and probably just as useful
571 */
572 esrv_update_stats (pl);
573 if (pl->last_weight != -1 && pl->last_weight != WEIGHT (pl->ob))
574 {
575 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
576 if (pl->last_weight != WEIGHT (pl->ob))
577 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n",
578 (unsigned long) pl->last_weight, WEIGHT (pl->ob));
579 }
580 /* draw_client_map does sanity checking that map is
581 * valid, so don't do it here.
582 */
583 draw_client_map (pl->ob); 397 draw_client_map (pl->ob);
584 if (pl->socket.update_look) 398 if (s->update_look)
585 esrv_draw_look (pl->ob); 399 esrv_draw_look (pl->ob);
586 }
587 } 400 }
588 } 401 }
589} 402}
403

Diff Legend

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