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.73 by root, Tue Nov 3 23:44:21 2009 UTC vs.
Revision 1.89 by root, Tue Nov 6 21:50:36 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 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
… …
53 // write a nop to the socket at least every IDLE_NOP seconds. 53 // write a nop to the socket at least every IDLE_NOP 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 }
… …
156 ****************************************************************************/ 156 ****************************************************************************/
157 157
158// SocketCommand, PlayingCommand, should not exist with those ugly casts 158// SocketCommand, PlayingCommand, should not exist with those ugly casts
159#define SC(cb) (void *)static_cast<void (*)(char *, int, client *)>(cb), 159#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 | 160#define PC(cb) (void *)static_cast<void (*)(char *, int, player *)>(cb), PF_PLAYER |
161
162static void
163NopCmd (char *, int, client *)
164{
165 // do nothing
166}
161 167
162/** 168/**
163 * Dispatch table for the server. 169 * Dispatch table for the server.
164 */ 170 */
165static struct packet_type packets[] = { 171static struct packet_type packets[] = {
… …
171 {"apply", PC(ApplyCmd) PF_PLAYING }, 177 {"apply", PC(ApplyCmd) PF_PLAYING },
172 {"lookat", PC(LookAt) PF_PLAYING }, 178 {"lookat", PC(LookAt) PF_PLAYING },
173 {"lock", PC(LockItem) PF_PLAYING }, 179 {"lock", PC(LockItem) PF_PLAYING },
174 {"mark", PC(MarkItem) PF_PLAYING }, 180 {"mark", PC(MarkItem) PF_PLAYING },
175 {"move", PC(MoveCmd) PF_PLAYING }, 181 {"move", PC(MoveCmd) PF_PLAYING },
176 {"ext", PC(ExtCmd) 0 }, // CF+ 182 {"ext", PC(ExtCmd) 0 }, // CF+/Deliantra
177 {"mapredraw", PC(MapRedrawCmd) 0 }, 183 {"mapredraw", PC(MapRedrawCmd) 0 },
178 {"mapinfo", PC(MapInfoCmd) 0 }, // CF+ 184 {"mapinfo", PC(MapInfoCmd) 0 }, // CF+/Deliantra
179 185
180 {"reply", SC(ReplyCmd) 0 }, 186 {"reply", SC(ReplyCmd) 0 },
181 {"exti", SC(ExtiCmd) 0 }, // CF+ 187 {"exti", SC(ExtiCmd) 0 }, // CF+/Deliantra
182 {"addme", SC(AddMeCmd) 0 }, 188 {"addme", SC(AddMeCmd) 0 },
183 {"askface", SC(AskFaceCmd) 0 }, 189 {"askface", SC(AskFaceCmd) 0 },
184 {"requestinfo", SC(RequestInfo) 0 }, 190 {"requestinfo", SC(RequestInfo) 0 },
185 {"setsound", SC(SetSound) 0 }, 191 {"setsound", SC(SetSound) 0 },
186 {"setup", SC(SetUp) 0 }, 192 {"setup", SC(SetUp) 0 },
187 {"version", SC(VersionCmd) 0 }, 193 {"version", SC(VersionCmd) 0 },
188 {"toggleextendedtext", SC(ToggleExtendedText) 0 }, /*Added: tchize */ 194
195 {"toggleextendedtext", SC(NopCmd) 0 }, // deliantra: disabled
189}; 196};
190 197
191bool 198bool
192client::may_execute (const packet_type *pkt) const 199client::may_execute (const packet_type *pkt) const
193{ 200{
194 return (!(pkt->flags & PF_PLAYER) || pl) 201 return (!(pkt->flags & PF_PLAYER) || pl)
195 && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING); 202 && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING);
196} 203}
197 204
198// HACK: some commands currently should be executed 205// HACK: some commands currently should be executed
199// even when the player is frozen. this hack detects 206// even when the player is frozen. this hack detects
200// those commands. it should be folded into may_execute, 207// those commands. it should be folded into may_execute,
201// but kept seperate to emphasise the hack aspect, i.e. 208// but kept seperate to emphasise the hack aspect, i.e.
202// do it better, then remove. 209// do it better, then remove.
203static bool 210static bool
… …
231{ 238{
232 if (may_execute (pkt) || always_immediate (this, pkt, data, datalen)) 239 if (may_execute (pkt) || always_immediate (this, pkt, data, datalen))
233 { 240 {
234 //TODO: only one format 241 //TODO: only one format
235 if (pkt->flags & PF_PLAYER) 242 if (pkt->flags & PF_PLAYER)
243 {
236 ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl); 244 ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl);
245 pl->need_updated_stats ();
246 }
237 else 247 else
238 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this); 248 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this);
239 } 249 }
240 else 250 else
241 send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED | NDI_REPLY, pkt->name); 251 send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED | NDI_REPLY, pkt->name);
… …
276 { 286 {
277 data = (char *)inbuf + 2; // better read garbage than segfault 287 data = (char *)inbuf + 2; // better read garbage than segfault
278 datalen = 0; 288 datalen = 0;
279 } 289 }
280 290
281 for (packet_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt) 291 for (packet_type *pkt = packets; pkt < packets + array_length (packets); ++pkt)
282 if (!strcmp ((char *)inbuf + 2, pkt->name)) 292 if (!strcmp ((char *)inbuf + 2, pkt->name))
283 { 293 {
284 if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen)) 294 if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen))
285 queue_command (pkt, data, datalen); 295 queue_command (pkt, data, datalen);
286 else 296 else
… …
300 socket_ev.poll (socket_ev.poll () | EV_READ); 310 socket_ev.poll (socket_ev.poll () | EV_READ);
301 311
302 return true; 312 return true;
303} 313}
304 314
315void
316client::inbuf_handle ()
317{
318 if (!handle_packet ())
319 return;
320
321 while (handle_packet ())
322 ;
323
324 flush ();
325}
326
305// callback called when socket is either readable or writable 327// callback called when socket is either readable or writable
306void 328void
307client::socket_cb (iow &w, int revents) 329client::socket_cb (iow &w, int revents)
308{ 330{
309 //TODO remove when we have better socket cleanup logic 331 //TODO remove when we have better socket cleanup logic
… …
328 int amount = sizeof (inbuf) - inbuf_len; 350 int amount = sizeof (inbuf) - inbuf_len;
329 351
330 if (!amount) 352 if (!amount)
331 { 353 {
332 // input buffer full 354 // input buffer full
333 socket_ev.poll (socket_ev.poll () & ~EV_READ); 355 LOG (llevError, "input buffer overflow.");
356 destroy ();
334 return; 357 return;
335 } 358 }
336 359
360 if (ws_version)
361 {
362 if (ws_inbuf_len + 2048 > ws_inbuf_alloc)
363 ws_inbuf = (uint8 *)realloc (ws_inbuf, ws_inbuf_alloc += 4096);
364
365 int len = read (fd, ws_inbuf + ws_inbuf_len, ws_inbuf_alloc - ws_inbuf_len);
366
367 if (len > 0)
368 {
369 ws_inbuf_len += len;
370
371 if (ws_inbuf_len < 2 + 4) // 6 is minimum length: op, len, mask
372 return;
373
374 int d = 2;
375 int o = ws_inbuf [0] & 15;
376 int l = ws_inbuf [1] & 127;
377
378 if (l == 126)
379 {
380 l = (ws_inbuf [2] << 8) | ws_inbuf [3];
381 d += 2;
382 }
383 else if (l == 127)
384 {
385 if (ws_inbuf_len < 2 + 8)
386 return;
387
388 // we don't do extra long frames, if a browser wants to send >2**32 bytes,
389 // there are bigger issues to fix.
390 l = (ws_inbuf [6] << 24)
391 | (ws_inbuf [7] << 16)
392 | (ws_inbuf [8] << 8)
393 | ws_inbuf [9];
394 d += 8;
395 }
396
397 // we only continue if we have a complete frame
398 if (ws_inbuf_len < d + 4 + l)
399 return;
400
401 switch (o)
402 {
403 case 0: o = ws_inbuf_type; break; // continuation
404 case 1: ws_inbuf_type = 1; break; // utf-8
405 case 2: ws_inbuf_type = 2; break; // binary
406 }
407
408 if (l > amount)
409 {
410 // input buffer full
411 LOG (llevError, "input buffer overflow (ws).");
412 destroy ();
413 return;
414 }
415
416 for (int i = 0; i < l; ++i)
417 inbuf [inbuf_len + i] = ws_inbuf [d + 4 + i] ^ ws_inbuf [d + (i & 3)];
418
419 // remove frame
420 ws_inbuf_len -= d + 4 + l;
421 memmove (ws_inbuf, ws_inbuf + d + 4 + l, ws_inbuf_len);
422
423 switch (o)
424 {
425 case 1: // utf-8
426 {
427 uint8 *a = inbuf + inbuf_len;
428 uint8 *b = a;
429 uint8 *c = a + l;
430
431 for (; a < c; ++a, ++b)
432 {
433 *b = *a;
434
435 if (*a >= 0x80)
436 *b = (a [0] & 0x1f) << 6 | (a [1] & 0x3f), ++a;
437 }
438
439 l -= a - b;
440 }
441 break;
442 case 2: // binary
443 break;
444
445 case 9: // ping
446 {
447 // send pong - we assume ping messages are <64k
448 // as we can't handle >10k at the moment anyway.
449 uint8 hdr [] = { 0x8a, 126, l >> 8, l };
450 send (hdr, sizeof (hdr));
451 send (inbuf + inbuf_len, l);
452 }
453 return;
454
455 case 10: // pong
456 return;
457
458 case 8: // close
459 default:
460 destroy ();
461 return;
462 }
463
464 amount = l;
465 }
466 else
467 amount = -1;
468 }
469 else
337 amount = read (fd, inbuf + inbuf_len, amount); 470 amount = read (fd, inbuf + inbuf_len, amount);
338 471
339 if (!amount) 472 if (!amount)
340 { 473 {
341 destroy (); 474 destroy ();
342 return; 475 return;
… …
353 // should not be here, normally 486 // should not be here, normally
354 } 487 }
355 else 488 else
356 { 489 {
357 inbuf_len += amount; 490 inbuf_len += amount;
358 491 inbuf_handle ();
359 if (handle_packet ())
360 {
361 while (handle_packet ())
362 ;
363
364 flush ();
365 }
366 } 492 }
367 } 493 }
368} 494}
369 495
370/******************************************************************************* 496/*******************************************************************************
… …
440 } 566 }
441 567
442 if (!sl.length ()) 568 if (!sl.length ())
443 return; 569 return;
444 570
571 if (ws_version == 8)
572 {
573 static uint8 buf [MAXSOCKBUF * 2 + 4];
574
575 uint8 *b = buf + 4;
576 for (uint8 *a = sl.buf_ + sl.hdrlen; a < sl.cur; ++a)
577 {
578 if (*a < 0x80)
579 *b++ = *a;
580 else
581 {
582 *b++ = 0xc0 | ((*a >> 6) & 0x1f);
583 *b++ = 0x80 | ( *a & 0x3f);
584 }
585 }
586
587 assert (b - buf < sizeof (buf));
588
589 int l = b - (buf + 4);
590
591 if (l < 126)
592 {
593 buf [2] = 0x81;
594 buf [3] = l;
595
596 send (buf + 2, l + 2);
597 }
598 else
599 {
600 buf [0] = 0x81;
601 buf [1] = 126;
602 buf [2] = l >> 8;
603 buf [3] = l;
604
605 send (buf, l + 4);
606 }
607 }
608 else if (ws_version == 13)
609 {
610 int l = sl.length ();
611
612 if (l < 126)
613 {
614 uint8 hdr [] = { 0x82, l };
615 send (hdr, sizeof (hdr));
616 }
617 else
618 {
619 uint8 hdr [] = { 0x82, 126, l >> 8, l };
620 send (hdr, sizeof (hdr));
621 }
622
623 send (sl.buf_ + sl.hdrlen, l);
624 }
625 else
626 {
445 assert (sl.hdrlen == 2); 627 assert (sl.hdrlen == 2);
446 628
447 sl.buf_ [0] = sl.length () >> 8; 629 sl.buf_ [0] = sl.length () >> 8;
448 sl.buf_ [1] = sl.length () ; 630 sl.buf_ [1] = sl.length () ;
449 631
450 send (sl.buf_, sl.length () + sl.hdrlen); 632 send (sl.buf_, sl.length () + sl.hdrlen);
633 }
451} 634}
452 635
453void 636void
454client::send_packet (const char *buf, int len) 637client::send_packet (const char *buf, int len)
455{ 638{
… …
518 *cur++ = ' '; 701 *cur++ = ' ';
519} 702}
520 703
521packet &packet::operator <<(const ber32 v) 704packet &packet::operator <<(const ber32 v)
522{ 705{
523 enum { maxlen = 32 / 7 + 1}; 706 enum { maxlen = 32 / 7 + 1 };
524 uint8 buf[maxlen]; 707 uint8 buf[maxlen];
525 uint8 *p = buf + maxlen; 708 uint8 *p = buf + maxlen;
526 uint32 val = v.val; 709 uint32 val = v.val;
527 710
528 *--p = val & 0x7F; 711 *--p = val & 0x7F;

Diff Legend

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