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.54 by root, Sun Jul 29 02:24:34 2007 UTC vs.
Revision 1.91 by root, Thu Nov 8 02:50:14 2012 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 * Crossfire TRT 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 <crossfire@schmorp.de> 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
25#include <global.h> 25#include <global.h>
… …
31# include <sys/socket.h> 31# include <sys/socket.h>
32# include <netinet/in.h> 32# include <netinet/in.h>
33# include <netinet/tcp.h> 33# include <netinet/tcp.h>
34#endif 34#endif
35 35
36// disconnect a socket after this many seconds without an ack
37#define SOCKET_TIMEOUT 8.
38
39// force a packet when idle for more than this many seconds, 36// force a packet when idle for more than this many seconds,
40// forcing an ack regularly. 37// forcing an ack regularly.
41#define IDLE_PING 2. 38#define IDLE_PING 2.
42 39
43void 40void
44client::flush () 41client::flush ()
45{ 42{
46 if (destroyed ()) 43 if (destroyed ())
47 return; 44 return;
48
49#if HAVE_TCP_INFO
50 // check time of last ack, and, if too old, kill connection
51 socklen_t len = sizeof (tcpi);
52
53 if (!getsockopt (fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi))
54 {
55 if (tcpi.tcpi_snd_mss)
56 mss = tcpi.tcpi_snd_mss;
57
58#if 0
59 fprintf (stderr, "uack %d ack %d lost %d ret %d fack %d sst %d cwnd %d mss %d pmtu %d advmss %d EXC %d\n",
60 tcpi.tcpi_unacked,
61 tcpi.tcpi_sacked,
62 tcpi.tcpi_lost,
63 tcpi.tcpi_retrans,
64 tcpi.tcpi_fackets,
65 tcpi.tcpi_snd_ssthresh, tcpi.tcpi_snd_cwnd, tcpi.tcpi_advmss, tcpi.tcpi_pmtu, tcpi.tcpi_advmss,
66
67 tcpi.tcpi_snd_cwnd - (tcpi.tcpi_unacked - tcpi.tcpi_sacked));
68#endif
69
70 // do this only when player is active
71 if (pl && pl->active
72 && tcpi.tcpi_last_ack_recv > int (SOCKET_TIMEOUT * 1000))
73 {
74 send_msg (NDI_RED | NDI_REPLY, "connection-timeout", "safety disconnect due to tcp/ip timeout (no packets received)");
75 write_outputbuffer ();
76
77 LOG (llevDebug, "connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd,
78 (unsigned)tcpi.tcpi_last_ack_recv, (unsigned)tcpi.tcpi_last_data_sent, (unsigned)tcpi.tcpi_unacked);
79 destroy ();
80 }
81 }
82#endif
83 45
84 /** 46 /**
85 * Writes data to socket. 47 * Writes data to socket.
86 * 48 *
87 * 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
88 * is called to write it out. 50 * is called to write it out.
89 */ 51 */
90 52
91 // 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.
92 if (!outputbuffer.len) 54 if (!outputbuffer.len)
93 { 55 {
94 if (last_send + IDLE_PING <= NOW && pl && pl->active) 56 if (last_send + IDLE_PING <= NOW && pl && pl->active)
95 { 57 {
96 // 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
97 // nop'able commands and they are quite small. 59 // nop'able command and it is quite small.
98 packet sl (mapmode == Map1Cmd ? "map1" : "map1a"); 60 packet sl ("map1a");
99 send_packet (sl); 61 send_packet (sl);
100 } 62 }
101 else 63 else
102 return; 64 return;
103 } 65 }
104 66
105 if (socket_ev.poll () & PE_W) 67 if (socket_ev.poll () & EV_WRITE)
106 return; 68 return;
107 69
108 last_send = NOW; 70 last_send = NOW;
109 write_outputbuffer (); 71 write_outputbuffer ();
110} 72}
… …
137 // just retry 99 // just retry
138 } 100 }
139 else if (errno == EAGAIN) 101 else if (errno == EAGAIN)
140 { 102 {
141 // delay till ready 103 // delay till ready
142 socket_ev.poll (socket_ev.poll () | PE_W); 104 socket_ev.poll (socket_ev.poll () | EV_WRITE);
143 socket_ev.start (); 105 socket_ev.start ();
144 return; 106 return;
145 } 107 }
146 else 108 else
147 { 109 {
… …
149 destroy (); 111 destroy ();
150 return; 112 return;
151 } 113 }
152 } 114 }
153 115
154 socket_ev.poll (socket_ev.poll () & ~PE_W); 116 socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
155} 117}
156 118
157/****************************************************************************** 119/******************************************************************************
158 * 120 *
159 * Start of read routines. 121 * Start of read routines.
… …
194 ****************************************************************************/ 156 ****************************************************************************/
195 157
196// SocketCommand, PlayingCommand, should not exist with those ugly casts 158// SocketCommand, PlayingCommand, should not exist with those ugly casts
197#define SC(cb) (void *)static_cast<void (*)(char *, int, client *)>(cb), 159#define SC(cb) (void *)static_cast<void (*)(char *, int, client *)>(cb),
198#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}
199 167
200/** 168/**
201 * Dispatch table for the server. 169 * Dispatch table for the server.
202 */ 170 */
203static struct packet_type packets[] = { 171static struct packet_type packets[] = {
… …
209 {"apply", PC(ApplyCmd) PF_PLAYING }, 177 {"apply", PC(ApplyCmd) PF_PLAYING },
210 {"lookat", PC(LookAt) PF_PLAYING }, 178 {"lookat", PC(LookAt) PF_PLAYING },
211 {"lock", PC(LockItem) PF_PLAYING }, 179 {"lock", PC(LockItem) PF_PLAYING },
212 {"mark", PC(MarkItem) PF_PLAYING }, 180 {"mark", PC(MarkItem) PF_PLAYING },
213 {"move", PC(MoveCmd) PF_PLAYING }, 181 {"move", PC(MoveCmd) PF_PLAYING },
214 {"ext", PC(ExtCmd) 0 }, // CF+ 182 {"ext", PC(ExtCmd) 0 }, // CF+/Deliantra
215 {"mapredraw", PC(MapRedrawCmd) 0 }, 183 {"mapredraw", PC(MapRedrawCmd) 0 },
216 {"mapinfo", PC(MapInfoCmd) 0 }, // CF+ 184 {"mapinfo", PC(MapInfoCmd) 0 }, // CF+/Deliantra
217 185
218 {"reply", SC(ReplyCmd) 0 }, 186 {"reply", SC(ReplyCmd) 0 },
219 {"exti", SC(ExtiCmd) 0 }, // CF+ 187 {"exti", SC(ExtiCmd) 0 }, // CF+/Deliantra
220 {"addme", SC(AddMeCmd) 0 }, 188 {"addme", SC(AddMeCmd) 0 },
221 {"askface", SC(AskFaceCmd) 0 }, 189 {"askface", SC(AskFaceCmd) 0 },
222 {"requestinfo", SC(RequestInfo) 0 }, 190 {"requestinfo", SC(RequestInfo) 0 },
223 {"setfacemode", SC(SetFaceMode) 0 },
224 {"setsound", SC(SetSound) 0 }, 191 {"setsound", SC(SetSound) 0 },
225 {"setup", SC(SetUp) 0 }, 192 {"setup", SC(SetUp) 0 },
226 {"version", SC(VersionCmd) 0 }, 193 {"version", SC(VersionCmd) 0 },
227 {"toggleextendedinfos", SC(ToggleExtendedInfos) 0 }, /*Added: tchize */ 194
228 {"toggleextendedtext", SC(ToggleExtendedText) 0 }, /*Added: tchize */ 195 {"toggleextendedtext", SC(NopCmd) 0 }, // deliantra: disabled
229 {"asksmooth", SC(AskSmooth) 0 }, /*Added: tchize (smoothing technologies) */
230}; 196};
231 197
232bool 198bool
233client::may_execute (const packet_type *pkt) const 199client::may_execute (const packet_type *pkt) const
234{ 200{
235 return (!(pkt->flags & PF_PLAYER) || pl) 201 return (!(pkt->flags & PF_PLAYER) || pl)
236 && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING); 202 && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING);
237} 203}
238 204
239// HACK: some commands currently should be executed 205// HACK: some commands currently should be executed
240// even when the player is frozen. this hack detects 206// even when the player is frozen. this hack detects
241// those commands. it should be folded into may_execute, 207// those commands. it should be folded into may_execute,
242// but kept seperate to emphasise the hack aspect, i.e. 208// but kept seperate to emphasise the hack aspect, i.e.
243// do it better, then remove. 209// do it better, then remove.
244static bool 210static bool
… …
254 { 220 {
255 data += 6; 221 data += 6;
256 len -= 6; 222 len -= 6;
257 } 223 }
258 224
259 if (len > 4 && !strncmp (data, "say " , 4)) 225 if (len > 4 && data [ 3] == ' ' && !strncmp (data, "say " , 4)) return true;
260 return true; 226 if (len > 5 && data [ 4] == ' ' && !strncmp (data, "chat " , 5)) return true;
261 if (len > 5 && !strncmp (data, "chat ", 5)) 227 if (len > 6 && data [ 5] == ' ' && !strncmp (data, "shout " , 6)) return true;
262 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;
230
231 if (len == 7 && !strcmp (data, "suicide")) return true;
263 232
264 return false; 233 return false;
265} 234}
266 235
267void 236void
… …
269{ 238{
270 if (may_execute (pkt) || always_immediate (this, pkt, data, datalen)) 239 if (may_execute (pkt) || always_immediate (this, pkt, data, datalen))
271 { 240 {
272 //TODO: only one format 241 //TODO: only one format
273 if (pkt->flags & PF_PLAYER) 242 if (pkt->flags & PF_PLAYER)
243 {
274 ((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 }
275 else 247 else
276 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this); 248 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this);
277 } 249 }
278 else 250 else
279 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);
… …
292 pl && pl->ob ? &pl->ob->name : "[anonymous]"); 264 pl && pl->ob ? &pl->ob->name : "[anonymous]");
293 destroy (); 265 destroy ();
294 return false; 266 return false;
295 } 267 }
296 268
269 uint8_t save_byte = inbuf [pkt_len]; // rather ugly
297 inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */ 270 inbuf [pkt_len] = 0; /* temporarily terminate buffer - useful for string data */
298 271
299 /* First, break out beginning word. There are at least 272 /* First, break out beginning word. There are at least
300 * a few commands that do not have any paremeters. If 273 * a few commands that do not have any paremeters. If
301 * we get such a command, don't worry about trying 274 * we get such a command, don't worry about trying
302 * to break it up. 275 * to break it up.
… …
313 { 286 {
314 data = (char *)inbuf + 2; // better read garbage than segfault 287 data = (char *)inbuf + 2; // better read garbage than segfault
315 datalen = 0; 288 datalen = 0;
316 } 289 }
317 290
318 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)
319 if (!strcmp ((char *)inbuf + 2, pkt->name)) 292 if (!strcmp ((char *)inbuf + 2, pkt->name))
320 { 293 {
321 if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen)) 294 if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen))
322 queue_command (pkt, data, datalen); 295 queue_command (pkt, data, datalen);
323 else 296 else
… …
326 goto next_packet; 299 goto next_packet;
327 } 300 }
328 301
329 // If we get here, we didn't find a valid command. 302 // If we get here, we didn't find a valid command.
330 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
331next_packet: 305next_packet:
306 inbuf [pkt_len] = save_byte; // rather ugly
332 skip_packet (pkt_len); 307 skip_packet (pkt_len);
333 308
334 // input buffer has space again 309 // input buffer has space again
335 socket_ev.poll (socket_ev.poll () | PE_R); 310 socket_ev.poll (socket_ev.poll () | EV_READ);
336 311
337 return true; 312 return true;
338} 313}
339 314
315void
316client::inbuf_handle ()
317{
318 if (!handle_packet ())
319 return;
320
321 while (handle_packet ())
322 ;
323
324 flush ();
325}
326
340// callback called when socket is either readable or writable 327// callback called when socket is either readable or writable
341void 328void
342client::socket_cb (iow &w, int got) 329client::socket_cb (iow &w, int revents)
343{ 330{
344 //TODO remove when we have better socket cleanup logic 331 //TODO remove when we have better socket cleanup logic
345 if (destroyed ()) 332 if (destroyed ())
346 { 333 {
347 socket_ev.poll (0); 334 socket_ev.poll (0);
348 return; 335 return;
349 } 336 }
350 337
351 if (got & PE_W) 338 if (revents & EV_WRITE)
352 { 339 {
353 write_outputbuffer (); 340 write_outputbuffer ();
354 341
355 if (!outputbuffer.len) 342 if (!outputbuffer.len)
356 socket_ev.poll (socket_ev.poll () & ~PE_W); 343 socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
357 }
358
359 if (got & PE_R)
360 { 344 }
361 //TODO: rate-limit tcp connection in better ways, important
362 345
346 if (revents & EV_READ)
347 {
348 int amount;
349 uint8 *rbuf;
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;
363 int amount = sizeof (inbuf) - inbuf_len; 362 amount = sizeof (inbuf) - inbuf_len;
363 }
364 364
365 if (!amount) 365 if (!amount)
366 { 366 {
367 // input buffer full 367 // input buffer full
368 socket_ev.poll (socket_ev.poll () & ~PE_R); 368 LOG (llevError, "input buffer overflow.");
369 destroy ();
369 return; 370 return;
370 } 371 }
371 372
372 amount = read (fd, inbuf + inbuf_len, amount); 373 amount = read (fd, rbuf, amount);
373 374
374 if (!amount) 375 if (!amount)
375 { 376 {
376 destroy (); 377 destroy ();
377 return; 378 return;
… …
385 return; 386 return;
386 } 387 }
387 388
388 // should not be here, normally 389 // should not be here, normally
389 } 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 }
390 else 505 else
391 { 506 {
392 inbuf_len += amount; 507 inbuf_len += amount;
393 508 inbuf_handle ();
394 cmd_ev.start ();
395 } 509 }
396 } 510 }
397}
398
399// called whenever we have additional commands to process
400void
401client::cmd_cb (iw &w)
402{
403 if (handle_packet ())
404 w.start ();
405 else
406 flush ();
407} 511}
408 512
409/******************************************************************************* 513/*******************************************************************************
410 * 514 *
411 * Start of write related routines. 515 * Start of write related routines.
… …
467client::send_packet (packet &sl) 571client::send_packet (packet &sl)
468{ 572{
469 if (destroyed ()) 573 if (destroyed ())
470 return; 574 return;
471 575
472 if (sl.length () >= MAXSOCKBUF) 576 if (sl.length () > MAXSOCKBUF)
473 { 577 {
474 LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ()); 578 LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ());
475 /* Almost certainly we've overflowed a buffer, so quit now to make 579 /* Almost certainly we've overflowed a buffer, so quit now to make
476 * it easier to debug. 580 * it easier to debug.
477 */ 581 */
… …
479 } 583 }
480 584
481 if (!sl.length ()) 585 if (!sl.length ())
482 return; 586 return;
483 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 {
484 assert (sl.hdrlen == 2); 644 assert (sl.hdrlen == 2);
485 645
486 sl.buf_ [0] = sl.length () >> 8; 646 sl.buf_ [0] = sl.length () >> 8;
487 sl.buf_ [1] = sl.length () ; 647 sl.buf_ [1] = sl.length () ;
488 648
489 send (sl.buf_, sl.length () + sl.hdrlen); 649 send (sl.buf_, sl.length () + sl.hdrlen);
650 }
490} 651}
491 652
492void 653void
493client::send_packet (const char *buf, int len) 654client::send_packet (const char *buf, int len)
494{ 655{
… …
515 va_end (ap); 676 va_end (ap);
516 677
517 send_packet (sl); 678 send_packet (sl);
518} 679}
519 680
520// returns true when the message needs special (read: perl) treatment
521static bool
522msg_is_special (const char *msg)
523{
524 return msg [strcspn (msg, "<[&\n")];
525}
526
527void 681void
528client::send_msg (int color, const char *type, const char *msg) 682client::send_msg (int color, const char *type, const char *msg)
529{ 683{
684 if (!msg || !type) // it can happen (for example, missing attack messages cause this)
685 {
686 LOG (logBacktrace | llevError, "send_msg(%d,%p,%p) called with NULL msg or type.\n", color, type, msg);
687 return;
688 }
689
690 int len = strlen (msg);
691
692 if (!(color & NDI_VERBATIM)
530 if (msg_is_special (msg)) 693 && (msg_is_special (msg)
694 || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128)))
531 cfperl_send_msg (this, color, type, msg); 695 cfperl_send_msg (this, color, type, msg);
532 else if (can_msg) 696 else
533 send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg); 697 send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg);
534 else if (color < 0)
535 return; // client cannot handle this
536 else
537 send_packet_printf ("drawinfo %d %s", color & NDI_COLOR_MASK, msg);
538} 698}
539 699
540void 700void
541client::send_drawinfo (const char *msg, int flags) 701client::send_drawinfo (const char *msg, int flags)
542{ 702{
… …
558 *cur++ = ' '; 718 *cur++ = ' ';
559} 719}
560 720
561packet &packet::operator <<(const ber32 v) 721packet &packet::operator <<(const ber32 v)
562{ 722{
563 enum { maxlen = 32 / 7 + 1}; 723 enum { maxlen = 32 / 7 + 1 };
564 uint8 buf[maxlen]; 724 uint8 buf[maxlen];
565 uint8 *p = buf + maxlen; 725 uint8 *p = buf + maxlen;
566 uint32 val = v.val; 726 uint32 val = v.val;
567 727
568 *--p = val & 0x7F; 728 *--p = val & 0x7F;

Diff Legend

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