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.87 by root, Tue Nov 6 03:45:17 2012 UTC vs.
Revision 1.101 by root, Sat Dec 1 20:22:13 2018 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 (©) 2018 Marc Alexander Lehmann / the Deliantra team
4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * 6 *
6 * Deliantra is free software: you can redistribute it and/or modify it under 7 * 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 8 * 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 9 * Free Software Foundation, either version 3 of the License, or (at your
9 * option) any later version. 10 * option) any later version.
… …
48 * 49 *
49 * When the socket is clear to write, and we have backlogged data, this 50 * When the socket is clear to write, and we have backlogged data, this
50 * is called to write it out. 51 * is called to write it out.
51 */ 52 */
52 53
53 // write a nop to the socket at least every IDLE_NOP seconds. 54 // write a nop to the socket at least every IDLE_PING seconds.
54 if (!outputbuffer.len) 55 if (!outputbuffer.len)
55 { 56 {
56 if (last_send + IDLE_PING <= NOW && pl && pl->active) 57 if (last_send + IDLE_PING <= NOW && pl && pl->active)
57 { 58 {
58 // this is a bit ugly, but map1a seems to be the only 59 // this is a bit ugly, but map1a seems to be the only
… …
132 if (inbuf_len >= 2 + pkt_len) 133 if (inbuf_len >= 2 + pkt_len)
133 return 2 + pkt_len; 134 return 2 + pkt_len;
134 135
135 if (inbuf_len == sizeof (inbuf)) 136 if (inbuf_len == sizeof (inbuf))
136 { 137 {
137 send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED | NDI_REPLY); 138 send_packet_printf ("msg %d log input buffer overflow - closing connection.", NDI_RED | NDI_REPLY);
138 destroy (); 139 destroy ();
139 return -1; 140 return -1;
140 } 141 }
141 } 142 }
142 143
… …
150 memmove (inbuf, inbuf + len, inbuf_len); 151 memmove (inbuf, inbuf + len, inbuf_len);
151} 152}
152 153
153/***************************************************************************** 154/*****************************************************************************
154 * Start of command dispatch area. 155 * Start of command dispatch area.
155 * The commands here are protocol commands. 156 * The commands here are protocol commands.
156 ****************************************************************************/ 157 ****************************************************************************/
157 158
158// SocketCommand, PlayingCommand, should not exist with those ugly casts 159// SocketCommand, PlayingCommand, should not exist with those ugly casts
159#define SC(cb) (void *)static_cast<void (*)(char *, int, client *)>(cb), 160#define SC(cb) (void *)static_cast<void (*)(char *, int, client *)>(cb),
160#define PC(cb) (void *)static_cast<void (*)(char *, int, player *)>(cb), PF_PLAYER | 161#define PC(cb) (void *)static_cast<void (*)(char *, int, player *)>(cb), PF_PLAYER |
… …
167 168
168/** 169/**
169 * Dispatch table for the server. 170 * Dispatch table for the server.
170 */ 171 */
171static struct packet_type packets[] = { 172static struct packet_type packets[] = {
172 {"ncom", PC(NewPlayerCmd) PF_PLAYING | PF_COMMAND6 },
173 {"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND0 }, 173 {"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND },
174 174
175 {"examine", PC(ExamineCmd) PF_PLAYING }, 175 {"examine", PC(ExamineCmd) PF_PLAYING },
176 {"ex", PC(ExCmd) PF_PLAYING }, 176 {"ex", PC(ExCmd) PF_PLAYING },
177 {"apply", PC(ApplyCmd) PF_PLAYING }, 177 {"apply", PC(ApplyCmd) PF_PLAYING },
178 {"lookat", PC(LookAt) PF_PLAYING }, 178 {"lookat", PC(LookAt) PF_PLAYING },
… …
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.
210static bool 210static bool
211always_immediate (const client *ns, const packet_type *pkt, const char *data, int len) 211always_immediate (const client *ns, const packet_type *pkt, const char *data, int len)
212{ 212{
213 if (!(pkt->flags & (PF_COMMAND0 | PF_COMMAND6))) 213 if (!(pkt->flags & PF_COMMAND))
214 return false; 214 return false;
215 215
216 if (!ns->pl || !ns->pl->ob || !ns->pl->ob->map) 216 if (!ns->pl || !ns->pl->ob || !ns->pl->ob->map)
217 return false; 217 return false;
218
219 if (pkt->flags & PF_COMMAND6)
220 {
221 data += 6;
222 len -= 6;
223 }
224 218
225 if (len > 4 && data [ 3] == ' ' && !strncmp (data, "say " , 4)) return true; 219 if (len > 4 && data [ 3] == ' ' && !strncmp (data, "say " , 4)) return true;
226 if (len > 5 && data [ 4] == ' ' && !strncmp (data, "chat " , 5)) return true; 220 if (len > 5 && data [ 4] == ' ' && !strncmp (data, "chat " , 5)) return true;
227 if (len > 6 && data [ 5] == ' ' && !strncmp (data, "shout " , 6)) return true; 221 if (len > 6 && data [ 5] == ' ' && !strncmp (data, "shout " , 6)) return true;
228 if (len > 8 && data [ 7] == ' ' && !strncmp (data, "suicide " , 8)) return true; 222 if (len > 8 && data [ 7] == ' ' && !strncmp (data, "suicide " , 8)) return true;
… …
246 } 240 }
247 else 241 else
248 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this); 242 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this);
249 } 243 }
250 else 244 else
251 send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED | NDI_REPLY, pkt->name); 245 send_packet_printf ("msg %d log ERROR: you cannot execute '%s' now.", NDI_RED | NDI_REPLY, pkt->name);
252} 246}
253 247
254bool 248bool
255client::handle_packet () 249client::handle_packet ()
256{ 250{
… …
286 { 280 {
287 data = (char *)inbuf + 2; // better read garbage than segfault 281 data = (char *)inbuf + 2; // better read garbage than segfault
288 datalen = 0; 282 datalen = 0;
289 } 283 }
290 284
291 for (packet_type *pkt = packets; pkt < packets + array_length (packets); ++pkt) 285 for (packet_type *pkt = packets; pkt < packets + ecb_array_length (packets); ++pkt)
292 if (!strcmp ((char *)inbuf + 2, pkt->name)) 286 if (!strcmp ((char *)inbuf + 2, pkt->name))
293 { 287 {
294 if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen)) 288 if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen))
295 queue_command (pkt, data, datalen); 289 queue_command (pkt, data, datalen);
296 else 290 else
… …
298 292
299 goto next_packet; 293 goto next_packet;
300 } 294 }
301 295
302 // If we get here, we didn't find a valid command. 296 // 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); 297 send_packet_printf ("msg %d log ERROR: command '%s' not supported.", NDI_RED | NDI_REPLY, (char *)inbuf + 2);
304 298
305next_packet: 299next_packet:
306 inbuf [pkt_len] = save_byte; // rather ugly 300 inbuf [pkt_len] = save_byte; // rather ugly
307 skip_packet (pkt_len); 301 skip_packet (pkt_len);
308 302
… …
343 socket_ev.poll (socket_ev.poll () & ~EV_WRITE); 337 socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
344 } 338 }
345 339
346 if (revents & EV_READ) 340 if (revents & EV_READ)
347 { 341 {
348 //TODO: rate-limit tcp connection in better ways, important 342 int amount;
343 uint8 *rbuf;
349 344
345 if (ws_version)
346 {
347 if (ws_inbuf_len + 2048 > ws_inbuf_alloc)
348 ws_inbuf = (uint8 *)realloc (ws_inbuf, ws_inbuf_alloc += 4096);
349
350 rbuf = ws_inbuf + ws_inbuf_len;
351 amount = ws_inbuf_alloc - ws_inbuf_len;
352 }
353 else
354 {
355 rbuf = inbuf + inbuf_len;
350 int amount = sizeof (inbuf) - inbuf_len; 356 amount = sizeof (inbuf) - inbuf_len;
357 }
351 358
352 if (!amount) 359 if (!amount)
353 { 360 {
354 // input buffer full 361 // input buffer full
355 LOG (llevError, "input buffer overflow."); 362 LOG (llevError, "input buffer overflow.");
356 destroy (); 363 destroy ();
357 return; 364 return;
358 } 365 }
359 366
367 amount = read (fd, rbuf, amount);
368
369 if (!amount)
370 {
371 destroy ();
372 return;
373 }
374 else if (amount < 0)
375 {
376 if (errno != EAGAIN && errno != EINTR)
377 {
378 LOG (llevError, "read error: %s\n", strerror (errno));
379 destroy ();
380 return;
381 }
382
383 // should not be here, normally
384 }
385
360 if (ws_version) 386 if (ws_version)
361 { 387 {
362 if (ws_inbuf_len + 4096 > ws_inbuf_alloc) 388 ws_inbuf_len += amount;
363 ws_inbuf = (uint8 *)realloc (ws_inbuf, ws_inbuf_alloc += 4096);
364 389
365 int len = read (fd, ws_inbuf + ws_inbuf_len, ws_inbuf_alloc - ws_inbuf_len); 390 while (ws_inbuf_len)
366
367 if (len > 0)
368 { 391 {
369 ws_inbuf_len += len;
370
371 if (ws_inbuf_len < 2 + 4) // 6 is minimum length: op, len, mask 392 if (ws_inbuf_len < 2 + 4) // 6 is minimum length: op, len, mask
372 return; 393 break;
373 394
374 int d = 2; 395 int d = 2;
396 int fin = ws_inbuf [0] & 0x80;
375 int o = ws_inbuf [0] & 15; 397 int op = ws_inbuf [0] & 0x0f;
376 int l = ws_inbuf [1] & 127; 398 int len = ws_inbuf [1] & 0x7f;
377 399
378 if (l == 126) 400 if (len == 126)
379 { 401 {
380 l = (ws_inbuf [2] << 8) | ws_inbuf [3]; 402 len = (ws_inbuf [2] << 8) | ws_inbuf [3];
381 d += 2; 403 d += 2;
382 } 404 }
383 else if (l == 127) 405 else if (len == 127)
384 { 406 {
385 if (ws_inbuf_len < 2 + 8) 407 if (ws_inbuf_len < 2 + 8)
386 return; 408 return;
387 409
388 // we don't do extra long frames, if a browser wants to send >2**32 bytes, 410 // we don't do extra long frames, if a browser wants to send >2**32 bytes,
389 // there are bigger issues to fix. 411 // there are bigger issues to fix.
390 l = (ws_inbuf [6] << 24) 412 len = (ws_inbuf [8] << 8) | ws_inbuf [9];
391 | (ws_inbuf [7] << 16)
392 | (ws_inbuf [8] << 8)
393 | ws_inbuf [9];
394 d += 8; 413 d += 8;
395 } 414 }
396 415
397 // we only continue if we have a complete frame 416 // we only continue if we have a complete frame
398 if (ws_inbuf_len < d + 4 + l) 417 if (ws_inbuf_len < d + 4 + len)
399 return; 418 return;
400 419
401 switch (o) 420 switch (op)
402 { 421 {
403 case 0: o = ws_inbuf_type; break; // continuation 422 case 0: op = ws_inbuf_type; break; // continuation
404 case 1: ws_inbuf_type = 1; break; // utf-8 423 case 1: ws_inbuf_type = 1; break; // utf-8
405 case 2: ws_inbuf_type = 2; break; // binary 424 case 2: ws_inbuf_type = 2; break; // binary
406 } 425 }
407 426
408 if (l > amount) 427 if (len > sizeof (inbuf) - inbuf_len)
409 { 428 {
410 // input buffer full 429 // input buffer full
411 LOG (llevError, "input buffer overflow (ws)."); 430 LOG (llevError, "input buffer overflow (ws).");
412 destroy (); 431 destroy ();
413 return; 432 return;
414 } 433 }
415 434
435 uint8 *buf = inbuf + inbuf_len + 2;
436
416 for (int i = 0; i < l; ++i) 437 for (int i = 0; i < len; ++i)
417 inbuf [inbuf_len + i] = ws_inbuf [d + 4 + i] ^ ws_inbuf [d + (i & 3)]; 438 buf [i] = ws_inbuf [d + 4 + i] ^ ws_inbuf [d + (i & 3)];
418 439
419 // remove frame 440 // remove frame
420 ws_inbuf_len -= d + 4 + l; 441 ws_inbuf_len -= d + 4 + len;
421 memmove (ws_inbuf, ws_inbuf + d + 4 + l, ws_inbuf_len); 442 memmove (ws_inbuf, ws_inbuf + d + 4 + len, ws_inbuf_len);
422 443
423 switch (o) 444 switch (op)
424 { 445 {
425 case 1: // utf-8 446 case 1: // utf-8
447 // utf-8 encoded frames cannot have full length (MAXSOCKBUF) in all cases
448 // but we assume that these extra-long packets will be rare.
426 //TODO 449 {
450 uint8 *a = buf;
451 uint8 *b = a;
452 uint8 *c = a + len;
453
454 for (; a < c; ++a, ++b)
455 {
456 *b = *a;
457
458 if (*a >= 0x80)
459 *b = (a [0] & 0x1f) << 6 | (a [1] & 0x3f), ++a;
460 }
461
462 len -= a - b;
463 }
464 /* FALLTHROUGH */
465 case 2: // binary
466 inbuf_len += len;
467
468 if (fin)
469 {
470 inbuf [0] = inbuf_len >> 8;
471 inbuf [1] = inbuf_len;
472
473 inbuf_len += 2;
474
475 inbuf_handle ();
476 }
427 break; 477 break;
428 case 2: // binary
429 break;
430 478
431 case 9: // ping 479 case 9: // ping
432 { 480 {
433 // send pong - we assume ping messages are <64k 481 // send pong - we assume ping messages are <64k
434 // as we can't handle >10k at the moment anyway. 482 // as we can't handle >10k at the moment anyway.
435 uint8 hdr [] = { 0x8a, 126, l >> 8, l }; 483 uint8 hdr [] = { 0x8a, 126, len >> 8, len };
436 send (hdr, sizeof (hdr)); 484 send (hdr, sizeof (hdr));
437 send (inbuf + inbuf_len, l); 485 send (inbuf + inbuf_len, len);
438 } 486 }
439 return; 487 break;
440 488
441 case 10: // pong 489 case 10: // pong
442 return; 490 break;
443 491
444 case 8: // close 492 case 8: // close
445 default: 493 default:
446 destroy (); 494 destroy ();
447 return; 495 return;
448 } 496 }
449
450 amount = l;
451 } 497 }
452 else
453 amount = -1;
454 }
455 else
456 amount = read (fd, inbuf + inbuf_len, amount);
457
458 if (!amount)
459 {
460 destroy ();
461 return;
462 }
463 else if (amount < 0)
464 {
465 if (errno != EAGAIN && errno != EINTR)
466 {
467 LOG (llevError, "read error: %s\n", strerror (errno));
468 destroy ();
469 return;
470 }
471
472 // should not be here, normally
473 } 498 }
474 else 499 else
475 { 500 {
476 inbuf_len += amount; 501 inbuf_len += amount;
477 inbuf_handle (); 502 inbuf_handle ();
… …
554 if (!sl.length ()) 579 if (!sl.length ())
555 return; 580 return;
556 581
557 if (ws_version == 8) 582 if (ws_version == 8)
558 { 583 {
559 uint8 hdr [4] = { 0x81, 126, sl.length () >> 8, sl.length () }; 584 static uint8 buf [MAXSOCKBUF * 2 + 4];
560 // TODO: utf-8 encoding 585
561 send (hdr, 4); 586 uint8 *b = buf + 4;
562 send (sl.buf_ + sl.hdrlen, sl.cur - sl.buf_ - sl.hdrlen); 587 for (uint8 *a = sl.buf_ + sl.hdrlen; a < sl.cur; ++a)
588 {
589 if (*a < 0x80)
590 *b++ = *a;
591 else
592 {
593 *b++ = 0xc0 | ((*a >> 6) & 0x1f);
594 *b++ = 0x80 | ( *a & 0x3f);
595 }
596 }
597
598 assert (b - buf < sizeof (buf));
599
600 int len = b - (buf + 4);
601
602 if (len < 126)
603 {
604 buf [2] = 0x81;
605 buf [3] = len;
606
607 send (buf + 2, len + 2);
608 }
609 else
610 {
611 buf [0] = 0x81;
612 buf [1] = 126;
613 buf [2] = len >> 8;
614 buf [3] = len;
615
616 send (buf, len + 4);
617 }
563 } 618 }
564 else if (ws_version == 13) 619 else if (ws_version == 13)
565 { 620 {
621 int len = sl.length ();
622
623 if (len < 126)
624 {
625 uint8 hdr [] = { 0x82, len };
626 send (hdr, sizeof (hdr));
627 }
628 else
629 {
566 uint8 hdr [4] = { 0x82, 126, sl.length () >> 8, sl.length () }; 630 uint8 hdr [] = { 0x82, 126, len >> 8, len };
567 send (hdr, 4); 631 send (hdr, sizeof (hdr));
632 }
633
568 send (sl.buf_ + sl.hdrlen, sl.cur - sl.buf_ - sl.hdrlen); 634 send (sl.buf_ + sl.hdrlen, len);
569 } 635 }
570 else 636 else
571 { 637 {
572 assert (sl.hdrlen == 2); 638 assert (sl.hdrlen == 2);
573 639
… …
581void 647void
582client::send_packet (const char *buf, int len) 648client::send_packet (const char *buf, int len)
583{ 649{
584 packet sl; 650 packet sl;
585 651
586 sl << data (buf, len); 652 sl << data_n (buf, len);
587 send_packet (sl); 653 send_packet (sl);
588} 654}
589 655
590void 656void
591client::send_packet (const char *buf) 657client::send_packet (const char *buf)
… …
623 cfperl_send_msg (this, color, type, msg); 689 cfperl_send_msg (this, color, type, msg);
624 else 690 else
625 send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg); 691 send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg);
626} 692}
627 693
628void
629client::send_drawinfo (const char *msg, int flags)
630{
631 send_msg (flags, "log", msg);
632}
633
634/*********************************************************************** 694/***********************************************************************
635 * 695 *
636 * packet functions/utilities 696 * packet functions/utilities
637 * 697 *
638 **********************************************************************/ 698 **********************************************************************/
… …
659 { 719 {
660 val >>= 7; 720 val >>= 7;
661 *--p = (val & 0x7F) | 0x80; 721 *--p = (val & 0x7F) | 0x80;
662 } 722 }
663 723
664 return *this << data (p, buf + maxlen - p); 724 return *this << data_n (p, buf + maxlen - p);
665} 725}
666 726
667packet &packet::operator <<(const data &v) 727packet &packet::operator <<(const data_n &v)
668{ 728{
669 if (room () < v.len) 729 if (room () < v.len)
670 reset (); 730 reset ();
671 else 731 else
672 { 732 {
… …
681} 741}
682 742
683packet &packet::operator <<(const data8 &v) 743packet &packet::operator <<(const data8 &v)
684{ 744{
685 unsigned int len = min (v.len, 0x00FF); 745 unsigned int len = min (v.len, 0x00FF);
686 return *this << uint8 (len) << data (v.ptr, len); 746 return *this << uint8 (len) << data_n (v.ptr, len);
687} 747}
688 748
689packet &packet::operator <<(const data16 &v) 749packet &packet::operator <<(const data16 &v)
690{ 750{
691 unsigned int len = min (v.len, 0xFFFF); 751 unsigned int len = min (v.len, 0xFFFF);
692 return *this << uint16 (len) << data (v.ptr, len); 752 return *this << uint16 (len) << data_n (v.ptr, len);
693} 753}
694 754
695packet &packet::operator <<(const char *v) 755packet &packet::operator <<(const char *v)
696{ 756{
697 return *this << data (v, strlen (v ? v : 0)); 757 return *this << data_n (v, v ? strlen (v) : 0);
698} 758}
699 759
700void 760void
701packet::vprintf (const char *format, va_list ap) 761packet::vprintf (const char *format, va_list ap)
702{ 762{

Diff Legend

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