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.69 by root, Sun Dec 28 06:59:27 2008 UTC vs.
Revision 1.90 by root, Thu Nov 8 02:28:21 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 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 * Copyright (©) 1992,2007 Frank Tore Johansen
6 * 5 *
7 * Deliantra is free software: you can redistribute it and/or modify 6 * Deliantra is free software: you can redistribute it and/or modify it under
8 * it under the terms of the GNU General Public License as published by 7 * the terms of the Affero GNU General Public License as published by the
9 * the Free Software Foundation, either version 3 of the License, or 8 * Free Software Foundation, either version 3 of the License, or (at your
10 * (at your option) any later version. 9 * option) any later version.
11 * 10 *
12 * 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,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details. 14 * GNU General Public License for more details.
16 * 15 *
17 * You should have received a copy of the GNU General Public License 16 * You should have received a copy of the Affero GNU General Public License
18 * along with this program. If not, see <http://www.gnu.org/licenses/>. 17 * and the GNU General Public License along with this program. If not, see
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 }
… …
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
… …
213 { 220 {
214 data += 6; 221 data += 6;
215 len -= 6; 222 len -= 6;
216 } 223 }
217 224
218 if (len > 4 && data [3] == ' ' && !strncmp (data, "say " , 4)) return true; 225 if (len > 4 && data [ 3] == ' ' && !strncmp (data, "say " , 4)) return true;
219 if (len > 5 && data [4] == ' ' && !strncmp (data, "chat " , 5)) return true; 226 if (len > 5 && data [ 4] == ' ' && !strncmp (data, "chat " , 5)) return true;
220 if (len > 6 && data [5] == ' ' && !strncmp (data, "shout ", 6)) return true; 227 if (len > 6 && data [ 5] == ' ' && !strncmp (data, "shout " , 6)) return true;
228 if (len > 8 && data [ 7] == ' ' && !strncmp (data, "suicide " , 8)) return true;
229 if (len > 18 && data [17] == ' ' && !strncmp (data, "accept-invitation ", 18)) return true;
221 230
222 if (len == 7 && !strcmp (data, "suicide")) return true; 231 if (len == 7 && !strcmp (data, "suicide")) return true;
223 232
224 return false; 233 return false;
225} 234}
… …
229{ 238{
230 if (may_execute (pkt) || always_immediate (this, pkt, data, datalen)) 239 if (may_execute (pkt) || always_immediate (this, pkt, data, datalen))
231 { 240 {
232 //TODO: only one format 241 //TODO: only one format
233 if (pkt->flags & PF_PLAYER) 242 if (pkt->flags & PF_PLAYER)
243 {
234 ((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 }
235 else 247 else
236 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this); 248 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this);
237 } 249 }
238 else 250 else
239 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);
… …
252 pl && pl->ob ? &pl->ob->name : "[anonymous]"); 264 pl && pl->ob ? &pl->ob->name : "[anonymous]");
253 destroy (); 265 destroy ();
254 return false; 266 return false;
255 } 267 }
256 268
269 uint8_t save_byte = inbuf [pkt_len]; // rather ugly
257 inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */ 270 inbuf [pkt_len] = 0; /* temporarily terminate buffer - useful for string data */
258 271
259 /* First, break out beginning word. There are at least 272 /* First, break out beginning word. There are at least
260 * a few commands that do not have any paremeters. If 273 * a few commands that do not have any paremeters. If
261 * we get such a command, don't worry about trying 274 * we get such a command, don't worry about trying
262 * to break it up. 275 * to break it up.
… …
273 { 286 {
274 data = (char *)inbuf + 2; // better read garbage than segfault 287 data = (char *)inbuf + 2; // better read garbage than segfault
275 datalen = 0; 288 datalen = 0;
276 } 289 }
277 290
278 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)
279 if (!strcmp ((char *)inbuf + 2, pkt->name)) 292 if (!strcmp ((char *)inbuf + 2, pkt->name))
280 { 293 {
281 if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen)) 294 if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen))
282 queue_command (pkt, data, datalen); 295 queue_command (pkt, data, datalen);
283 else 296 else
… …
286 goto next_packet; 299 goto next_packet;
287 } 300 }
288 301
289 // If we get here, we didn't find a valid command. 302 // If we get here, we didn't find a valid command.
290 send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED | NDI_REPLY, (char *)inbuf + 2); 303 send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED | NDI_REPLY, (char *)inbuf + 2);
304
291next_packet: 305next_packet:
306 inbuf [pkt_len] = save_byte; // rather ugly
292 skip_packet (pkt_len); 307 skip_packet (pkt_len);
293 308
294 // input buffer has space again 309 // input buffer has space again
295 socket_ev.poll (socket_ev.poll () | EV_READ); 310 socket_ev.poll (socket_ev.poll () | EV_READ);
296 311
297 return true; 312 return true;
298} 313}
299 314
315void
316client::inbuf_handle ()
317{
318 if (!handle_packet ())
319 return;
320
321 while (handle_packet ())
322 ;
323
324 flush ();
325}
326
300// callback called when socket is either readable or writable 327// callback called when socket is either readable or writable
301void 328void
302client::socket_cb (iow &w, int revents) 329client::socket_cb (iow &w, int revents)
303{ 330{
304 //TODO remove when we have better socket cleanup logic 331 //TODO remove when we have better socket cleanup logic
… …
316 socket_ev.poll (socket_ev.poll () & ~EV_WRITE); 343 socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
317 } 344 }
318 345
319 if (revents & EV_READ) 346 if (revents & EV_READ)
320 { 347 {
321 //TODO: rate-limit tcp connection in better ways, important 348 int amount;
349 uint8 *rbuf;
322 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;
357 amount = ws_inbuf_alloc - ws_inbuf_len;
358 }
359 else
360 {
361 rbuf = inbuf;
323 int amount = sizeof (inbuf) - inbuf_len; 362 amount = sizeof (inbuf) - inbuf_len;
363 }
324 364
325 if (!amount) 365 if (!amount)
326 { 366 {
327 // input buffer full 367 // input buffer full
328 socket_ev.poll (socket_ev.poll () & ~EV_READ); 368 LOG (llevError, "input buffer overflow.");
369 destroy ();
329 return; 370 return;
330 } 371 }
331 372
332 amount = read (fd, inbuf + inbuf_len, amount); 373 amount = read (fd, ws_inbuf + ws_inbuf_len, amount);
333 374
334 if (!amount) 375 if (!amount)
335 { 376 {
336 destroy (); 377 destroy ();
337 return; 378 return;
… …
345 return; 386 return;
346 } 387 }
347 388
348 // should not be here, normally 389 // should not be here, normally
349 } 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 }
504 }
350 else 505 else
351 { 506 {
352 inbuf_len += amount; 507 inbuf_len += amount;
353 508 inbuf_handle ();
354 if (handle_packet ())
355 {
356 while (handle_packet ())
357 ;
358
359 flush ();
360 }
361 } 509 }
362 } 510 }
363} 511}
364 512
365/******************************************************************************* 513/*******************************************************************************
… …
435 } 583 }
436 584
437 if (!sl.length ()) 585 if (!sl.length ())
438 return; 586 return;
439 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 {
440 assert (sl.hdrlen == 2); 644 assert (sl.hdrlen == 2);
441 645
442 sl.buf_ [0] = sl.length () >> 8; 646 sl.buf_ [0] = sl.length () >> 8;
443 sl.buf_ [1] = sl.length () ; 647 sl.buf_ [1] = sl.length () ;
444 648
445 send (sl.buf_, sl.length () + sl.hdrlen); 649 send (sl.buf_, sl.length () + sl.hdrlen);
650 }
446} 651}
447 652
448void 653void
449client::send_packet (const char *buf, int len) 654client::send_packet (const char *buf, int len)
450{ 655{
… …
513 *cur++ = ' '; 718 *cur++ = ' ';
514} 719}
515 720
516packet &packet::operator <<(const ber32 v) 721packet &packet::operator <<(const ber32 v)
517{ 722{
518 enum { maxlen = 32 / 7 + 1}; 723 enum { maxlen = 32 / 7 + 1 };
519 uint8 buf[maxlen]; 724 uint8 buf[maxlen];
520 uint8 *p = buf + maxlen; 725 uint8 *p = buf + maxlen;
521 uint32 val = v.val; 726 uint32 val = v.val;
522 727
523 *--p = val & 0x7F; 728 *--p = val & 0x7F;

Diff Legend

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