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.48 by root, Sun Jun 24 04:09:29 2007 UTC vs.
Revision 1.90 by root, Thu Nov 8 02:28:21 2012 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 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 it 6 * Deliantra is free software: you can redistribute it and/or modify it under
8 * under the terms of the GNU General Public License as published by the Free 7 * the terms of the Affero GNU General Public License as published by the
9 * Software Foundation; either version 2 of the License, or (at your option) 8 * Free Software Foundation, either version 3 of the License, or (at your
10 * any later version. 9 * option) any later version.
11 * 10 *
12 * This program is distributed in the hope that it will be useful, but 11 * This program is distributed in the hope that it will be useful,
13 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * 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 along 16 * You should have received a copy of the Affero GNU General Public License
18 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 17 * and the GNU General Public License along with this program. If not, see
19 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 18 * <http://www.gnu.org/licenses/>.
20 * 19 *
21 * 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>
22 */ 21 */
23 22
24using namespace std; 23using namespace std;
25 24
26#include <global.h> 25#include <global.h>
… …
32# include <sys/socket.h> 31# include <sys/socket.h>
33# include <netinet/in.h> 32# include <netinet/in.h>
34# include <netinet/tcp.h> 33# include <netinet/tcp.h>
35#endif 34#endif
36 35
37// disconnect a socket after this many seconds without an ack
38#define SOCKET_TIMEOUT 8.
39
40// force a packet when idle for more than this many seconds, 36// force a packet when idle for more than this many seconds,
41// forcing an ack regularly. 37// forcing an ack regularly.
42#define IDLE_PING 2. 38#define IDLE_PING 2.
43 39
44void 40void
45client::flush () 41client::flush ()
46{ 42{
47 if (destroyed ()) 43 if (destroyed ())
48 return; 44 return;
49
50#if HAVE_TCP_INFO
51 // check about once per second, spread evenly over all clients
52 // do this only when player is active
53 if (!((pticks + fd) & 7) && pl && pl->active)
54 {
55 // check time of last ack, and, if too old, kill connection
56 struct tcp_info tcpi;
57 socklen_t len = sizeof (tcpi);
58
59 if (!getsockopt (fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi))
60 {
61 if (tcpi.tcpi_snd_mss)
62 mss = tcpi.tcpi_snd_mss;
63
64 rtt = tcpi.tcpi_rtt;
65 rttvar = tcpi.tcpi_rttvar;
66
67 if (tcpi.tcpi_last_ack_recv > int (SOCKET_TIMEOUT * 1000))
68 {
69 send_msg (NDI_RED, "connection-timeout", "safety disconnect due to tcp/ip timeout (no packets received)");
70 write_outputbuffer ();
71
72 LOG (llevDebug, "connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd,
73 (unsigned)tcpi.tcpi_last_ack_recv, (unsigned)tcpi.tcpi_last_data_sent, (unsigned)tcpi.tcpi_unacked);
74 destroy ();
75 }
76 }
77 }
78#endif
79 45
80 /** 46 /**
81 * Writes data to socket. 47 * Writes data to socket.
82 * 48 *
83 * 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
84 * is called to write it out. 50 * is called to write it out.
85 */ 51 */
86 52
87 // 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.
88 if (!outputbuffer.len) 54 if (!outputbuffer.len)
89 { 55 {
90 if (last_send + IDLE_PING <= NOW && pl && pl->active) 56 if (last_send + IDLE_PING <= NOW && pl && pl->active)
91 { 57 {
92 // 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
93 // nop'able commands and they are quite small. 59 // nop'able command and it is quite small.
94 packet sl (mapmode == Map1Cmd ? "map1" : "map1a"); 60 packet sl ("map1a");
95 send_packet (sl); 61 send_packet (sl);
96 } 62 }
97 else 63 else
98 return; 64 return;
99 } 65 }
100 66
101 if (socket_ev.poll () & PE_W) 67 if (socket_ev.poll () & EV_WRITE)
102 return; 68 return;
103 69
104 last_send = NOW; 70 last_send = NOW;
105 write_outputbuffer (); 71 write_outputbuffer ();
106} 72}
… …
133 // just retry 99 // just retry
134 } 100 }
135 else if (errno == EAGAIN) 101 else if (errno == EAGAIN)
136 { 102 {
137 // delay till ready 103 // delay till ready
138 socket_ev.poll (socket_ev.poll () | PE_W); 104 socket_ev.poll (socket_ev.poll () | EV_WRITE);
139 socket_ev.start (); 105 socket_ev.start ();
140 return; 106 return;
141 } 107 }
142 else 108 else
143 { 109 {
… …
145 destroy (); 111 destroy ();
146 return; 112 return;
147 } 113 }
148 } 114 }
149 115
150 socket_ev.poll (socket_ev.poll () & ~PE_W); 116 socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
151} 117}
152 118
153/****************************************************************************** 119/******************************************************************************
154 * 120 *
155 * Start of read routines. 121 * Start of read routines.
… …
166 if (inbuf_len >= 2 + pkt_len) 132 if (inbuf_len >= 2 + pkt_len)
167 return 2 + pkt_len; 133 return 2 + pkt_len;
168 134
169 if (inbuf_len == sizeof (inbuf)) 135 if (inbuf_len == sizeof (inbuf))
170 { 136 {
171 send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED); 137 send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED | NDI_REPLY);
172 destroy (); 138 destroy ();
173 return -1; 139 return -1;
174 } 140 }
175 } 141 }
176 142
… …
190 ****************************************************************************/ 156 ****************************************************************************/
191 157
192// SocketCommand, PlayingCommand, should not exist with those ugly casts 158// SocketCommand, PlayingCommand, should not exist with those ugly casts
193#define SC(cb) (void *)static_cast<void (*)(char *, int, client *)>(cb), 159#define SC(cb) (void *)static_cast<void (*)(char *, int, client *)>(cb),
194#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}
195 167
196/** 168/**
197 * Dispatch table for the server. 169 * Dispatch table for the server.
198 */ 170 */
199static struct packet_type packets[] = { 171static struct packet_type packets[] = {
… …
205 {"apply", PC(ApplyCmd) PF_PLAYING }, 177 {"apply", PC(ApplyCmd) PF_PLAYING },
206 {"lookat", PC(LookAt) PF_PLAYING }, 178 {"lookat", PC(LookAt) PF_PLAYING },
207 {"lock", PC(LockItem) PF_PLAYING }, 179 {"lock", PC(LockItem) PF_PLAYING },
208 {"mark", PC(MarkItem) PF_PLAYING }, 180 {"mark", PC(MarkItem) PF_PLAYING },
209 {"move", PC(MoveCmd) PF_PLAYING }, 181 {"move", PC(MoveCmd) PF_PLAYING },
210 {"ext", PC(ExtCmd) 0 }, // CF+ 182 {"ext", PC(ExtCmd) 0 }, // CF+/Deliantra
211 {"mapredraw", PC(MapRedrawCmd) 0 }, 183 {"mapredraw", PC(MapRedrawCmd) 0 },
212 {"mapinfo", PC(MapInfoCmd) 0 }, // CF+ 184 {"mapinfo", PC(MapInfoCmd) 0 }, // CF+/Deliantra
213 185
214 {"reply", SC(ReplyCmd) 0 }, 186 {"reply", SC(ReplyCmd) 0 },
215 {"exti", SC(ExtiCmd) 0 }, // CF+ 187 {"exti", SC(ExtiCmd) 0 }, // CF+/Deliantra
216 {"addme", SC(AddMeCmd) 0 }, 188 {"addme", SC(AddMeCmd) 0 },
217 {"askface", SC(AskFaceCmd) 0 }, 189 {"askface", SC(AskFaceCmd) 0 },
218 {"requestinfo", SC(RequestInfo) 0 }, 190 {"requestinfo", SC(RequestInfo) 0 },
219 {"setfacemode", SC(SetFaceMode) 0 },
220 {"setsound", SC(SetSound) 0 }, 191 {"setsound", SC(SetSound) 0 },
221 {"setup", SC(SetUp) 0 }, 192 {"setup", SC(SetUp) 0 },
222 {"version", SC(VersionCmd) 0 }, 193 {"version", SC(VersionCmd) 0 },
223 {"toggleextendedinfos", SC(ToggleExtendedInfos) 0 }, /*Added: tchize */ 194
224 {"toggleextendedtext", SC(ToggleExtendedText) 0 }, /*Added: tchize */ 195 {"toggleextendedtext", SC(NopCmd) 0 }, // deliantra: disabled
225 {"asksmooth", SC(AskSmooth) 0 }, /*Added: tchize (smoothing technologies) */
226}; 196};
227 197
228bool 198bool
229client::may_execute (const packet_type *pkt) const 199client::may_execute (const packet_type *pkt) const
230{ 200{
231 return (!(pkt->flags & PF_PLAYER) || pl) 201 return (!(pkt->flags & PF_PLAYER) || pl)
232 && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING); 202 && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING);
233} 203}
234 204
235// HACK: some commands currently should be executed 205// HACK: some commands currently should be executed
236// even when the player is frozen. this hack detects 206// even when the player is frozen. this hack detects
237// those commands. it should be folded into may_execute, 207// those commands. it should be folded into may_execute,
238// but kept seperate to emphasise the hack aspect, i.e. 208// but kept seperate to emphasise the hack aspect, i.e.
239// do it better, then remove. 209// do it better, then remove.
240static bool 210static bool
… …
250 { 220 {
251 data += 6; 221 data += 6;
252 len -= 6; 222 len -= 6;
253 } 223 }
254 224
255 if (len > 4 && !strncmp (data, "say " , 4)) 225 if (len > 4 && data [ 3] == ' ' && !strncmp (data, "say " , 4)) return true;
256 return true; 226 if (len > 5 && data [ 4] == ' ' && !strncmp (data, "chat " , 5)) return true;
257 if (len > 5 && !strncmp (data, "chat ", 5)) 227 if (len > 6 && data [ 5] == ' ' && !strncmp (data, "shout " , 6)) return true;
258 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;
259 232
260 return false; 233 return false;
261} 234}
262 235
263void 236void
… …
265{ 238{
266 if (may_execute (pkt) || always_immediate (this, pkt, data, datalen)) 239 if (may_execute (pkt) || always_immediate (this, pkt, data, datalen))
267 { 240 {
268 //TODO: only one format 241 //TODO: only one format
269 if (pkt->flags & PF_PLAYER) 242 if (pkt->flags & PF_PLAYER)
243 {
270 ((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 }
271 else 247 else
272 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this); 248 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this);
273 } 249 }
274 else 250 else
275 send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED, pkt->name); 251 send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED | NDI_REPLY, pkt->name);
276} 252}
277 253
278bool 254bool
279client::handle_packet () 255client::handle_packet ()
280{ 256{
… …
288 pl && pl->ob ? &pl->ob->name : "[anonymous]"); 264 pl && pl->ob ? &pl->ob->name : "[anonymous]");
289 destroy (); 265 destroy ();
290 return false; 266 return false;
291 } 267 }
292 268
269 uint8_t save_byte = inbuf [pkt_len]; // rather ugly
293 inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */ 270 inbuf [pkt_len] = 0; /* temporarily terminate buffer - useful for string data */
294 271
295 /* First, break out beginning word. There are at least 272 /* First, break out beginning word. There are at least
296 * a few commands that do not have any paremeters. If 273 * a few commands that do not have any paremeters. If
297 * we get such a command, don't worry about trying 274 * we get such a command, don't worry about trying
298 * to break it up. 275 * to break it up.
… …
309 { 286 {
310 data = (char *)inbuf + 2; // better read garbage than segfault 287 data = (char *)inbuf + 2; // better read garbage than segfault
311 datalen = 0; 288 datalen = 0;
312 } 289 }
313 290
314 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)
315 if (!strcmp ((char *)inbuf + 2, pkt->name)) 292 if (!strcmp ((char *)inbuf + 2, pkt->name))
316 { 293 {
317 if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen)) 294 if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen))
318 queue_command (pkt, data, datalen); 295 queue_command (pkt, data, datalen);
319 else 296 else
… …
321 298
322 goto next_packet; 299 goto next_packet;
323 } 300 }
324 301
325 // If we get here, we didn't find a valid command. 302 // If we get here, we didn't find a valid command.
326 send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED, (char *)inbuf + 2); 303 send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED | NDI_REPLY, (char *)inbuf + 2);
304
327next_packet: 305next_packet:
306 inbuf [pkt_len] = save_byte; // rather ugly
328 skip_packet (pkt_len); 307 skip_packet (pkt_len);
329 308
330 // input buffer has space again 309 // input buffer has space again
331 socket_ev.poll (socket_ev.poll () | PE_R); 310 socket_ev.poll (socket_ev.poll () | EV_READ);
332 311
333 return true; 312 return true;
334} 313}
335 314
315void
316client::inbuf_handle ()
317{
318 if (!handle_packet ())
319 return;
320
321 while (handle_packet ())
322 ;
323
324 flush ();
325}
326
336// callback called when socket is either readable or writable 327// callback called when socket is either readable or writable
337void 328void
338client::socket_cb (iow &w, int got) 329client::socket_cb (iow &w, int revents)
339{ 330{
340 //TODO remove when we have better socket cleanup logic 331 //TODO remove when we have better socket cleanup logic
341 if (destroyed ()) 332 if (destroyed ())
342 { 333 {
343 socket_ev.poll (0); 334 socket_ev.poll (0);
344 return; 335 return;
345 } 336 }
346 337
347 if (got & PE_W) 338 if (revents & EV_WRITE)
348 { 339 {
349 write_outputbuffer (); 340 write_outputbuffer ();
350 341
351 if (!outputbuffer.len) 342 if (!outputbuffer.len)
352 socket_ev.poll (socket_ev.poll () & ~PE_W); 343 socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
353 }
354
355 if (got & PE_R)
356 { 344 }
357 //TODO: rate-limit tcp connection in better ways, important
358 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;
357 amount = ws_inbuf_alloc - ws_inbuf_len;
358 }
359 else
360 {
361 rbuf = inbuf;
359 int amount = sizeof (inbuf) - inbuf_len; 362 amount = sizeof (inbuf) - inbuf_len;
363 }
360 364
361 if (!amount) 365 if (!amount)
362 { 366 {
363 // input buffer full 367 // input buffer full
364 socket_ev.poll (socket_ev.poll () & ~PE_R); 368 LOG (llevError, "input buffer overflow.");
369 destroy ();
365 return; 370 return;
366 } 371 }
367 372
368 amount = read (fd, inbuf + inbuf_len, amount); 373 amount = read (fd, ws_inbuf + ws_inbuf_len, amount);
369 374
370 if (!amount) 375 if (!amount)
371 { 376 {
372 destroy (); 377 destroy ();
373 return; 378 return;
… …
381 return; 386 return;
382 } 387 }
383 388
384 // should not be here, normally 389 // should not be here, normally
385 } 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 }
386 else 505 else
387 { 506 {
388 inbuf_len += amount; 507 inbuf_len += amount;
389 508 inbuf_handle ();
390 cmd_ev.start ();
391 } 509 }
392 } 510 }
393}
394
395// called whenever we have additional commands to process
396void
397client::cmd_cb (iw &w)
398{
399 if (handle_packet ())
400 w.start ();
401 else
402 flush ();
403} 511}
404 512
405/******************************************************************************* 513/*******************************************************************************
406 * 514 *
407 * Start of write related routines. 515 * Start of write related routines.
… …
463client::send_packet (packet &sl) 571client::send_packet (packet &sl)
464{ 572{
465 if (destroyed ()) 573 if (destroyed ())
466 return; 574 return;
467 575
468 if (sl.length () >= MAXSOCKBUF) 576 if (sl.length () > MAXSOCKBUF)
469 { 577 {
470 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 ());
471 /* 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
472 * it easier to debug. 580 * it easier to debug.
473 */ 581 */
… …
475 } 583 }
476 584
477 if (!sl.length ()) 585 if (!sl.length ())
478 return; 586 return;
479 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 {
480 assert (sl.hdrlen == 2); 644 assert (sl.hdrlen == 2);
481 645
482 sl.buf_ [0] = sl.length () >> 8; 646 sl.buf_ [0] = sl.length () >> 8;
483 sl.buf_ [1] = sl.length () ; 647 sl.buf_ [1] = sl.length () ;
484 648
485 send (sl.buf_, sl.length () + sl.hdrlen); 649 send (sl.buf_, sl.length () + sl.hdrlen);
650 }
486} 651}
487 652
488void 653void
489client::send_packet (const char *buf, int len) 654client::send_packet (const char *buf, int len)
490{ 655{
… …
511 va_end (ap); 676 va_end (ap);
512 677
513 send_packet (sl); 678 send_packet (sl);
514} 679}
515 680
516// returns true when the message needs special (read: perl) treatment
517static bool
518msg_is_special (const char *msg)
519{
520 return msg [strcspn (msg, "<[&\n")];
521}
522
523void 681void
524client::send_msg (int color, const char *type, const char *msg) 682client::send_msg (int color, const char *type, const char *msg)
525{ 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)
526 if (msg_is_special (msg)) 693 && (msg_is_special (msg)
694 || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128)))
527 cfperl_send_msg (this, color, type, msg); 695 cfperl_send_msg (this, color, type, msg);
528 else if (can_msg)
529 send_packet_printf ("msg %d %s %s", color, type, msg);
530 else if (color < 0)
531 return; // client cannot handle this
532 else 696 else
533 send_packet_printf ("drawinfo %d %s", color, msg); 697 send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg);
534} 698}
535 699
536void 700void
537client::send_drawinfo (const char *msg, int flags) 701client::send_drawinfo (const char *msg, int flags)
538{ 702{
… …
554 *cur++ = ' '; 718 *cur++ = ' ';
555} 719}
556 720
557packet &packet::operator <<(const ber32 v) 721packet &packet::operator <<(const ber32 v)
558{ 722{
559 enum { maxlen = 32 / 7 + 1}; 723 enum { maxlen = 32 / 7 + 1 };
560 uint8 buf[maxlen]; 724 uint8 buf[maxlen];
561 uint8 *p = buf + maxlen; 725 uint8 *p = buf + maxlen;
562 uint32 val = v.val; 726 uint32 val = v.val;
563 727
564 *--p = val & 0x7F; 728 *--p = val & 0x7F;

Diff Legend

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