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.7 by root, Thu Sep 14 22:34:05 2006 UTC vs.
Revision 1.12 by root, Thu Dec 14 01:12:35 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#ifndef WIN32 /* ---win32 exclude unix headers */
43# include <sys/types.h> 40#include <sys/types.h>
44# include <sys/time.h> 41#include <sys/time.h>
45# include <sys/socket.h> 42#include <sys/socket.h>
46# include <netinet/in.h> 43#include <netinet/in.h>
47# include <netdb.h> 44#include <netdb.h>
48#endif /* end win32 */
49 45
50#ifdef HAVE_UNISTD_H 46#ifdef HAVE_UNISTD_H
51# include <unistd.h> 47# include <unistd.h>
52#endif 48#endif
53 49
… …
75 71
76struct NsCmdMapping 72struct NsCmdMapping
77{ 73{
78 const char *cmdname; 74 const char *cmdname;
79 func_uint8_int_ns cmdproc; 75 func_uint8_int_ns cmdproc;
76 uint8 flag;
80}; 77};
81 78
82typedef void (*func_uint8_int_pl) (char *, int, player *); 79typedef void (*func_uint8_int_pl) (char *, int, player *);
83struct PlCmdMapping 80struct PlCmdMapping
84{ 81{
… …
111 {"lock", (func_uint8_int_pl) LockItem, 1}, 108 {"lock", (func_uint8_int_pl) LockItem, 1},
112 {"mark", (func_uint8_int_pl) MarkItem, 1}, 109 {"mark", (func_uint8_int_pl) MarkItem, 1},
113 {"mapredraw", MapRedrawCmd, 0}, /* Added: phil */ 110 {"mapredraw", MapRedrawCmd, 0}, /* Added: phil */
114 {"mapinfo", MapInfoCmd, 2}, /* CF+ */ 111 {"mapinfo", MapInfoCmd, 2}, /* CF+ */
115 {"ext", ExtCmd, 2}, /* CF+ */ 112 {"ext", ExtCmd, 2}, /* CF+ */
116 {NULL, NULL, 0} /* terminator */ 113 { 0 } /* terminator */
117}; 114};
118 115
119/** Face-related commands */ 116/** Face-related commands */
120static struct NsCmdMapping nscommands[] = { 117static struct NsCmdMapping nscommands[] = {
121 {"addme", AddMeCmd}, 118 {"addme", AddMeCmd, 2},
122 {"askface", SendFaceCmd}, /* Added: phil */ 119 {"askface", SendFaceCmd}, /* Added: phil */
123 {"requestinfo", RequestInfo}, 120 {"requestinfo", RequestInfo},
124 {"setfacemode", SetFaceMode}, 121 {"setfacemode", SetFaceMode, 2},
125 {"setsound", SetSound}, 122 {"setsound", SetSound, 2},
126 {"setup", SetUp}, 123 {"setup", SetUp, 2},
127 {"version", VersionCmd}, 124 {"version", VersionCmd, 2},
128 {"toggleextendedinfos", ToggleExtendedInfos}, /*Added: tchize */ 125 {"toggleextendedinfos", ToggleExtendedInfos, 2}, /*Added: tchize */
129 {"toggleextendedtext", ToggleExtendedText}, /*Added: tchize */ 126 {"toggleextendedtext", ToggleExtendedText, 2}, /*Added: tchize */
130 {"asksmooth", AskSmooth}, /*Added: tchize (smoothing technologies) */ 127 {"asksmooth", AskSmooth}, /*Added: tchize (smoothing technologies) */
131 {NULL, NULL} /* terminator (I, II & III) */ 128 { 0 } /* terminator (I, II & III) */
132}; 129};
133 130
134/** 131/**
135 * RequestInfo is sort of a meta command. There is some specific 132 * RequestInfo is sort of a meta command. There is some specific
136 * request of information, but we call other functions to provide 133 * request of information, but we call other functions to provide
… …
160 { 157 {
161 *cp = '\0'; 158 *cp = '\0';
162 params = cp + 1; 159 params = cp + 1;
163 break; 160 break;
164 } 161 }
162
165 if (!strcmp (buf, "image_info")) 163 if (!strcmp (buf, "image_info"))
166 send_image_info (ns, params); 164 send_image_info (ns, params);
167 else if (!strcmp (buf, "image_sums")) 165 else if (!strcmp (buf, "image_sums"))
168 send_image_sums (ns, params); 166 send_image_sums (ns, params);
169 else if (!strcmp (buf, "skill_info")) 167 else if (!strcmp (buf, "skill_info"))
170 send_skill_info (ns, params); 168 send_skill_info (ns, params);
171 else if (!strcmp (buf, "spell_paths")) 169 else if (!strcmp (buf, "spell_paths"))
172 send_spell_paths (ns, params); 170 send_spell_paths (ns, params);
173 else 171 else
174 Write_String_To_Socket (ns, bigbuf, len); 172 ns->send_packet (bigbuf, len);
175} 173}
176 174
177/** 175/**
178 * Handle client input. 176 * Handle client input.
179 * 177 *
… …
183 * with this socket, null if no player (one of the init_sockets for just 181 * with this socket, null if no player (one of the init_sockets for just
184 * starting a connection) 182 * starting a connection)
185 */ 183 */
186 184
187void 185void
188HandleClient (NewSocket * ns, player *pl) 186HandleClient (NewSocket *ns, player *pl)
189{ 187{
190 int len = 0, i, cnt;
191 char *data;
192
193 /* Loop through this - maybe we have several complete packets here. */ 188 /* Loop through this - maybe we have several complete packets here. */
194 // limit to a few commands only, though, as to not monopolise the server 189 // limit to a few commands only, though, as to not monopolise the server
195 for (cnt = 16; cnt--;) 190 for (int repeat = 16; repeat--;)
196 { 191 {
197 /* If it is a player, and they don't have any speed left, we 192 /* If it is a player, and they don't have any speed left, we
198 * return, and will read in the data when they do have time. 193 * return, and will read in the data when they do have time.
199 */ 194 */
200 if (pl && pl->state == ST_PLAYING && pl->ob != NULL && pl->ob->speed_left < 0) 195 if (pl && pl->state == ST_PLAYING && pl->ob && pl->ob->speed_left < 0)
201 {
202 return; 196 return;
197
198 int pkt_len = ns->read_packet ();
199
200 if (pkt_len < 0)
203 } 201 {
204 202 LOG (llevError, "read error on player %s\n", &pl->ob->name);
205 i = SockList_ReadPacket (ns->fd, &ns->inbuf, MAXSOCKBUF - 1);
206
207 if (i < 0)
208 {
209#ifdef ESRV_DEBUG
210 LOG (llevDebug, "HandleClient: Read error on connection player %s\n", (pl ? pl->ob->name : "None"));
211#endif
212 /* Caller will take care of cleaning this up */ 203 /* Caller will take care of cleaning this up */
213 ns->status = Ns_Dead; 204 ns->status = Ns_Dead;
214 return; 205 return;
215 } 206 }
207 else if (pkt_len == 0)
216 /* Still dont have a full packet */ 208 /* Still dont have a full packet */
217 if (i == 0)
218 return; 209 return;
219
220// //D//TODO//temporarily log long commands
221// if (ns->inbuf.len >= 40 && pl && pl->ob)
222// LOG (llevDebug, "HandleClient: long comamnd from <%s,%s> %d<%s>\n", pl->ob->name, ns->host, ns->inbuf.len, ns->inbuf.buf + 2);
223 210
224 /* First, break out beginning word. There are at least 211 /* First, break out beginning word. There are at least
225 * a few commands that do not have any paremeters. If 212 * a few commands that do not have any paremeters. If
226 * we get such a command, don't worry about trying 213 * we get such a command, don't worry about trying
227 * to break it up. 214 * to break it up.
228 */ 215 */
216 int datalen;
229 data = (char *) strchr ((char *) ns->inbuf.buf + 2, ' '); 217 char *data = strchr ((char *)ns->inbuf + 2, ' ');
218
230 if (data) 219 if (data)
231 { 220 {
232 *data = '\0'; 221 *data++ = 0;
233 data++; 222 datalen = pkt_len - (data - (char *)ns->inbuf);
234 len = ns->inbuf.len - (data - (char *) ns->inbuf.buf);
235 } 223 }
236 else 224 else
225 {
226 data = (char *)ns->inbuf + 2; // better read garbage than segfault
237 len = 0; 227 datalen = 0;
238
239 ns->inbuf.buf[ns->inbuf.len] = '\0'; /* Terminate buffer - useful for string data */
240 for (i = 0; nscommands[i].cmdname != NULL; i++)
241 { 228 }
229
230 ns->inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */
231
232 for (int i = 0; nscommands[i].cmdname; i++)
233 {
242 if (strcmp ((char *) ns->inbuf.buf + 2, nscommands[i].cmdname) == 0) 234 if (!strcmp ((char *)ns->inbuf + 2, nscommands[i].cmdname))
243 { 235 {
244 nscommands[i].cmdproc ((char *) data, len, ns); 236 nscommands[i].cmdproc (data, datalen, ns);
245 ns->inbuf.len = 0; 237 ns->skip_packet (pkt_len);
246 return; //D// not doing this causes random memory corruption 238 //D// not doing this causes random memory corruption
239 if (nscommands[i].flag & 2)
247 goto next_packet; 240 goto next_packet;
248 } 241 return;
249 } 242 }
243 }
244
250 /* Player must be in the playing state or the flag on the 245 /* Player must be in the playing state or the flag on the
251 * the command must be zero for the user to use the command - 246 * the command must be zero for the user to use the command -
252 * otherwise, a player cam save, be in the play_again state, and 247 * otherwise, a player cam save, be in the play_again state, and
253 * the map they were on gets swapped out, yet things that try to look 248 * the map they were on gets swapped out, yet things that try to look
254 * at the map causes a crash. If the command is valid, but 249 * at the map causes a crash. If the command is valid, but
255 * one they can't use, we still swallow it up. 250 * one they can't use, we still swallow it up.
256 */ 251 */
257 if (pl) 252 if (pl)
258 for (i = 0; plcommands[i].cmdname != NULL; i++) 253 for (int i = 0; plcommands[i].cmdname; i++)
259 { 254 {
260 if (strcmp ((char *) ns->inbuf.buf + 2, plcommands[i].cmdname) == 0) 255 if (!strcmp ((char *)ns->inbuf + 2, plcommands[i].cmdname))
261 { 256 {
262 if (pl->state == ST_PLAYING || !(plcommands[i].flag & 1)) 257 if (pl->state == ST_PLAYING || !(plcommands[i].flag & 1))
263 plcommands[i].cmdproc ((char *) data, len, pl); 258 plcommands[i].cmdproc ((char *) data, datalen, pl);
264 ns->inbuf.len = 0; 259
260 ns->skip_packet (pkt_len);
265 //D// not doing this causes random memory corruption 261 //D// not doing this causes random memory corruption
266 if (plcommands[i].flag & 2) 262 if (plcommands[i].flag & 2)
267 goto next_packet; 263 goto next_packet;
264
268 return; 265 return;
269 } 266 }
270 } 267 }
268
269 printf ("BP34n");//D
271 /* If we get here, we didn't find a valid command. Logging 270 /* If we get here, we didn't find a valid command. Logging
272 * this might be questionable, because a broken client/malicious 271 * this might be questionable, because a broken client/malicious
273 * user could certainly send a whole bunch of invalid commands. 272 * user could certainly send a whole bunch of invalid commands.
274 */ 273 */
275 LOG (llevDebug, "Bad command from client (%s)\n", ns->inbuf.buf + 2); 274 LOG (llevDebug, "Bad command from client (%s)\n", ns->inbuf + 2);
275 ns->skip_packet (pkt_len);
276 next_packet: 276 next_packet:
277 ; 277 ;
278 } 278 }
279} 279}
280 280
… …
326 if (pl->socket.status != Ns_Dead) 326 if (pl->socket.status != Ns_Dead)
327 Socket_Flush (&pl->socket); 327 Socket_Flush (&pl->socket);
328} 328}
329 329
330/** 330/**
331 * This checks the sockets for input and exceptions, does the right thing. 331 * This checks the sockets for input, does the right thing.
332 * 332 *
333 * A bit of this code is grabbed out of socket.c 333 * A bit of this code is grabbed out of socket.c
334 * There are 2 lists we need to look through - init_sockets is a list 334 * There are 2 lists we need to look through - init_sockets is a list
335 * 335 *
336 */ 336 */
337void 337void
338doeric_server (void) 338doeric_server (void)
339{ 339{
340 int i, pollret; 340 int i, pollret;
341 fd_set tmp_read, tmp_exceptions, tmp_write; 341 fd_set tmp_read, tmp_write;
342 struct sockaddr_in addr; 342 struct sockaddr_in addr;
343 socklen_t addrlen = sizeof (struct sockaddr); 343 socklen_t addrlen = sizeof (struct sockaddr);
344 player *pl, *next; 344 player *pl, *next;
345 345
346#ifdef CS_LOGSTATS 346#ifdef CS_LOGSTATS
… …
348 write_cs_stats (); 348 write_cs_stats ();
349#endif 349#endif
350 350
351 FD_ZERO (&tmp_read); 351 FD_ZERO (&tmp_read);
352 FD_ZERO (&tmp_write); 352 FD_ZERO (&tmp_write);
353 FD_ZERO (&tmp_exceptions);
354 353
355 for (i = 0; i < socket_info.allocated_sockets; i++) 354 for (i = 0; i < socket_info.allocated_sockets; i++)
356 { 355 {
357 if (init_sockets[i].status == Ns_Dead) 356 if (init_sockets[i].status == Ns_Dead)
358 { 357 {
… …
360 init_sockets[i].status = Ns_Avail; 359 init_sockets[i].status = Ns_Avail;
361 socket_info.nconns--; 360 socket_info.nconns--;
362 } 361 }
363 else if (init_sockets[i].status != Ns_Avail) 362 else if (init_sockets[i].status != Ns_Avail)
364 { 363 {
365 FD_SET ((uint32) init_sockets[i].fd, &tmp_read); 364 FD_SET (init_sockets[i].fd, &tmp_read);
366 FD_SET ((uint32) init_sockets[i].fd, &tmp_write); 365 FD_SET (init_sockets[i].fd, &tmp_write);
367 FD_SET ((uint32) init_sockets[i].fd, &tmp_exceptions);
368 } 366 }
369 } 367 }
370 368
371 /* Go through the players. Let the loop set the next pl value, 369 /* Go through the players. Let the loop set the next pl value,
372 * since we may remove some 370 * since we may remove some
… …
376 if (pl->socket.status == Ns_Dead) 374 if (pl->socket.status == Ns_Dead)
377 { 375 {
378 player *npl = pl->next; 376 player *npl = pl->next;
379 377
380 save_player (pl->ob, 0); 378 save_player (pl->ob, 0);
379
381 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) 380 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
382 { 381 {
383 terminate_all_pets (pl->ob); 382 terminate_all_pets (pl->ob);
384 remove_ob (pl->ob); 383 pl->ob->remove ();
385 } 384 }
385
386 leave (pl, 1); 386 leave (pl, 1);
387 final_free_player (pl); 387 final_free_player (pl);
388 pl = npl; 388 pl = npl;
389 } 389 }
390 else 390 else
391 { 391 {
392 FD_SET ((uint32) pl->socket.fd, &tmp_read); 392 FD_SET ((uint32) pl->socket.fd, &tmp_read);
393 FD_SET ((uint32) pl->socket.fd, &tmp_write); 393 FD_SET ((uint32) pl->socket.fd, &tmp_write);
394 FD_SET ((uint32) pl->socket.fd, &tmp_exceptions);
395 pl = pl->next; 394 pl = pl->next;
396 } 395 }
397 } 396 }
398 397
399 /* Reset timeout each time, since some OS's will change the values on 398 /* Reset timeout each time, since some OS's will change the values on
400 * the return from select. 399 * the return from select.
401 */ 400 */
402 socket_info.timeout.tv_sec = 0; 401 socket_info.timeout.tv_sec = 0;
403 socket_info.timeout.tv_usec = 0; 402 socket_info.timeout.tv_usec = 0;
404 403
405 pollret = select (socket_info.max_filedescriptor, &tmp_read, &tmp_write, &tmp_exceptions, &socket_info.timeout); 404 pollret = select (socket_info.max_filedescriptor,
405 &tmp_read, &tmp_write, 0,
406 &socket_info.timeout);
406 407
407 if (pollret == -1) 408 if (pollret == -1)
408 { 409 {
409 LOG (llevError, "select failed: %s\n", strerror (errno)); 410 LOG (llevError, "select failed: %s\n", strerror (errno));
410 return; 411 return;
… …
445 { 446 {
446 newsocknum = j; 447 newsocknum = j;
447 break; 448 break;
448 } 449 }
449 } 450 }
451
450 init_sockets[newsocknum].fd = accept (init_sockets[0].fd, (struct sockaddr *) &addr, &addrlen); 452 init_sockets[newsocknum].fd = accept (init_sockets[0].fd, (struct sockaddr *) &addr, &addrlen);
453
451 if (init_sockets[newsocknum].fd == -1) 454 if (init_sockets[newsocknum].fd == -1)
452 {
453 LOG (llevError, "accept failed: %s\n", strerror (errno)); 455 LOG (llevError, "accept failed: %s\n", strerror (errno));
454 }
455 else 456 else
456 { 457 {
457 char buf[MAX_BUF]; 458 char buf[MAX_BUF];
458 long ip; 459 long ip;
459 NewSocket *ns; 460 NewSocket *ns;
… …
475 socket_info.nconns++; 476 socket_info.nconns++;
476 } 477 }
477 } 478 }
478 } 479 }
479 480
480 /* Check for any exceptions/input on the sockets */ 481 /* Check for any input on the sockets */
481 if (pollret) 482 if (pollret)
482 for (i = 1; i < socket_info.allocated_sockets; i++) 483 for (i = 1; i < socket_info.allocated_sockets; i++)
483 { 484 {
484 if (init_sockets[i].status == Ns_Avail) 485 if (init_sockets[i].status == Ns_Avail)
485 continue; 486 continue;
486 if (FD_ISSET (init_sockets[i].fd, &tmp_exceptions)) 487
487 { 488 //TODO: disassociate handleclient from socket readin
488 free_newsocket (&init_sockets[i]);
489 init_sockets[i].status = Ns_Avail;
490 socket_info.nconns--;
491 continue;
492 }
493 if (FD_ISSET (init_sockets[i].fd, &tmp_read)) 489 if (init_sockets[i].inbuf_len || FD_ISSET (init_sockets[i].fd, &tmp_read))
494 {
495 HandleClient (&init_sockets[i], NULL); 490 HandleClient (&init_sockets[i], NULL);
496 } 491
497 if (FD_ISSET (init_sockets[i].fd, &tmp_write)) 492 if (FD_ISSET (init_sockets[i].fd, &tmp_write))
498 {
499 init_sockets[i].can_write = 1; 493 init_sockets[i].can_write = 1;
500 }
501 } 494 }
502 495
503 /* This does roughly the same thing, but for the players now */ 496 /* This does roughly the same thing, but for the players now */
504 for (pl = first_player; pl != NULL; pl = next) 497 for (pl = first_player; pl != NULL; pl = next)
505 { 498 {
… …
516 LOG (llevDebug, "Player %s socket now write enabled\n", pl->ob->name); 509 LOG (llevDebug, "Player %s socket now write enabled\n", pl->ob->name);
517#endif 510#endif
518 pl->socket.can_write = 1; 511 pl->socket.can_write = 1;
519 write_socket_buffer (&pl->socket); 512 write_socket_buffer (&pl->socket);
520 } 513 }
514
521 /* if we get an error on the write_socket buffer, no reason to 515 /* if we get an error on the write_socket buffer, no reason to
522 * continue on this socket. 516 * continue on this socket.
523 */ 517 */
524 if (pl->socket.status == Ns_Dead) 518 if (pl->socket.status == Ns_Dead)
525 continue; 519 continue;
526 } 520 }
527 else 521 else
528 pl->socket.can_write = 0; 522 pl->socket.can_write = 0;
529 523
530 if (FD_ISSET (pl->socket.fd, &tmp_exceptions)) 524 HandleClient (&pl->socket, pl);
525 /* If the player has left the game, then the socket status
526 * will be set to this be the leave function. We don't
527 * need to call leave again, as it has already been called
528 * once.
529 */
530 if (pl->socket.status == Ns_Dead)
531 { 531 {
532 save_player (pl->ob, 0); 532 save_player (pl->ob, 0);
533
533 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) 534 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
534 { 535 {
535 terminate_all_pets (pl->ob); 536 terminate_all_pets (pl->ob);
536 remove_ob (pl->ob); 537 pl->ob->remove ();
537 } 538 }
539
538 leave (pl, 1); 540 leave (pl, 1);
539 final_free_player (pl); 541 final_free_player (pl);
540 } 542 }
541 else 543 else
542 { 544 {
543 HandleClient (&pl->socket, pl); 545 /* Update the players stats once per tick. More efficient than
544 /* If the player has left the game, then the socket status 546 * sending them whenever they change, and probably just as useful
545 * will be set to this be the leave function. We don't
546 * need to call leave again, as it has already been called
547 * once.
548 */ 547 */
549 if (pl->socket.status == Ns_Dead)
550 {
551 save_player (pl->ob, 0);
552 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
553 {
554 terminate_all_pets (pl->ob);
555 remove_ob (pl->ob);
556 }
557 leave (pl, 1);
558 final_free_player (pl);
559 }
560 else
561 {
562
563 /* Update the players stats once per tick. More efficient than
564 * sending them whenever they change, and probably just as useful
565 */
566 esrv_update_stats (pl); 548 esrv_update_stats (pl);
567 if (pl->last_weight != -1 && pl->last_weight != WEIGHT (pl->ob)) 549 if (pl->last_weight != -1 && pl->last_weight != WEIGHT (pl->ob))
568 { 550 {
569 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob); 551 esrv_update_item (UPD_WEIGHT, pl->ob, pl->ob);
570 if (pl->last_weight != WEIGHT (pl->ob)) 552 if (pl->last_weight != WEIGHT (pl->ob))
571 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n", 553 LOG (llevError, "esrv_update_item(UPD_WEIGHT) did not set player weight: is %lu, should be %lu\n",
572 (unsigned long) pl->last_weight, WEIGHT (pl->ob)); 554 (unsigned long) pl->last_weight, WEIGHT (pl->ob));
573 } 555 }
556
574 /* draw_client_map does sanity checking that map is 557 /* draw_client_map does sanity checking that map is
575 * valid, so don't do it here. 558 * valid, so don't do it here.
576 */ 559 */
577 draw_client_map (pl->ob); 560 draw_client_map (pl->ob);
578 if (pl->socket.update_look) 561 if (pl->socket.update_look)
579 esrv_draw_look (pl->ob); 562 esrv_draw_look (pl->ob);
580 }
581 } 563 }
582 } 564 }
583} 565}
566

Diff Legend

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