ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/lowlevel.C
(Generate patch)

Comparing deliantra/server/socket/lowlevel.C (file contents):
Revision 1.78 by root, Fri Apr 30 20:43:18 2010 UTC vs.
Revision 1.94 by root, Sun Nov 18 09:29:25 2012 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * 5 *
6 * Deliantra is free software: you can redistribute it and/or modify it under 6 * Deliantra is free software: you can redistribute it and/or modify it under
7 * the terms of the Affero GNU General Public License as published by the 7 * the terms of the Affero GNU General Public License as published by the
8 * Free Software Foundation, either version 3 of the License, or (at your 8 * Free Software Foundation, either version 3 of the License, or (at your
9 * option) any later version. 9 * option) any later version.
10 * 10 *
11 * This program is distributed in the hope that it will be useful, 11 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details. 14 * GNU General Public License for more details.
15 * 15 *
16 * You should have received a copy of the Affero GNU General Public License 16 * You should have received a copy of the Affero GNU General Public License
17 * and the GNU General Public License along with this program. If not, see 17 * and the GNU General Public License along with this program. If not, see
18 * <http://www.gnu.org/licenses/>. 18 * <http://www.gnu.org/licenses/>.
19 * 19 *
20 * The authors can be reached via e-mail to <support@deliantra.net> 20 * The authors can be reached via e-mail to <support@deliantra.net>
21 */ 21 */
22 22
23using namespace std; 23using namespace std;
24 24
… …
48 * 48 *
49 * When the socket is clear to write, and we have backlogged data, this 49 * When the socket is clear to write, and we have backlogged data, this
50 * is called to write it out. 50 * is called to write it out.
51 */ 51 */
52 52
53 // write a nop to the socket at least every IDLE_NOP seconds. 53 // write a nop to the socket at least every IDLE_PING seconds.
54 if (!outputbuffer.len) 54 if (!outputbuffer.len)
55 { 55 {
56 if (last_send + IDLE_PING <= NOW && pl && pl->active) 56 if (last_send + IDLE_PING <= NOW && pl && pl->active)
57 { 57 {
58 // this is a bit ugly, but map1/map1a seem to be the only 58 // this is a bit ugly, but map1a seems to be the only
59 // nop'able commands and they are quite small. 59 // nop'able command and it is quite small.
60 packet sl (mapmode == Map1Cmd ? "map1" : "map1a"); 60 packet sl ("map1a");
61 send_packet (sl); 61 send_packet (sl);
62 } 62 }
63 else 63 else
64 return; 64 return;
65 } 65 }
… …
132 if (inbuf_len >= 2 + pkt_len) 132 if (inbuf_len >= 2 + pkt_len)
133 return 2 + pkt_len; 133 return 2 + pkt_len;
134 134
135 if (inbuf_len == sizeof (inbuf)) 135 if (inbuf_len == sizeof (inbuf))
136 { 136 {
137 send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED | NDI_REPLY); 137 send_packet_printf ("msg %d log input buffer overflow - closing connection.", NDI_RED | NDI_REPLY);
138 destroy (); 138 destroy ();
139 return -1; 139 return -1;
140 } 140 }
141 } 141 }
142 142
… …
167 167
168/** 168/**
169 * Dispatch table for the server. 169 * Dispatch table for the server.
170 */ 170 */
171static struct packet_type packets[] = { 171static struct packet_type packets[] = {
172 {"ncom", PC(NewPlayerCmd) PF_PLAYING | PF_COMMAND6 },
173 {"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND0 }, 172 {"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND },
174 173
175 {"examine", PC(ExamineCmd) PF_PLAYING }, 174 {"examine", PC(ExamineCmd) PF_PLAYING },
176 {"ex", PC(ExCmd) PF_PLAYING }, 175 {"ex", PC(ExCmd) PF_PLAYING },
177 {"apply", PC(ApplyCmd) PF_PLAYING }, 176 {"apply", PC(ApplyCmd) PF_PLAYING },
178 {"lookat", PC(LookAt) PF_PLAYING }, 177 {"lookat", PC(LookAt) PF_PLAYING },
… …
200{ 199{
201 return (!(pkt->flags & PF_PLAYER) || pl) 200 return (!(pkt->flags & PF_PLAYER) || pl)
202 && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING); 201 && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING);
203} 202}
204 203
205// HACK: some commands currently should be executed 204// HACK: some commands currently should be executed
206// even when the player is frozen. this hack detects 205// even when the player is frozen. this hack detects
207// those commands. it should be folded into may_execute, 206// those commands. it should be folded into may_execute,
208// but kept seperate to emphasise the hack aspect, i.e. 207// but kept seperate to emphasise the hack aspect, i.e.
209// do it better, then remove. 208// do it better, then remove.
210static bool 209static bool
211always_immediate (const client *ns, const packet_type *pkt, const char *data, int len) 210always_immediate (const client *ns, const packet_type *pkt, const char *data, int len)
212{ 211{
213 if (!(pkt->flags & (PF_COMMAND0 | PF_COMMAND6))) 212 if (!(pkt->flags & PF_COMMAND))
214 return false; 213 return false;
215 214
216 if (!ns->pl || !ns->pl->ob || !ns->pl->ob->map) 215 if (!ns->pl || !ns->pl->ob || !ns->pl->ob->map)
217 return false; 216 return false;
218
219 if (pkt->flags & PF_COMMAND6)
220 {
221 data += 6;
222 len -= 6;
223 }
224 217
225 if (len > 4 && data [ 3] == ' ' && !strncmp (data, "say " , 4)) return true; 218 if (len > 4 && data [ 3] == ' ' && !strncmp (data, "say " , 4)) return true;
226 if (len > 5 && data [ 4] == ' ' && !strncmp (data, "chat " , 5)) return true; 219 if (len > 5 && data [ 4] == ' ' && !strncmp (data, "chat " , 5)) return true;
227 if (len > 6 && data [ 5] == ' ' && !strncmp (data, "shout " , 6)) return true; 220 if (len > 6 && data [ 5] == ' ' && !strncmp (data, "shout " , 6)) return true;
228 if (len > 8 && data [ 7] == ' ' && !strncmp (data, "suicide " , 8)) return true; 221 if (len > 8 && data [ 7] == ' ' && !strncmp (data, "suicide " , 8)) return true;
… …
298 291
299 goto next_packet; 292 goto next_packet;
300 } 293 }
301 294
302 // If we get here, we didn't find a valid command. 295 // If we get here, we didn't find a valid command.
303 send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED | NDI_REPLY, (char *)inbuf + 2); 296 send_packet_printf ("msg %d log ERROR: command '%s' not supported.", NDI_RED | NDI_REPLY, (char *)inbuf + 2);
304 297
305next_packet: 298next_packet:
306 inbuf [pkt_len] = save_byte; // rather ugly 299 inbuf [pkt_len] = save_byte; // rather ugly
307 skip_packet (pkt_len); 300 skip_packet (pkt_len);
308 301
… …
310 socket_ev.poll (socket_ev.poll () | EV_READ); 303 socket_ev.poll (socket_ev.poll () | EV_READ);
311 304
312 return true; 305 return true;
313} 306}
314 307
308void
309client::inbuf_handle ()
310{
311 if (!handle_packet ())
312 return;
313
314 while (handle_packet ())
315 ;
316
317 flush ();
318}
319
315// callback called when socket is either readable or writable 320// callback called when socket is either readable or writable
316void 321void
317client::socket_cb (iow &w, int revents) 322client::socket_cb (iow &w, int revents)
318{ 323{
319 //TODO remove when we have better socket cleanup logic 324 //TODO remove when we have better socket cleanup logic
… …
331 socket_ev.poll (socket_ev.poll () & ~EV_WRITE); 336 socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
332 } 337 }
333 338
334 if (revents & EV_READ) 339 if (revents & EV_READ)
335 { 340 {
336 //TODO: rate-limit tcp connection in better ways, important 341 int amount;
342 uint8 *rbuf;
337 343
344 if (ws_version)
345 {
346 if (ws_inbuf_len + 2048 > ws_inbuf_alloc)
347 ws_inbuf = (uint8 *)realloc (ws_inbuf, ws_inbuf_alloc += 4096);
348
349 rbuf = ws_inbuf + ws_inbuf_len;
350 amount = ws_inbuf_alloc - ws_inbuf_len;
351 }
352 else
353 {
354 rbuf = inbuf + inbuf_len;
338 int amount = sizeof (inbuf) - inbuf_len; 355 amount = sizeof (inbuf) - inbuf_len;
356 }
339 357
340 if (!amount) 358 if (!amount)
341 { 359 {
342 // input buffer full 360 // input buffer full
343 socket_ev.poll (socket_ev.poll () & ~EV_READ); 361 LOG (llevError, "input buffer overflow.");
362 destroy ();
344 return; 363 return;
345 } 364 }
346 365
347 amount = read (fd, inbuf + inbuf_len, amount); 366 amount = read (fd, rbuf, amount);
348 367
349 if (!amount) 368 if (!amount)
350 { 369 {
351 destroy (); 370 destroy ();
352 return; 371 return;
… …
360 return; 379 return;
361 } 380 }
362 381
363 // should not be here, normally 382 // should not be here, normally
364 } 383 }
384
385 if (ws_version)
386 {
387 ws_inbuf_len += amount;
388
389 while (ws_inbuf_len)
390 {
391 if (ws_inbuf_len < 2 + 4) // 6 is minimum length: op, len, mask
392 break;
393
394 int d = 2;
395 int fin = ws_inbuf [0] & 0x80;
396 int op = ws_inbuf [0] & 0x0f;
397 int len = ws_inbuf [1] & 0x7f;
398
399 if (len == 126)
400 {
401 len = (ws_inbuf [2] << 8) | ws_inbuf [3];
402 d += 2;
403 }
404 else if (len == 127)
405 {
406 if (ws_inbuf_len < 2 + 8)
407 return;
408
409 // we don't do extra long frames, if a browser wants to send >2**32 bytes,
410 // there are bigger issues to fix.
411 len = (ws_inbuf [8] << 8) | ws_inbuf [9];
412 d += 8;
413 }
414
415 // we only continue if we have a complete frame
416 if (ws_inbuf_len < d + 4 + len)
417 return;
418
419 switch (op)
420 {
421 case 0: op = ws_inbuf_type; break; // continuation
422 case 1: ws_inbuf_type = 1; break; // utf-8
423 case 2: ws_inbuf_type = 2; break; // binary
424 }
425
426 if (len > sizeof (inbuf) - inbuf_len)
427 {
428 // input buffer full
429 LOG (llevError, "input buffer overflow (ws).");
430 destroy ();
431 return;
432 }
433
434 uint8 *buf = inbuf + inbuf_len + 2;
435
436 for (int i = 0; i < len; ++i)
437 buf [i] = ws_inbuf [d + 4 + i] ^ ws_inbuf [d + (i & 3)];
438
439 // remove frame
440 ws_inbuf_len -= d + 4 + len;
441 memmove (ws_inbuf, ws_inbuf + d + 4 + len, ws_inbuf_len);
442
443 switch (op)
444 {
445 case 1: // utf-8
446 // utf-8 encoded frames cannot have full length (MAXSOCKBUF) in all cases
447 // but we assume that these extra-long packets will be rare.
448 {
449 uint8 *a = buf;
450 uint8 *b = a;
451 uint8 *c = a + len;
452
453 for (; a < c; ++a, ++b)
454 {
455 *b = *a;
456
457 if (*a >= 0x80)
458 *b = (a [0] & 0x1f) << 6 | (a [1] & 0x3f), ++a;
459 }
460
461 len -= a - b;
462 }
463 /* FALLTHROUGH */
464 case 2: // binary
465 inbuf_len += len;
466
467 if (fin)
468 {
469 inbuf [0] = inbuf_len >> 8;
470 inbuf [1] = inbuf_len;
471
472 inbuf_len += 2;
473
474 inbuf_handle ();
475 }
476 break;
477
478 case 9: // ping
479 {
480 // send pong - we assume ping messages are <64k
481 // as we can't handle >10k at the moment anyway.
482 uint8 hdr [] = { 0x8a, 126, len >> 8, len };
483 send (hdr, sizeof (hdr));
484 send (inbuf + inbuf_len, len);
485 }
486 break;
487
488 case 10: // pong
489 break;
490
491 case 8: // close
492 default:
493 destroy ();
494 return;
495 }
496 }
497 }
365 else 498 else
366 { 499 {
367 inbuf_len += amount; 500 inbuf_len += amount;
368 501 inbuf_handle ();
369 if (handle_packet ())
370 {
371 while (handle_packet ())
372 ;
373
374 flush ();
375 }
376 } 502 }
377 } 503 }
378} 504}
379 505
380/******************************************************************************* 506/*******************************************************************************
… …
450 } 576 }
451 577
452 if (!sl.length ()) 578 if (!sl.length ())
453 return; 579 return;
454 580
581 if (ws_version == 8)
582 {
583 static uint8 buf [MAXSOCKBUF * 2 + 4];
584
585 uint8 *b = buf + 4;
586 for (uint8 *a = sl.buf_ + sl.hdrlen; a < sl.cur; ++a)
587 {
588 if (*a < 0x80)
589 *b++ = *a;
590 else
591 {
592 *b++ = 0xc0 | ((*a >> 6) & 0x1f);
593 *b++ = 0x80 | ( *a & 0x3f);
594 }
595 }
596
597 assert (b - buf < sizeof (buf));
598
599 int len = b - (buf + 4);
600
601 if (len < 126)
602 {
603 buf [2] = 0x81;
604 buf [3] = len;
605
606 send (buf + 2, len + 2);
607 }
608 else
609 {
610 buf [0] = 0x81;
611 buf [1] = 126;
612 buf [2] = len >> 8;
613 buf [3] = len;
614
615 send (buf, len + 4);
616 }
617 }
618 else if (ws_version == 13)
619 {
620 int len = sl.length ();
621
622 if (len < 126)
623 {
624 uint8 hdr [] = { 0x82, len };
625 send (hdr, sizeof (hdr));
626 }
627 else
628 {
629 uint8 hdr [] = { 0x82, 126, len >> 8, len };
630 send (hdr, sizeof (hdr));
631 }
632
633 send (sl.buf_ + sl.hdrlen, len);
634 }
635 else
636 {
455 assert (sl.hdrlen == 2); 637 assert (sl.hdrlen == 2);
456 638
457 sl.buf_ [0] = sl.length () >> 8; 639 sl.buf_ [0] = sl.length () >> 8;
458 sl.buf_ [1] = sl.length () ; 640 sl.buf_ [1] = sl.length () ;
459 641
460 send (sl.buf_, sl.length () + sl.hdrlen); 642 send (sl.buf_, sl.length () + sl.hdrlen);
643 }
461} 644}
462 645
463void 646void
464client::send_packet (const char *buf, int len) 647client::send_packet (const char *buf, int len)
465{ 648{
… …
528 *cur++ = ' '; 711 *cur++ = ' ';
529} 712}
530 713
531packet &packet::operator <<(const ber32 v) 714packet &packet::operator <<(const ber32 v)
532{ 715{
533 enum { maxlen = 32 / 7 + 1}; 716 enum { maxlen = 32 / 7 + 1 };
534 uint8 buf[maxlen]; 717 uint8 buf[maxlen];
535 uint8 *p = buf + maxlen; 718 uint8 *p = buf + maxlen;
536 uint32 val = v.val; 719 uint32 val = v.val;
537 720
538 *--p = val & 0x7F; 721 *--p = val & 0x7F;

Diff Legend

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