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.10 by root, Wed Dec 13 02:55:51 2006 UTC vs.
Revision 1.14 by root, Thu Dec 14 04:30:33 2006 UTC

… …
65 * before player joins, and those happen after the player has joined. 65 * before player joins, and those happen after the player has joined.
66 * As such, we have function types that might be called, so 66 * As such, we have function types that might be called, so
67 * we end up having 2 tables. 67 * we end up having 2 tables.
68 */ 68 */
69 69
70typedef void (*func_uint8_int_ns) (char *, int, NewSocket *); 70typedef void (*func_uint8_int_ns) (char *, int, client_socket *);
71 71
72struct NsCmdMapping 72struct NsCmdMapping
73{ 73{
74 const char *cmdname; 74 const char *cmdname;
75 func_uint8_int_ns cmdproc; 75 func_uint8_int_ns cmdproc;
76 uint8 flag;
76}; 77};
77 78
78typedef void (*func_uint8_int_pl) (char *, int, player *); 79typedef void (*func_uint8_int_pl) (char *, int, player *);
79struct PlCmdMapping 80struct PlCmdMapping
80{ 81{
… …
107 {"lock", (func_uint8_int_pl) LockItem, 1}, 108 {"lock", (func_uint8_int_pl) LockItem, 1},
108 {"mark", (func_uint8_int_pl) MarkItem, 1}, 109 {"mark", (func_uint8_int_pl) MarkItem, 1},
109 {"mapredraw", MapRedrawCmd, 0}, /* Added: phil */ 110 {"mapredraw", MapRedrawCmd, 0}, /* Added: phil */
110 {"mapinfo", MapInfoCmd, 2}, /* CF+ */ 111 {"mapinfo", MapInfoCmd, 2}, /* CF+ */
111 {"ext", ExtCmd, 2}, /* CF+ */ 112 {"ext", ExtCmd, 2}, /* CF+ */
112 {NULL, NULL, 0} /* terminator */ 113 { 0 } /* terminator */
113}; 114};
114 115
115/** Face-related commands */ 116/** Face-related commands */
116static struct NsCmdMapping nscommands[] = { 117static struct NsCmdMapping nscommands[] = {
117 {"addme", AddMeCmd}, 118 {"addme", AddMeCmd, 2},
118 {"askface", SendFaceCmd}, /* Added: phil */ 119 {"askface", SendFaceCmd}, /* Added: phil */
119 {"requestinfo", RequestInfo}, 120 {"requestinfo", RequestInfo},
120 {"setfacemode", SetFaceMode}, 121 {"setfacemode", SetFaceMode, 2},
121 {"setsound", SetSound}, 122 {"setsound", SetSound, 2},
122 {"setup", SetUp}, 123 {"setup", SetUp, 2},
123 {"version", VersionCmd}, 124 {"version", VersionCmd, 2},
124 {"toggleextendedinfos", ToggleExtendedInfos}, /*Added: tchize */ 125 {"toggleextendedinfos", ToggleExtendedInfos, 2}, /*Added: tchize */
125 {"toggleextendedtext", ToggleExtendedText}, /*Added: tchize */ 126 {"toggleextendedtext", ToggleExtendedText, 2}, /*Added: tchize */
126 {"asksmooth", AskSmooth}, /*Added: tchize (smoothing technologies) */ 127 {"asksmooth", AskSmooth}, /*Added: tchize (smoothing technologies) */
127 {NULL, NULL} /* terminator (I, II & III) */ 128 { 0 } /* terminator (I, II & III) */
128}; 129};
129 130
130/** 131/**
131 * RequestInfo is sort of a meta command. There is some specific 132 * RequestInfo is sort of a meta command. There is some specific
132 * request of information, but we call other functions to provide 133 * request of information, but we call other functions to provide
133 * that information. 134 * that information.
134 */ 135 */
135void 136void
136RequestInfo (char *buf, int len, NewSocket * ns) 137RequestInfo (char *buf, int len, client_socket * ns)
137{ 138{
138 char *params = NULL, *cp; 139 char *params = NULL, *cp;
139 140
140 /* No match */ 141 /* No match */
141 char bigbuf[MAX_BUF]; 142 char bigbuf[MAX_BUF];
… …
166 else if (!strcmp (buf, "skill_info")) 167 else if (!strcmp (buf, "skill_info"))
167 send_skill_info (ns, params); 168 send_skill_info (ns, params);
168 else if (!strcmp (buf, "spell_paths")) 169 else if (!strcmp (buf, "spell_paths"))
169 send_spell_paths (ns, params); 170 send_spell_paths (ns, params);
170 else 171 else
171 Write_String_To_Socket (ns, bigbuf, len); 172 ns->send_packet (bigbuf, len);
172} 173}
173 174
174/** 175/**
175 * Handle client input. 176 * Handle client input.
176 * 177 *
… …
180 * 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
181 * starting a connection) 182 * starting a connection)
182 */ 183 */
183 184
184void 185void
185HandleClient (NewSocket * ns, player *pl) 186HandleClient (client_socket *ns, player *pl)
186{ 187{
187 int len = 0, i, cnt;
188 char *data;
189
190 /* Loop through this - maybe we have several complete packets here. */ 188 /* Loop through this - maybe we have several complete packets here. */
191 // 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
192 for (cnt = 16; cnt--;) 190 for (int repeat = 16; repeat--;)
193 { 191 {
194 /* 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
195 * 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.
196 */ 194 */
197 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)
198 {
199 return; 196 return;
197
198 int pkt_len = ns->read_packet ();
199
200 if (pkt_len < 0)
200 } 201 {
201 202 LOG (llevError, "read error on player %s\n", &pl->ob->name);
202 i = SockList_ReadPacket (ns->fd, &ns->inbuf, MAXSOCKBUF - 1);
203
204 if (i < 0)
205 {
206#ifdef ESRV_DEBUG
207 LOG (llevDebug, "HandleClient: Read error on connection player %s\n", (pl ? pl->ob->name : "None"));
208#endif
209 /* Caller will take care of cleaning this up */ 203 /* Caller will take care of cleaning this up */
210 ns->status = Ns_Dead; 204 ns->status = Ns_Dead;
211 return; 205 return;
212 } 206 }
207 else if (pkt_len == 0)
213 /* Still dont have a full packet */ 208 /* Still dont have a full packet */
214 if (i == 0)
215 return; 209 return;
216
217// //D//TODO//temporarily log long commands
218// if (ns->inbuf.len >= 40 && pl && pl->ob)
219// LOG (llevDebug, "HandleClient: long comamnd from <%s,%s> %d<%s>\n", pl->ob->name, ns->host, ns->inbuf.len, ns->inbuf.buf + 2);
220 210
221 /* First, break out beginning word. There are at least 211 /* First, break out beginning word. There are at least
222 * a few commands that do not have any paremeters. If 212 * a few commands that do not have any paremeters. If
223 * we get such a command, don't worry about trying 213 * we get such a command, don't worry about trying
224 * to break it up. 214 * to break it up.
225 */ 215 */
216 int datalen;
226 data = (char *) strchr ((char *) ns->inbuf.buf + 2, ' '); 217 char *data = strchr ((char *)ns->inbuf + 2, ' ');
218
227 if (data) 219 if (data)
228 { 220 {
229 *data = '\0'; 221 *data++ = 0;
230 data++; 222 datalen = pkt_len - (data - (char *)ns->inbuf);
231 len = ns->inbuf.len - (data - (char *) ns->inbuf.buf);
232 } 223 }
233 else 224 else
225 {
226 data = (char *)ns->inbuf + 2; // better read garbage than segfault
234 len = 0; 227 datalen = 0;
235
236 ns->inbuf.buf[ns->inbuf.len] = '\0'; /* Terminate buffer - useful for string data */
237 for (i = 0; nscommands[i].cmdname != NULL; i++)
238 { 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 {
239 if (strcmp ((char *) ns->inbuf.buf + 2, nscommands[i].cmdname) == 0) 234 if (!strcmp ((char *)ns->inbuf + 2, nscommands[i].cmdname))
240 { 235 {
241 nscommands[i].cmdproc ((char *) data, len, ns); 236 nscommands[i].cmdproc (data, datalen, ns);
242 ns->inbuf.len = 0; 237 ns->skip_packet (pkt_len);
243 return; //D// not doing this causes random memory corruption 238 //D// not doing this causes random memory corruption
239 if (nscommands[i].flag & 2)
244 goto next_packet; 240 goto next_packet;
241 return;
245 } 242 }
246 } 243 }
244
247 /* 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
248 * 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 -
249 * 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
250 * 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
251 * 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
252 * one they can't use, we still swallow it up. 250 * one they can't use, we still swallow it up.
253 */ 251 */
254 if (pl) 252 if (pl)
255 for (i = 0; plcommands[i].cmdname != NULL; i++) 253 for (int i = 0; plcommands[i].cmdname; i++)
256 { 254 {
257 if (strcmp ((char *) ns->inbuf.buf + 2, plcommands[i].cmdname) == 0) 255 if (!strcmp ((char *)ns->inbuf + 2, plcommands[i].cmdname))
258 { 256 {
259 if (pl->state == ST_PLAYING || !(plcommands[i].flag & 1)) 257 if (pl->state == ST_PLAYING || !(plcommands[i].flag & 1))
260 plcommands[i].cmdproc ((char *) data, len, pl); 258 plcommands[i].cmdproc ((char *) data, datalen, pl);
261 ns->inbuf.len = 0; 259
260 ns->skip_packet (pkt_len);
262 //D// not doing this causes random memory corruption 261 //D// not doing this causes random memory corruption
263 if (plcommands[i].flag & 2) 262 if (plcommands[i].flag & 2)
264 goto next_packet; 263 goto next_packet;
264
265 return; 265 return;
266 } 266 }
267 } 267 }
268
268 /* If we get here, we didn't find a valid command. Logging 269 /* If we get here, we didn't find a valid command. Logging
269 * this might be questionable, because a broken client/malicious 270 * this might be questionable, because a broken client/malicious
270 * user could certainly send a whole bunch of invalid commands. 271 * user could certainly send a whole bunch of invalid commands.
271 */ 272 */
272 LOG (llevDebug, "Bad command from client (%s)\n", ns->inbuf.buf + 2); 273 LOG (llevDebug, "Bad command from client (%s)\n", ns->inbuf + 2);
274 ns->skip_packet (pkt_len);
273 next_packet: 275 next_packet:
274 ; 276 ;
275 } 277 }
276} 278}
277 279
… …
318flush_sockets (void) 320flush_sockets (void)
319{ 321{
320 player *pl; 322 player *pl;
321 323
322 for (pl = first_player; pl != NULL; pl = pl->next) 324 for (pl = first_player; pl != NULL; pl = pl->next)
323 if (pl->socket.status != Ns_Dead) 325 if (pl->socket->status != Ns_Dead)
324 Socket_Flush (&pl->socket); 326 Socket_Flush (pl->socket);
325} 327}
326 328
327/** 329/**
328 * This checks the sockets for input, does the right thing. 330 * This checks the sockets for input, does the right thing.
329 * 331 *
… …
337 int i, pollret; 339 int i, pollret;
338 fd_set tmp_read, tmp_write; 340 fd_set tmp_read, tmp_write;
339 struct sockaddr_in addr; 341 struct sockaddr_in addr;
340 socklen_t addrlen = sizeof (struct sockaddr); 342 socklen_t addrlen = sizeof (struct sockaddr);
341 player *pl, *next; 343 player *pl, *next;
344 int maxfd = 0;
342 345
343#ifdef CS_LOGSTATS 346#ifdef CS_LOGSTATS
344 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME) 347 if ((time (NULL) - cst_lst.time_start) >= CS_LOGTIME)
345 write_cs_stats (); 348 write_cs_stats ();
346#endif 349#endif
347 350
348 FD_ZERO (&tmp_read);
349 FD_ZERO (&tmp_write);
350
351 for (i = 0; i < socket_info.allocated_sockets; i++)
352 {
353 if (init_sockets[i].status == Ns_Dead)
354 {
355 free_newsocket (&init_sockets[i]);
356 init_sockets[i].status = Ns_Avail;
357 socket_info.nconns--;
358 }
359 else if (init_sockets[i].status != Ns_Avail)
360 {
361 FD_SET (init_sockets[i].fd, &tmp_read);
362 FD_SET (init_sockets[i].fd, &tmp_write);
363 }
364 }
365
366 /* Go through the players. Let the loop set the next pl value, 351 /* Go through the players. Let the loop set the next pl value,
367 * since we may remove some 352 * since we may remove some
368 */ 353 */
354 //TODO: must be handled cleanly elsewhere
369 for (pl = first_player; pl != NULL;) 355 for (pl = first_player; pl; )
370 { 356 {
357 player *npl = pl->next;
358
359 //TODO: must be handled cleanly elsewhere
371 if (pl->socket.status == Ns_Dead) 360 if (pl->socket->status == Ns_Dead)
372 { 361 {
373 player *npl = pl->next;
374
375 save_player (pl->ob, 0); 362 save_player (pl->ob, 0);
376 363
377 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) 364 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
378 { 365 {
379 terminate_all_pets (pl->ob); 366 terminate_all_pets (pl->ob);
380 pl->ob->remove (); 367 pl->ob->remove ();
381 } 368 }
382 369
383 leave (pl, 1); 370 leave (pl, 1);
384 final_free_player (pl); 371 final_free_player (pl);
372 }
373
385 pl = npl; 374 pl = npl;
375 }
376
377 FD_ZERO (&tmp_read);
378 FD_ZERO (&tmp_write);
379
380 for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); )
381 {
382 client_socket *s = *i;
383
384 if (s->status == Ns_Dead)
385 {
386 client_sockets.erase (i);
387 delete s;
386 } 388 }
387 else 389 else
388 { 390 {
391 if (s->fd > maxfd) maxfd = s->fd;
392
389 FD_SET ((uint32) pl->socket.fd, &tmp_read); 393 FD_SET (s->fd, &tmp_read);
394
395 if (s->outputbuffer.len)
390 FD_SET ((uint32) pl->socket.fd, &tmp_write); 396 FD_SET (s->fd, &tmp_write);
391 pl = pl->next;
392 }
393 }
394 397
395 /* Reset timeout each time, since some OS's will change the values on 398 ++i;
396 * the return from select. 399 }
397 */ 400 }
401
402 struct timeval timeout;
403
398 socket_info.timeout.tv_sec = 0; 404 timeout.tv_sec = 0;
399 socket_info.timeout.tv_usec = 0; 405 timeout.tv_usec = 0;
400 406
401 pollret = select (socket_info.max_filedescriptor, 407 pollret = select (maxfd + 1,
402 &tmp_read, &tmp_write, 0, 408 &tmp_read, &tmp_write, 0,
403 &socket_info.timeout); 409 &timeout);
404 410
405 if (pollret == -1) 411 if (pollret == -1)
406 { 412 {
407 LOG (llevError, "select failed: %s\n", strerror (errno)); 413 LOG (llevError, "select failed: %s\n", strerror (errno));
408 return; 414 return;
409 } 415 }
410 416
411 /* We need to do some of the processing below regardless */ 417 /* We need to do some of the processing below regardless */
412 418
413/* if (!pollret) return;*/
414
415 /* Following adds a new connection */
416 if (pollret && FD_ISSET (init_sockets[0].fd, &tmp_read))
417 {
418 int newsocknum = 0;
419
420#ifdef ESRV_DEBUG
421 LOG (llevDebug, "doeric_server: New Connection\n");
422#endif
423 /* If this is the case, all sockets currently in used */
424 if (socket_info.allocated_sockets <= socket_info.nconns)
425 {
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 }
437 else
438 {
439 int j;
440
441 for (j = 1; j < socket_info.allocated_sockets; j++)
442 if (init_sockets[j].status == Ns_Avail)
443 {
444 newsocknum = j;
445 break;
446 }
447 }
448
449 init_sockets[newsocknum].fd = accept (init_sockets[0].fd, (struct sockaddr *) &addr, &addrlen);
450
451 if (init_sockets[newsocknum].fd == -1)
452 LOG (llevError, "accept failed: %s\n", strerror (errno));
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 {
466 LOG (llevInfo, "Banned host tried to connect: [%s]\n", buf);
467 close (init_sockets[newsocknum].fd);
468 init_sockets[newsocknum].fd = -1;
469 }
470 else
471 {
472 InitConnection (ns, buf);
473 socket_info.nconns++;
474 }
475 }
476 }
477
478 /* Check for any input on the sockets */ 419 /* Check for any input on the sockets */
479 if (pollret) 420 for (sockvec::iterator i = client_sockets.begin (); i != client_sockets.end (); ++i)
480 for (i = 1; i < socket_info.allocated_sockets; i++)
481 { 421 {
482 if (init_sockets[i].status == Ns_Avail) 422 client_socket *s = *i;
483 continue; 423 player *pl = s->pl;
484 424
485 if (FD_ISSET (init_sockets[i].fd, &tmp_read)) 425 //TODO: writing should be independent of tick
486 HandleClient (&init_sockets[i], NULL);
487
488 if (FD_ISSET (init_sockets[i].fd, &tmp_write))
489 init_sockets[i].can_write = 1;
490 }
491
492 /* This does roughly the same thing, but for the players now */
493 for (pl = first_player; pl != NULL; pl = next)
494 {
495
496 next = pl->next;
497 if (pl->socket.status == Ns_Dead)
498 continue;
499
500 if (FD_ISSET (pl->socket.fd, &tmp_write)) 426 if (FD_ISSET (s->fd, &tmp_write))
501 {
502 if (!pl->socket.can_write)
503 {
504#if 0
505 LOG (llevDebug, "Player %s socket now write enabled\n", pl->ob->name);
506#endif
507 pl->socket.can_write = 1;
508 write_socket_buffer (&pl->socket);
509 }
510
511 /* if we get an error on the write_socket buffer, no reason to
512 * continue on this socket.
513 */
514 if (pl->socket.status == Ns_Dead)
515 continue;
516 } 427 {
517 else
518 pl->socket.can_write = 0; 428 s->can_write = 1;
519 429 write_socket_buffer (s);
520 HandleClient (&pl->socket, pl);
521 /* If the player has left the game, then the socket status
522 * will be set to this be the leave function. We don't
523 * need to call leave again, as it has already been called
524 * once.
525 */
526 if (pl->socket.status == Ns_Dead)
527 { 430 }
528 save_player (pl->ob, 0);
529 431
530 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) 432 //TODO: disassociate handleclient from socket readin
531 { 433 if (s->inbuf_len || FD_ISSET (s->fd, &tmp_read))
532 terminate_all_pets (pl->ob); 434 HandleClient (s, pl);
533 pl->ob->remove ();
534 }
535 435
536 leave (pl, 1); 436 //TODO: should not be done here, either
537 final_free_player (pl); 437 if (s->status != Ns_Dead && pl)
538 }
539 else
540 { 438 {
541 /* Update the players stats once per tick. More efficient than 439 /* Update the players stats once per tick. More efficient than
542 * sending them whenever they change, and probably just as useful 440 * sending them whenever they change, and probably just as useful
543 */ 441 */
544 esrv_update_stats (pl); 442 esrv_update_stats (pl);
… …
552 450
553 /* draw_client_map does sanity checking that map is 451 /* draw_client_map does sanity checking that map is
554 * valid, so don't do it here. 452 * valid, so don't do it here.
555 */ 453 */
556 draw_client_map (pl->ob); 454 draw_client_map (pl->ob);
557 if (pl->socket.update_look) 455 if (s->update_look)
558 esrv_draw_look (pl->ob); 456 esrv_draw_look (pl->ob);
559 } 457 }
560 } 458 }
561} 459}
562 460

Diff Legend

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