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.92 by root, Thu Nov 15 04:50:50 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.
… …
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 |
199 161
162static void
163NopCmd (char *, int, client *)
164{
165 // do nothing
166}
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[] = {
204 {"ncom", PC(NewPlayerCmd) PF_PLAYING | PF_COMMAND6 },
205 {"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND0 }, 172 {"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND },
206 173
207 {"examine", PC(ExamineCmd) PF_PLAYING }, 174 {"examine", PC(ExamineCmd) PF_PLAYING },
208 {"ex", PC(ExCmd) PF_PLAYING }, 175 {"ex", PC(ExCmd) PF_PLAYING },
209 {"apply", PC(ApplyCmd) PF_PLAYING }, 176 {"apply", PC(ApplyCmd) PF_PLAYING },
210 {"lookat", PC(LookAt) PF_PLAYING }, 177 {"lookat", PC(LookAt) PF_PLAYING },
211 {"lock", PC(LockItem) PF_PLAYING }, 178 {"lock", PC(LockItem) PF_PLAYING },
212 {"mark", PC(MarkItem) PF_PLAYING }, 179 {"mark", PC(MarkItem) PF_PLAYING },
213 {"move", PC(MoveCmd) PF_PLAYING }, 180 {"move", PC(MoveCmd) PF_PLAYING },
214 {"ext", PC(ExtCmd) 0 }, // CF+ 181 {"ext", PC(ExtCmd) 0 }, // CF+/Deliantra
215 {"mapredraw", PC(MapRedrawCmd) 0 }, 182 {"mapredraw", PC(MapRedrawCmd) 0 },
216 {"mapinfo", PC(MapInfoCmd) 0 }, // CF+ 183 {"mapinfo", PC(MapInfoCmd) 0 }, // CF+/Deliantra
217 184
218 {"reply", SC(ReplyCmd) 0 }, 185 {"reply", SC(ReplyCmd) 0 },
219 {"exti", SC(ExtiCmd) 0 }, // CF+ 186 {"exti", SC(ExtiCmd) 0 }, // CF+/Deliantra
220 {"addme", SC(AddMeCmd) 0 }, 187 {"addme", SC(AddMeCmd) 0 },
221 {"askface", SC(AskFaceCmd) 0 }, 188 {"askface", SC(AskFaceCmd) 0 },
222 {"requestinfo", SC(RequestInfo) 0 }, 189 {"requestinfo", SC(RequestInfo) 0 },
223 {"setfacemode", SC(SetFaceMode) 0 },
224 {"setsound", SC(SetSound) 0 }, 190 {"setsound", SC(SetSound) 0 },
225 {"setup", SC(SetUp) 0 }, 191 {"setup", SC(SetUp) 0 },
226 {"version", SC(VersionCmd) 0 }, 192 {"version", SC(VersionCmd) 0 },
227 {"toggleextendedinfos", SC(ToggleExtendedInfos) 0 }, /*Added: tchize */ 193
228 {"toggleextendedtext", SC(ToggleExtendedText) 0 }, /*Added: tchize */ 194 {"toggleextendedtext", SC(NopCmd) 0 }, // deliantra: disabled
229 {"asksmooth", SC(AskSmooth) 0 }, /*Added: tchize (smoothing technologies) */
230}; 195};
231 196
232bool 197bool
233client::may_execute (const packet_type *pkt) const 198client::may_execute (const packet_type *pkt) const
234{ 199{
235 return (!(pkt->flags & PF_PLAYER) || pl) 200 return (!(pkt->flags & PF_PLAYER) || pl)
236 && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING); 201 && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING);
237} 202}
238 203
239// HACK: some commands currently should be executed 204// HACK: some commands currently should be executed
240// even when the player is frozen. this hack detects 205// even when the player is frozen. this hack detects
241// those commands. it should be folded into may_execute, 206// those commands. it should be folded into may_execute,
242// but kept seperate to emphasise the hack aspect, i.e. 207// but kept seperate to emphasise the hack aspect, i.e.
243// do it better, then remove. 208// do it better, then remove.
244static bool 209static bool
245always_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)
246{ 211{
247 if (!(pkt->flags & (PF_COMMAND0 | PF_COMMAND6))) 212 if (!(pkt->flags & PF_COMMAND))
248 return false; 213 return false;
249 214
250 if (!ns->pl || !ns->pl->ob || !ns->pl->ob->map) 215 if (!ns->pl || !ns->pl->ob || !ns->pl->ob->map)
251 return false; 216 return false;
252 217
253 if (pkt->flags & PF_COMMAND6) 218 if (len > 4 && data [ 3] == ' ' && !strncmp (data, "say " , 4)) return true;
254 { 219 if (len > 5 && data [ 4] == ' ' && !strncmp (data, "chat " , 5)) return true;
255 data += 6; 220 if (len > 6 && data [ 5] == ' ' && !strncmp (data, "shout " , 6)) return true;
256 len -= 6; 221 if (len > 8 && data [ 7] == ' ' && !strncmp (data, "suicide " , 8)) return true;
257 } 222 if (len > 18 && data [17] == ' ' && !strncmp (data, "accept-invitation ", 18)) return true;
258 223
259 if (len > 4 && !strncmp (data, "say " , 4)) 224 if (len == 7 && !strcmp (data, "suicide")) return true;
260 return true;
261 if (len > 5 && !strncmp (data, "chat ", 5))
262 return true;
263 225
264 return false; 226 return false;
265} 227}
266 228
267void 229void
… …
269{ 231{
270 if (may_execute (pkt) || always_immediate (this, pkt, data, datalen)) 232 if (may_execute (pkt) || always_immediate (this, pkt, data, datalen))
271 { 233 {
272 //TODO: only one format 234 //TODO: only one format
273 if (pkt->flags & PF_PLAYER) 235 if (pkt->flags & PF_PLAYER)
236 {
274 ((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 }
275 else 240 else
276 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this); 241 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this);
277 } 242 }
278 else 243 else
279 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);
… …
292 pl && pl->ob ? &pl->ob->name : "[anonymous]"); 257 pl && pl->ob ? &pl->ob->name : "[anonymous]");
293 destroy (); 258 destroy ();
294 return false; 259 return false;
295 } 260 }
296 261
262 uint8_t save_byte = inbuf [pkt_len]; // rather ugly
297 inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */ 263 inbuf [pkt_len] = 0; /* temporarily terminate buffer - useful for string data */
298 264
299 /* First, break out beginning word. There are at least 265 /* First, break out beginning word. There are at least
300 * a few commands that do not have any paremeters. If 266 * a few commands that do not have any paremeters. If
301 * we get such a command, don't worry about trying 267 * we get such a command, don't worry about trying
302 * to break it up. 268 * to break it up.
… …
313 { 279 {
314 data = (char *)inbuf + 2; // better read garbage than segfault 280 data = (char *)inbuf + 2; // better read garbage than segfault
315 datalen = 0; 281 datalen = 0;
316 } 282 }
317 283
318 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)
319 if (!strcmp ((char *)inbuf + 2, pkt->name)) 285 if (!strcmp ((char *)inbuf + 2, pkt->name))
320 { 286 {
321 if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen)) 287 if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen))
322 queue_command (pkt, data, datalen); 288 queue_command (pkt, data, datalen);
323 else 289 else
… …
326 goto next_packet; 292 goto next_packet;
327 } 293 }
328 294
329 // If we get here, we didn't find a valid command. 295 // 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); 296 send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED | NDI_REPLY, (char *)inbuf + 2);
297
331next_packet: 298next_packet:
299 inbuf [pkt_len] = save_byte; // rather ugly
332 skip_packet (pkt_len); 300 skip_packet (pkt_len);
333 301
334 // input buffer has space again 302 // input buffer has space again
335 socket_ev.poll (socket_ev.poll () | PE_R); 303 socket_ev.poll (socket_ev.poll () | EV_READ);
336 304
337 return true; 305 return true;
338} 306}
339 307
308void
309client::inbuf_handle ()
310{
311 if (!handle_packet ())
312 return;
313
314 while (handle_packet ())
315 ;
316
317 flush ();
318}
319
340// callback called when socket is either readable or writable 320// callback called when socket is either readable or writable
341void 321void
342client::socket_cb (iow &w, int got) 322client::socket_cb (iow &w, int revents)
343{ 323{
344 //TODO remove when we have better socket cleanup logic 324 //TODO remove when we have better socket cleanup logic
345 if (destroyed ()) 325 if (destroyed ())
346 { 326 {
347 socket_ev.poll (0); 327 socket_ev.poll (0);
348 return; 328 return;
349 } 329 }
350 330
351 if (got & PE_W) 331 if (revents & EV_WRITE)
352 { 332 {
353 write_outputbuffer (); 333 write_outputbuffer ();
354 334
355 if (!outputbuffer.len) 335 if (!outputbuffer.len)
356 socket_ev.poll (socket_ev.poll () & ~PE_W); 336 socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
357 }
358
359 if (got & PE_R)
360 { 337 }
361 //TODO: rate-limit tcp connection in better ways, important
362 338
339 if (revents & EV_READ)
340 {
341 int amount;
342 uint8 *rbuf;
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;
363 int amount = sizeof (inbuf) - inbuf_len; 355 amount = sizeof (inbuf) - inbuf_len;
356 }
364 357
365 if (!amount) 358 if (!amount)
366 { 359 {
367 // input buffer full 360 // input buffer full
368 socket_ev.poll (socket_ev.poll () & ~PE_R); 361 LOG (llevError, "input buffer overflow.");
362 destroy ();
369 return; 363 return;
370 } 364 }
371 365
372 amount = read (fd, inbuf + inbuf_len, amount); 366 amount = read (fd, rbuf, amount);
373 367
374 if (!amount) 368 if (!amount)
375 { 369 {
376 destroy (); 370 destroy ();
377 return; 371 return;
… …
385 return; 379 return;
386 } 380 }
387 381
388 // should not be here, normally 382 // should not be here, normally
389 } 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 }
390 else 498 else
391 { 499 {
392 inbuf_len += amount; 500 inbuf_len += amount;
393 501 inbuf_handle ();
394 cmd_ev.start ();
395 } 502 }
396 } 503 }
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} 504}
408 505
409/******************************************************************************* 506/*******************************************************************************
410 * 507 *
411 * Start of write related routines. 508 * Start of write related routines.
… …
467client::send_packet (packet &sl) 564client::send_packet (packet &sl)
468{ 565{
469 if (destroyed ()) 566 if (destroyed ())
470 return; 567 return;
471 568
472 if (sl.length () >= MAXSOCKBUF) 569 if (sl.length () > MAXSOCKBUF)
473 { 570 {
474 LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ()); 571 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 572 /* Almost certainly we've overflowed a buffer, so quit now to make
476 * it easier to debug. 573 * it easier to debug.
477 */ 574 */
… …
479 } 576 }
480 577
481 if (!sl.length ()) 578 if (!sl.length ())
482 return; 579 return;
483 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 {
484 assert (sl.hdrlen == 2); 637 assert (sl.hdrlen == 2);
485 638
486 sl.buf_ [0] = sl.length () >> 8; 639 sl.buf_ [0] = sl.length () >> 8;
487 sl.buf_ [1] = sl.length () ; 640 sl.buf_ [1] = sl.length () ;
488 641
489 send (sl.buf_, sl.length () + sl.hdrlen); 642 send (sl.buf_, sl.length () + sl.hdrlen);
643 }
490} 644}
491 645
492void 646void
493client::send_packet (const char *buf, int len) 647client::send_packet (const char *buf, int len)
494{ 648{
… …
515 va_end (ap); 669 va_end (ap);
516 670
517 send_packet (sl); 671 send_packet (sl);
518} 672}
519 673
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 674void
528client::send_msg (int color, const char *type, const char *msg) 675client::send_msg (int color, const char *type, const char *msg)
529{ 676{
677 if (!msg || !type) // it can happen (for example, missing attack messages cause this)
678 {
679 LOG (logBacktrace | llevError, "send_msg(%d,%p,%p) called with NULL msg or type.\n", color, type, msg);
680 return;
681 }
682
683 int len = strlen (msg);
684
685 if (!(color & NDI_VERBATIM)
530 if (msg_is_special (msg)) 686 && (msg_is_special (msg)
687 || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128)))
531 cfperl_send_msg (this, color, type, msg); 688 cfperl_send_msg (this, color, type, msg);
532 else if (can_msg) 689 else
533 send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg); 690 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} 691}
539 692
540void 693void
541client::send_drawinfo (const char *msg, int flags) 694client::send_drawinfo (const char *msg, int flags)
542{ 695{
… …
558 *cur++ = ' '; 711 *cur++ = ' ';
559} 712}
560 713
561packet &packet::operator <<(const ber32 v) 714packet &packet::operator <<(const ber32 v)
562{ 715{
563 enum { maxlen = 32 / 7 + 1}; 716 enum { maxlen = 32 / 7 + 1 };
564 uint8 buf[maxlen]; 717 uint8 buf[maxlen];
565 uint8 *p = buf + maxlen; 718 uint8 *p = buf + maxlen;
566 uint32 val = v.val; 719 uint32 val = v.val;
567 720
568 *--p = val & 0x7F; 721 *--p = val & 0x7F;

Diff Legend

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