… | |
… | |
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 map1a seems to be the only |
58 | // this is a bit ugly, but map1a seems to be the only |
… | |
… | |
200 | { |
200 | { |
201 | return (!(pkt->flags & PF_PLAYER) || pl) |
201 | return (!(pkt->flags & PF_PLAYER) || pl) |
202 | && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING); |
202 | && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING); |
203 | } |
203 | } |
204 | |
204 | |
205 | // HACK: some commands currently should be executed |
205 | // HACK: some commands currently should be executed |
206 | // even when the player is frozen. this hack detects |
206 | // even when the player is frozen. this hack detects |
207 | // those commands. it should be folded into may_execute, |
207 | // those commands. it should be folded into may_execute, |
208 | // but kept seperate to emphasise the hack aspect, i.e. |
208 | // but kept seperate to emphasise the hack aspect, i.e. |
209 | // do it better, then remove. |
209 | // do it better, then remove. |
210 | static bool |
210 | static bool |
… | |
… | |
343 | socket_ev.poll (socket_ev.poll () & ~EV_WRITE); |
343 | socket_ev.poll (socket_ev.poll () & ~EV_WRITE); |
344 | } |
344 | } |
345 | |
345 | |
346 | if (revents & EV_READ) |
346 | if (revents & EV_READ) |
347 | { |
347 | { |
348 | //TODO: rate-limit tcp connection in better ways, important |
348 | int amount; |
|
|
349 | uint8 *rbuf; |
349 | |
350 | |
|
|
351 | if (ws_version) |
|
|
352 | { |
|
|
353 | if (ws_inbuf_len + 2048 > ws_inbuf_alloc) |
|
|
354 | ws_inbuf = (uint8 *)realloc (ws_inbuf, ws_inbuf_alloc += 4096); |
|
|
355 | |
|
|
356 | rbuf = ws_inbuf + ws_inbuf_len; |
|
|
357 | amount = ws_inbuf_alloc - ws_inbuf_len; |
|
|
358 | } |
|
|
359 | else |
|
|
360 | { |
|
|
361 | rbuf = inbuf + inbuf_len; |
350 | int amount = sizeof (inbuf) - inbuf_len; |
362 | amount = sizeof (inbuf) - inbuf_len; |
|
|
363 | } |
351 | |
364 | |
352 | if (!amount) |
365 | if (!amount) |
353 | { |
366 | { |
354 | // input buffer full |
367 | // input buffer full |
355 | socket_ev.poll (socket_ev.poll () & ~EV_READ); |
368 | LOG (llevError, "input buffer overflow."); |
|
|
369 | destroy (); |
356 | return; |
370 | return; |
357 | } |
371 | } |
358 | |
372 | |
359 | amount = read (fd, inbuf + inbuf_len, amount); |
373 | amount = read (fd, rbuf, amount); |
360 | |
374 | |
361 | if (!amount) |
375 | if (!amount) |
362 | { |
376 | { |
363 | destroy (); |
377 | destroy (); |
364 | return; |
378 | return; |
… | |
… | |
371 | destroy (); |
385 | destroy (); |
372 | return; |
386 | return; |
373 | } |
387 | } |
374 | |
388 | |
375 | // should not be here, normally |
389 | // should not be here, normally |
|
|
390 | } |
|
|
391 | |
|
|
392 | if (ws_version) |
|
|
393 | { |
|
|
394 | ws_inbuf_len += amount; |
|
|
395 | |
|
|
396 | while (ws_inbuf_len) |
|
|
397 | { |
|
|
398 | if (ws_inbuf_len < 2 + 4) // 6 is minimum length: op, len, mask |
|
|
399 | break; |
|
|
400 | |
|
|
401 | int d = 2; |
|
|
402 | int fin = ws_inbuf [0] & 0x80; |
|
|
403 | int op = ws_inbuf [0] & 0x0f; |
|
|
404 | int len = ws_inbuf [1] & 0x7f; |
|
|
405 | |
|
|
406 | if (len == 126) |
|
|
407 | { |
|
|
408 | len = (ws_inbuf [2] << 8) | ws_inbuf [3]; |
|
|
409 | d += 2; |
|
|
410 | } |
|
|
411 | else if (len == 127) |
|
|
412 | { |
|
|
413 | if (ws_inbuf_len < 2 + 8) |
|
|
414 | return; |
|
|
415 | |
|
|
416 | // we don't do extra long frames, if a browser wants to send >2**32 bytes, |
|
|
417 | // there are bigger issues to fix. |
|
|
418 | len = (ws_inbuf [8] << 8) | ws_inbuf [9]; |
|
|
419 | d += 8; |
|
|
420 | } |
|
|
421 | |
|
|
422 | // we only continue if we have a complete frame |
|
|
423 | if (ws_inbuf_len < d + 4 + len) |
|
|
424 | return; |
|
|
425 | |
|
|
426 | switch (op) |
|
|
427 | { |
|
|
428 | case 0: op = ws_inbuf_type; break; // continuation |
|
|
429 | case 1: ws_inbuf_type = 1; break; // utf-8 |
|
|
430 | case 2: ws_inbuf_type = 2; break; // binary |
|
|
431 | } |
|
|
432 | |
|
|
433 | if (len > sizeof (inbuf) - inbuf_len) |
|
|
434 | { |
|
|
435 | // input buffer full |
|
|
436 | LOG (llevError, "input buffer overflow (ws)."); |
|
|
437 | destroy (); |
|
|
438 | return; |
|
|
439 | } |
|
|
440 | |
|
|
441 | uint8 *buf = inbuf + inbuf_len + 2; |
|
|
442 | |
|
|
443 | for (int i = 0; i < len; ++i) |
|
|
444 | buf [i] = ws_inbuf [d + 4 + i] ^ ws_inbuf [d + (i & 3)]; |
|
|
445 | |
|
|
446 | // remove frame |
|
|
447 | ws_inbuf_len -= d + 4 + len; |
|
|
448 | memmove (ws_inbuf, ws_inbuf + d + 4 + len, ws_inbuf_len); |
|
|
449 | |
|
|
450 | switch (op) |
|
|
451 | { |
|
|
452 | case 1: // utf-8 |
|
|
453 | // utf-8 encoded frames cannot have full length (MAXSOCKBUF) in all cases |
|
|
454 | // but we assume that these extra-long packets will be rare. |
|
|
455 | { |
|
|
456 | uint8 *a = buf; |
|
|
457 | uint8 *b = a; |
|
|
458 | uint8 *c = a + len; |
|
|
459 | |
|
|
460 | for (; a < c; ++a, ++b) |
|
|
461 | { |
|
|
462 | *b = *a; |
|
|
463 | |
|
|
464 | if (*a >= 0x80) |
|
|
465 | *b = (a [0] & 0x1f) << 6 | (a [1] & 0x3f), ++a; |
|
|
466 | } |
|
|
467 | |
|
|
468 | len -= a - b; |
|
|
469 | } |
|
|
470 | /* FALLTHROUGH */ |
|
|
471 | case 2: // binary |
|
|
472 | inbuf_len += len; |
|
|
473 | |
|
|
474 | if (fin) |
|
|
475 | { |
|
|
476 | inbuf [0] = inbuf_len >> 8; |
|
|
477 | inbuf [1] = inbuf_len; |
|
|
478 | |
|
|
479 | inbuf_len += 2; |
|
|
480 | |
|
|
481 | inbuf_handle (); |
|
|
482 | } |
|
|
483 | break; |
|
|
484 | |
|
|
485 | case 9: // ping |
|
|
486 | { |
|
|
487 | // send pong - we assume ping messages are <64k |
|
|
488 | // as we can't handle >10k at the moment anyway. |
|
|
489 | uint8 hdr [] = { 0x8a, 126, len >> 8, len }; |
|
|
490 | send (hdr, sizeof (hdr)); |
|
|
491 | send (inbuf + inbuf_len, len); |
|
|
492 | } |
|
|
493 | break; |
|
|
494 | |
|
|
495 | case 10: // pong |
|
|
496 | break; |
|
|
497 | |
|
|
498 | case 8: // close |
|
|
499 | default: |
|
|
500 | destroy (); |
|
|
501 | return; |
|
|
502 | } |
|
|
503 | } |
376 | } |
504 | } |
377 | else |
505 | else |
378 | { |
506 | { |
379 | inbuf_len += amount; |
507 | inbuf_len += amount; |
380 | inbuf_handle (); |
508 | inbuf_handle (); |
… | |
… | |
455 | } |
583 | } |
456 | |
584 | |
457 | if (!sl.length ()) |
585 | if (!sl.length ()) |
458 | return; |
586 | return; |
459 | |
587 | |
|
|
588 | if (ws_version == 8) |
|
|
589 | { |
|
|
590 | static uint8 buf [MAXSOCKBUF * 2 + 4]; |
|
|
591 | |
|
|
592 | uint8 *b = buf + 4; |
|
|
593 | for (uint8 *a = sl.buf_ + sl.hdrlen; a < sl.cur; ++a) |
|
|
594 | { |
|
|
595 | if (*a < 0x80) |
|
|
596 | *b++ = *a; |
|
|
597 | else |
|
|
598 | { |
|
|
599 | *b++ = 0xc0 | ((*a >> 6) & 0x1f); |
|
|
600 | *b++ = 0x80 | ( *a & 0x3f); |
|
|
601 | } |
|
|
602 | } |
|
|
603 | |
|
|
604 | assert (b - buf < sizeof (buf)); |
|
|
605 | |
|
|
606 | int len = b - (buf + 4); |
|
|
607 | |
|
|
608 | if (len < 126) |
|
|
609 | { |
|
|
610 | buf [2] = 0x81; |
|
|
611 | buf [3] = len; |
|
|
612 | |
|
|
613 | send (buf + 2, len + 2); |
|
|
614 | } |
|
|
615 | else |
|
|
616 | { |
|
|
617 | buf [0] = 0x81; |
|
|
618 | buf [1] = 126; |
|
|
619 | buf [2] = len >> 8; |
|
|
620 | buf [3] = len; |
|
|
621 | |
|
|
622 | send (buf, len + 4); |
|
|
623 | } |
|
|
624 | } |
|
|
625 | else if (ws_version == 13) |
|
|
626 | { |
|
|
627 | int len = sl.length (); |
|
|
628 | |
|
|
629 | if (len < 126) |
|
|
630 | { |
|
|
631 | uint8 hdr [] = { 0x82, len }; |
|
|
632 | send (hdr, sizeof (hdr)); |
|
|
633 | } |
|
|
634 | else |
|
|
635 | { |
|
|
636 | uint8 hdr [] = { 0x82, 126, len >> 8, len }; |
|
|
637 | send (hdr, sizeof (hdr)); |
|
|
638 | } |
|
|
639 | |
|
|
640 | send (sl.buf_ + sl.hdrlen, len); |
|
|
641 | } |
|
|
642 | else |
|
|
643 | { |
460 | assert (sl.hdrlen == 2); |
644 | assert (sl.hdrlen == 2); |
461 | |
645 | |
462 | sl.buf_ [0] = sl.length () >> 8; |
646 | sl.buf_ [0] = sl.length () >> 8; |
463 | sl.buf_ [1] = sl.length () ; |
647 | sl.buf_ [1] = sl.length () ; |
464 | |
648 | |
465 | send (sl.buf_, sl.length () + sl.hdrlen); |
649 | send (sl.buf_, sl.length () + sl.hdrlen); |
|
|
650 | } |
466 | } |
651 | } |
467 | |
652 | |
468 | void |
653 | void |
469 | client::send_packet (const char *buf, int len) |
654 | client::send_packet (const char *buf, int len) |
470 | { |
655 | { |