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.72 by root, Tue Oct 13 18:20:08 2009 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 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 it under 6 * Deliantra is free software: you can redistribute it and/or modify it under
8 * 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
9 * 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
10 * 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 Affero GNU General Public License 16 * You should have received a copy of the Affero GNU General Public License
18 * 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
19 * <http://www.gnu.org/licenses/>. 18 * <http://www.gnu.org/licenses/>.
20 * 19 *
21 * 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>
22 */ 21 */
23 22
24using namespace std; 23using namespace std;
25 24
… …
49 * 48 *
50 * 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
51 * is called to write it out. 50 * is called to write it out.
52 */ 51 */
53 52
54 // 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.
55 if (!outputbuffer.len) 54 if (!outputbuffer.len)
56 { 55 {
57 if (last_send + IDLE_PING <= NOW && pl && pl->active) 56 if (last_send + IDLE_PING <= NOW && pl && pl->active)
58 { 57 {
59 // 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
60 // nop'able commands and they are quite small. 59 // nop'able command and it is quite small.
61 packet sl (mapmode == Map1Cmd ? "map1" : "map1a"); 60 packet sl ("map1a");
62 send_packet (sl); 61 send_packet (sl);
63 } 62 }
64 else 63 else
65 return; 64 return;
66 } 65 }
… …
133 if (inbuf_len >= 2 + pkt_len) 132 if (inbuf_len >= 2 + pkt_len)
134 return 2 + pkt_len; 133 return 2 + pkt_len;
135 134
136 if (inbuf_len == sizeof (inbuf)) 135 if (inbuf_len == sizeof (inbuf))
137 { 136 {
138 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);
139 destroy (); 138 destroy ();
140 return -1; 139 return -1;
141 } 140 }
142 } 141 }
143 142
… …
158 157
159// SocketCommand, PlayingCommand, should not exist with those ugly casts 158// SocketCommand, PlayingCommand, should not exist with those ugly casts
160#define SC(cb) (void *)static_cast<void (*)(char *, int, client *)>(cb), 159#define SC(cb) (void *)static_cast<void (*)(char *, int, client *)>(cb),
161#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 |
162 161
162static void
163NopCmd (char *, int, client *)
164{
165 // do nothing
166}
167
163/** 168/**
164 * Dispatch table for the server. 169 * Dispatch table for the server.
165 */ 170 */
166static struct packet_type packets[] = { 171static struct packet_type packets[] = {
167 {"ncom", PC(NewPlayerCmd) PF_PLAYING | PF_COMMAND6 },
168 {"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND0 }, 172 {"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND },
169 173
170 {"examine", PC(ExamineCmd) PF_PLAYING }, 174 {"examine", PC(ExamineCmd) PF_PLAYING },
171 {"ex", PC(ExCmd) PF_PLAYING }, 175 {"ex", PC(ExCmd) PF_PLAYING },
172 {"apply", PC(ApplyCmd) PF_PLAYING }, 176 {"apply", PC(ApplyCmd) PF_PLAYING },
173 {"lookat", PC(LookAt) PF_PLAYING }, 177 {"lookat", PC(LookAt) PF_PLAYING },
174 {"lock", PC(LockItem) PF_PLAYING }, 178 {"lock", PC(LockItem) PF_PLAYING },
175 {"mark", PC(MarkItem) PF_PLAYING }, 179 {"mark", PC(MarkItem) PF_PLAYING },
176 {"move", PC(MoveCmd) PF_PLAYING }, 180 {"move", PC(MoveCmd) PF_PLAYING },
177 {"ext", PC(ExtCmd) 0 }, // CF+ 181 {"ext", PC(ExtCmd) 0 }, // CF+/Deliantra
178 {"mapredraw", PC(MapRedrawCmd) 0 }, 182 {"mapredraw", PC(MapRedrawCmd) 0 },
179 {"mapinfo", PC(MapInfoCmd) 0 }, // CF+ 183 {"mapinfo", PC(MapInfoCmd) 0 }, // CF+/Deliantra
180 184
181 {"reply", SC(ReplyCmd) 0 }, 185 {"reply", SC(ReplyCmd) 0 },
182 {"exti", SC(ExtiCmd) 0 }, // CF+ 186 {"exti", SC(ExtiCmd) 0 }, // CF+/Deliantra
183 {"addme", SC(AddMeCmd) 0 }, 187 {"addme", SC(AddMeCmd) 0 },
184 {"askface", SC(AskFaceCmd) 0 }, 188 {"askface", SC(AskFaceCmd) 0 },
185 {"requestinfo", SC(RequestInfo) 0 }, 189 {"requestinfo", SC(RequestInfo) 0 },
186 {"setsound", SC(SetSound) 0 }, 190 {"setsound", SC(SetSound) 0 },
187 {"setup", SC(SetUp) 0 }, 191 {"setup", SC(SetUp) 0 },
188 {"version", SC(VersionCmd) 0 }, 192 {"version", SC(VersionCmd) 0 },
189 {"toggleextendedtext", SC(ToggleExtendedText) 0 }, /*Added: tchize */ 193
194 {"toggleextendedtext", SC(NopCmd) 0 }, // deliantra: disabled
190}; 195};
191 196
192bool 197bool
193client::may_execute (const packet_type *pkt) const 198client::may_execute (const packet_type *pkt) const
194{ 199{
195 return (!(pkt->flags & PF_PLAYER) || pl) 200 return (!(pkt->flags & PF_PLAYER) || pl)
196 && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING); 201 && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING);
197} 202}
198 203
199// HACK: some commands currently should be executed 204// HACK: some commands currently should be executed
200// even when the player is frozen. this hack detects 205// even when the player is frozen. this hack detects
201// those commands. it should be folded into may_execute, 206// those commands. it should be folded into may_execute,
202// but kept seperate to emphasise the hack aspect, i.e. 207// but kept seperate to emphasise the hack aspect, i.e.
203// do it better, then remove. 208// do it better, then remove.
204static bool 209static bool
205always_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)
206{ 211{
207 if (!(pkt->flags & (PF_COMMAND0 | PF_COMMAND6))) 212 if (!(pkt->flags & PF_COMMAND))
208 return false; 213 return false;
209 214
210 if (!ns->pl || !ns->pl->ob || !ns->pl->ob->map) 215 if (!ns->pl || !ns->pl->ob || !ns->pl->ob->map)
211 return false; 216 return false;
212
213 if (pkt->flags & PF_COMMAND6)
214 {
215 data += 6;
216 len -= 6;
217 }
218 217
219 if (len > 4 && data [ 3] == ' ' && !strncmp (data, "say " , 4)) return true; 218 if (len > 4 && data [ 3] == ' ' && !strncmp (data, "say " , 4)) return true;
220 if (len > 5 && data [ 4] == ' ' && !strncmp (data, "chat " , 5)) return true; 219 if (len > 5 && data [ 4] == ' ' && !strncmp (data, "chat " , 5)) return true;
221 if (len > 6 && data [ 5] == ' ' && !strncmp (data, "shout " , 6)) return true; 220 if (len > 6 && data [ 5] == ' ' && !strncmp (data, "shout " , 6)) return true;
222 if (len > 8 && data [ 7] == ' ' && !strncmp (data, "suicide " , 8)) return true; 221 if (len > 8 && data [ 7] == ' ' && !strncmp (data, "suicide " , 8)) return true;
… …
232{ 231{
233 if (may_execute (pkt) || always_immediate (this, pkt, data, datalen)) 232 if (may_execute (pkt) || always_immediate (this, pkt, data, datalen))
234 { 233 {
235 //TODO: only one format 234 //TODO: only one format
236 if (pkt->flags & PF_PLAYER) 235 if (pkt->flags & PF_PLAYER)
236 {
237 ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl); 237 ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl);
238 pl->need_updated_stats ();
239 }
238 else 240 else
239 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this); 241 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this);
240 } 242 }
241 else 243 else
242 send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED | NDI_REPLY, pkt->name); 244 send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED | NDI_REPLY, pkt->name);
… …
277 { 279 {
278 data = (char *)inbuf + 2; // better read garbage than segfault 280 data = (char *)inbuf + 2; // better read garbage than segfault
279 datalen = 0; 281 datalen = 0;
280 } 282 }
281 283
282 for (packet_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt) 284 for (packet_type *pkt = packets; pkt < packets + array_length (packets); ++pkt)
283 if (!strcmp ((char *)inbuf + 2, pkt->name)) 285 if (!strcmp ((char *)inbuf + 2, pkt->name))
284 { 286 {
285 if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen)) 287 if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen))
286 queue_command (pkt, data, datalen); 288 queue_command (pkt, data, datalen);
287 else 289 else
… …
289 291
290 goto next_packet; 292 goto next_packet;
291 } 293 }
292 294
293 // If we get here, we didn't find a valid command. 295 // If we get here, we didn't find a valid command.
294 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);
295 297
296next_packet: 298next_packet:
297 inbuf [pkt_len] = save_byte; // rather ugly 299 inbuf [pkt_len] = save_byte; // rather ugly
298 skip_packet (pkt_len); 300 skip_packet (pkt_len);
299 301
… …
301 socket_ev.poll (socket_ev.poll () | EV_READ); 303 socket_ev.poll (socket_ev.poll () | EV_READ);
302 304
303 return true; 305 return true;
304} 306}
305 307
308void
309client::inbuf_handle ()
310{
311 if (!handle_packet ())
312 return;
313
314 while (handle_packet ())
315 ;
316
317 flush ();
318}
319
306// callback called when socket is either readable or writable 320// callback called when socket is either readable or writable
307void 321void
308client::socket_cb (iow &w, int revents) 322client::socket_cb (iow &w, int revents)
309{ 323{
310 //TODO remove when we have better socket cleanup logic 324 //TODO remove when we have better socket cleanup logic
… …
322 socket_ev.poll (socket_ev.poll () & ~EV_WRITE); 336 socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
323 } 337 }
324 338
325 if (revents & EV_READ) 339 if (revents & EV_READ)
326 { 340 {
327 //TODO: rate-limit tcp connection in better ways, important 341 int amount;
342 uint8 *rbuf;
328 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;
329 int amount = sizeof (inbuf) - inbuf_len; 355 amount = sizeof (inbuf) - inbuf_len;
356 }
330 357
331 if (!amount) 358 if (!amount)
332 { 359 {
333 // input buffer full 360 // input buffer full
334 socket_ev.poll (socket_ev.poll () & ~EV_READ); 361 LOG (llevError, "input buffer overflow.");
362 destroy ();
335 return; 363 return;
336 } 364 }
337 365
338 amount = read (fd, inbuf + inbuf_len, amount); 366 amount = read (fd, rbuf, amount);
339 367
340 if (!amount) 368 if (!amount)
341 { 369 {
342 destroy (); 370 destroy ();
343 return; 371 return;
… …
351 return; 379 return;
352 } 380 }
353 381
354 // should not be here, normally 382 // should not be here, normally
355 } 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 }
356 else 498 else
357 { 499 {
358 inbuf_len += amount; 500 inbuf_len += amount;
359 501 inbuf_handle ();
360 if (handle_packet ())
361 {
362 while (handle_packet ())
363 ;
364
365 flush ();
366 }
367 } 502 }
368 } 503 }
369} 504}
370 505
371/******************************************************************************* 506/*******************************************************************************
… …
441 } 576 }
442 577
443 if (!sl.length ()) 578 if (!sl.length ())
444 return; 579 return;
445 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 {
446 assert (sl.hdrlen == 2); 637 assert (sl.hdrlen == 2);
447 638
448 sl.buf_ [0] = sl.length () >> 8; 639 sl.buf_ [0] = sl.length () >> 8;
449 sl.buf_ [1] = sl.length () ; 640 sl.buf_ [1] = sl.length () ;
450 641
451 send (sl.buf_, sl.length () + sl.hdrlen); 642 send (sl.buf_, sl.length () + sl.hdrlen);
643 }
452} 644}
453 645
454void 646void
455client::send_packet (const char *buf, int len) 647client::send_packet (const char *buf, int len)
456{ 648{
… …
519 *cur++ = ' '; 711 *cur++ = ' ';
520} 712}
521 713
522packet &packet::operator <<(const ber32 v) 714packet &packet::operator <<(const ber32 v)
523{ 715{
524 enum { maxlen = 32 / 7 + 1}; 716 enum { maxlen = 32 / 7 + 1 };
525 uint8 buf[maxlen]; 717 uint8 buf[maxlen];
526 uint8 *p = buf + maxlen; 718 uint8 *p = buf + maxlen;
527 uint32 val = v.val; 719 uint32 val = v.val;
528 720
529 *--p = val & 0x7F; 721 *--p = val & 0x7F;

Diff Legend

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