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.9 by root, Tue Dec 12 20:53:03 2006 UTC vs.
Revision 1.19 by root, Fri Dec 15 19:59:20 2006 UTC

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

Diff Legend

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