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.45 by root, Sun Jun 10 02:51:46 2007 UTC vs.
Revision 1.96 by root, Sun Nov 18 09:39:11 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 if (!((pticks + fd) & 7))
53 {
54 // check time of last ack, and, if too old, kill connection
55 struct tcp_info tcpi;
56 socklen_t len = sizeof (tcpi);
57
58 if (!getsockopt (fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi))
59 {
60 rtt = tcpi.tcpi_rtt;
61 rttvar = tcpi.tcpi_rttvar;
62
63 if (tcpi.tcpi_last_ack_recv > int (SOCKET_TIMEOUT * 1000))
64 {
65 send_msg (NDI_RED, "connection-timeout", "safety disconnect due to tcp/ip timeout (no packets received)");
66 write_outputbuffer ();
67
68 LOG (llevDebug, "connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd,
69 (unsigned)tcpi.tcpi_last_ack_recv, (unsigned)tcpi.tcpi_last_data_sent, (unsigned)tcpi.tcpi_unacked);
70 destroy ();
71 }
72 }
73 }
74#endif
75 45
76 /** 46 /**
77 * Writes data to socket. 47 * Writes data to socket.
78 * 48 *
79 * 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
80 * is called to write it out. 50 * is called to write it out.
81 */ 51 */
82 52
83 // 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.
84 if (!outputbuffer.len) 54 if (!outputbuffer.len)
85 { 55 {
86 if (last_send + IDLE_PING <= NOW) 56 if (last_send + IDLE_PING <= NOW && pl && pl->active)
87 { 57 {
88 // 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
89 // nop'able commands and they are quite small. 59 // nop'able command and it is quite small.
90 packet sl (mapmode == Map1Cmd ? "map1" : "map1a"); 60 packet sl ("map1a");
91 send_packet (sl); 61 send_packet (sl);
92 } 62 }
93 else 63 else
94 return; 64 return;
95 } 65 }
96 66
97 if (socket_ev.poll () & PE_W) 67 if (socket_ev.poll () & EV_WRITE)
98 return; 68 return;
99 69
100 last_send = NOW; 70 last_send = NOW;
101 write_outputbuffer (); 71 write_outputbuffer ();
102} 72}
… …
129 // just retry 99 // just retry
130 } 100 }
131 else if (errno == EAGAIN) 101 else if (errno == EAGAIN)
132 { 102 {
133 // delay till ready 103 // delay till ready
134 socket_ev.poll (socket_ev.poll () | PE_W); 104 socket_ev.poll (socket_ev.poll () | EV_WRITE);
135 socket_ev.start (); 105 socket_ev.start ();
136 return; 106 return;
137 } 107 }
138 else 108 else
139 { 109 {
… …
141 destroy (); 111 destroy ();
142 return; 112 return;
143 } 113 }
144 } 114 }
145 115
146 socket_ev.poll (socket_ev.poll () & ~PE_W); 116 socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
147} 117}
148 118
149/****************************************************************************** 119/******************************************************************************
150 * 120 *
151 * Start of read routines. 121 * Start of read routines.
… …
162 if (inbuf_len >= 2 + pkt_len) 132 if (inbuf_len >= 2 + pkt_len)
163 return 2 + pkt_len; 133 return 2 + pkt_len;
164 134
165 if (inbuf_len == sizeof (inbuf)) 135 if (inbuf_len == sizeof (inbuf))
166 { 136 {
167 send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED); 137 send_packet_printf ("msg %d log input buffer overflow - closing connection.", NDI_RED | NDI_REPLY);
168 destroy (); 138 destroy ();
169 return -1; 139 return -1;
170 } 140 }
171 } 141 }
172 142
… …
187 157
188// SocketCommand, PlayingCommand, should not exist with those ugly casts 158// SocketCommand, PlayingCommand, should not exist with those ugly casts
189#define SC(cb) (void *)static_cast<void (*)(char *, int, client *)>(cb), 159#define SC(cb) (void *)static_cast<void (*)(char *, int, client *)>(cb),
190#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 |
191 161
162static void
163NopCmd (char *, int, client *)
164{
165 // do nothing
166}
167
192/** 168/**
193 * Dispatch table for the server. 169 * Dispatch table for the server.
194 */ 170 */
195static struct packet_type packets[] = { 171static struct packet_type packets[] = {
196 {"ncom", PC(NewPlayerCmd) PF_PLAYING | PF_COMMAND6 },
197 {"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND0 }, 172 {"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND },
198 173
199 {"examine", PC(ExamineCmd) PF_PLAYING }, 174 {"examine", PC(ExamineCmd) PF_PLAYING },
200 {"ex", PC(ExCmd) PF_PLAYING }, 175 {"ex", PC(ExCmd) PF_PLAYING },
201 {"apply", PC(ApplyCmd) PF_PLAYING }, 176 {"apply", PC(ApplyCmd) PF_PLAYING },
202 {"lookat", PC(LookAt) PF_PLAYING }, 177 {"lookat", PC(LookAt) PF_PLAYING },
203 {"lock", PC(LockItem) PF_PLAYING }, 178 {"lock", PC(LockItem) PF_PLAYING },
204 {"mark", PC(MarkItem) PF_PLAYING }, 179 {"mark", PC(MarkItem) PF_PLAYING },
205 {"move", PC(MoveCmd) PF_PLAYING }, 180 {"move", PC(MoveCmd) PF_PLAYING },
206 {"ext", PC(ExtCmd) 0 }, // CF+ 181 {"ext", PC(ExtCmd) 0 }, // CF+/Deliantra
207 {"mapredraw", PC(MapRedrawCmd) 0 }, 182 {"mapredraw", PC(MapRedrawCmd) 0 },
208 {"mapinfo", PC(MapInfoCmd) 0 }, // CF+ 183 {"mapinfo", PC(MapInfoCmd) 0 }, // CF+/Deliantra
209 184
210 {"reply", SC(ReplyCmd) 0 }, 185 {"reply", SC(ReplyCmd) 0 },
211 {"exti", SC(ExtiCmd) 0 }, // CF+ 186 {"exti", SC(ExtiCmd) 0 }, // CF+/Deliantra
212 {"addme", SC(AddMeCmd) 0 }, 187 {"addme", SC(AddMeCmd) 0 },
213 {"askface", SC(AskFaceCmd) 0 }, 188 {"askface", SC(AskFaceCmd) 0 },
214 {"requestinfo", SC(RequestInfo) 0 }, 189 {"requestinfo", SC(RequestInfo) 0 },
215 {"setfacemode", SC(SetFaceMode) 0 },
216 {"setsound", SC(SetSound) 0 }, 190 {"setsound", SC(SetSound) 0 },
217 {"setup", SC(SetUp) 0 }, 191 {"setup", SC(SetUp) 0 },
218 {"version", SC(VersionCmd) 0 }, 192 {"version", SC(VersionCmd) 0 },
219 {"toggleextendedinfos", SC(ToggleExtendedInfos) 0 }, /*Added: tchize */ 193
220 {"toggleextendedtext", SC(ToggleExtendedText) 0 }, /*Added: tchize */ 194 {"toggleextendedtext", SC(NopCmd) 0 }, // deliantra: disabled
221 {"asksmooth", SC(AskSmooth) 0 }, /*Added: tchize (smoothing technologies) */
222}; 195};
223 196
224bool 197bool
225client::may_execute (const packet_type *pkt) const 198client::may_execute (const packet_type *pkt) const
226{ 199{
227 return (!(pkt->flags & PF_PLAYER) || pl) 200 return (!(pkt->flags & PF_PLAYER) || pl)
228 && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING); 201 && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING);
229} 202}
230 203
231// HACK: some commands currently should be executed 204// HACK: some commands currently should be executed
232// even when the player is frozen. this hack detects 205// even when the player is frozen. this hack detects
233// those commands. it should be folded into may_execute, 206// those commands. it should be folded into may_execute,
234// but kept seperate to emphasise the hack aspect, i.e. 207// but kept seperate to emphasise the hack aspect, i.e.
235// do it better, then remove. 208// do it better, then remove.
236static bool 209static bool
237always_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)
238{ 211{
239 if (!(pkt->flags & (PF_COMMAND0 | PF_COMMAND6))) 212 if (!(pkt->flags & PF_COMMAND))
240 return false; 213 return false;
241 214
242 if (!ns->pl || !ns->pl->ob || !ns->pl->ob->map) 215 if (!ns->pl || !ns->pl->ob || !ns->pl->ob->map)
243 return false; 216 return false;
244 217
245 if (pkt->flags & PF_COMMAND6) 218 if (len > 4 && data [ 3] == ' ' && !strncmp (data, "say " , 4)) return true;
246 { 219 if (len > 5 && data [ 4] == ' ' && !strncmp (data, "chat " , 5)) return true;
247 data += 6; 220 if (len > 6 && data [ 5] == ' ' && !strncmp (data, "shout " , 6)) return true;
248 len -= 6; 221 if (len > 8 && data [ 7] == ' ' && !strncmp (data, "suicide " , 8)) return true;
249 } 222 if (len > 18 && data [17] == ' ' && !strncmp (data, "accept-invitation ", 18)) return true;
250 223
251 if (len > 4 && !strncmp (data, "say " , 4)) 224 if (len == 7 && !strcmp (data, "suicide")) return true;
252 return true;
253 if (len > 5 && !strncmp (data, "chat ", 5))
254 return true;
255 225
256 return false; 226 return false;
257} 227}
258 228
259void 229void
… …
261{ 231{
262 if (may_execute (pkt) || always_immediate (this, pkt, data, datalen)) 232 if (may_execute (pkt) || always_immediate (this, pkt, data, datalen))
263 { 233 {
264 //TODO: only one format 234 //TODO: only one format
265 if (pkt->flags & PF_PLAYER) 235 if (pkt->flags & PF_PLAYER)
236 {
266 ((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 }
267 else 240 else
268 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this); 241 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this);
269 } 242 }
270 else 243 else
271 send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED, pkt->name); 244 send_packet_printf ("drawinfo %d log ERROR: you cannot execute '%s' now.", NDI_RED | NDI_REPLY, pkt->name);
272} 245}
273 246
274bool 247bool
275client::handle_packet () 248client::handle_packet ()
276{ 249{
… …
284 pl && pl->ob ? &pl->ob->name : "[anonymous]"); 257 pl && pl->ob ? &pl->ob->name : "[anonymous]");
285 destroy (); 258 destroy ();
286 return false; 259 return false;
287 } 260 }
288 261
262 uint8_t save_byte = inbuf [pkt_len]; // rather ugly
289 inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */ 263 inbuf [pkt_len] = 0; /* temporarily terminate buffer - useful for string data */
290 264
291 /* First, break out beginning word. There are at least 265 /* First, break out beginning word. There are at least
292 * a few commands that do not have any paremeters. If 266 * a few commands that do not have any paremeters. If
293 * we get such a command, don't worry about trying 267 * we get such a command, don't worry about trying
294 * to break it up. 268 * to break it up.
… …
305 { 279 {
306 data = (char *)inbuf + 2; // better read garbage than segfault 280 data = (char *)inbuf + 2; // better read garbage than segfault
307 datalen = 0; 281 datalen = 0;
308 } 282 }
309 283
310 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)
311 if (!strcmp ((char *)inbuf + 2, pkt->name)) 285 if (!strcmp ((char *)inbuf + 2, pkt->name))
312 { 286 {
313 if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen)) 287 if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen))
314 queue_command (pkt, data, datalen); 288 queue_command (pkt, data, datalen);
315 else 289 else
… …
317 291
318 goto next_packet; 292 goto next_packet;
319 } 293 }
320 294
321 // If we get here, we didn't find a valid command. 295 // If we get here, we didn't find a valid command.
322 send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED, (char *)inbuf + 2); 296 send_packet_printf ("msg %d log ERROR: command '%s' not supported.", NDI_RED | NDI_REPLY, (char *)inbuf + 2);
297
323next_packet: 298next_packet:
299 inbuf [pkt_len] = save_byte; // rather ugly
324 skip_packet (pkt_len); 300 skip_packet (pkt_len);
325 301
326 // input buffer has space again 302 // input buffer has space again
327 socket_ev.poll (socket_ev.poll () | PE_R); 303 socket_ev.poll (socket_ev.poll () | EV_READ);
328 304
329 return true; 305 return true;
330} 306}
331 307
308void
309client::inbuf_handle ()
310{
311 if (!handle_packet ())
312 return;
313
314 while (handle_packet ())
315 ;
316
317 flush ();
318}
319
332// callback called when socket is either readable or writable 320// callback called when socket is either readable or writable
333void 321void
334client::socket_cb (iow &w, int got) 322client::socket_cb (iow &w, int revents)
335{ 323{
336 //TODO remove when we have better socket cleanup logic 324 //TODO remove when we have better socket cleanup logic
337 if (destroyed ()) 325 if (destroyed ())
338 { 326 {
339 socket_ev.poll (0); 327 socket_ev.poll (0);
340 return; 328 return;
341 } 329 }
342 330
343 if (got & PE_W) 331 if (revents & EV_WRITE)
344 { 332 {
345 write_outputbuffer (); 333 write_outputbuffer ();
346 334
347 if (!outputbuffer.len) 335 if (!outputbuffer.len)
348 socket_ev.poll (socket_ev.poll () & ~PE_W); 336 socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
349 }
350
351 if (got & PE_R)
352 { 337 }
353 //TODO: rate-limit tcp connection in better ways, important
354 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;
355 int amount = sizeof (inbuf) - inbuf_len; 355 amount = sizeof (inbuf) - inbuf_len;
356 }
356 357
357 if (!amount) 358 if (!amount)
358 { 359 {
359 // input buffer full 360 // input buffer full
360 socket_ev.poll (socket_ev.poll () & ~PE_R); 361 LOG (llevError, "input buffer overflow.");
362 destroy ();
361 return; 363 return;
362 } 364 }
363 365
364 amount = read (fd, inbuf + inbuf_len, amount); 366 amount = read (fd, rbuf, amount);
365 367
366 if (!amount) 368 if (!amount)
367 { 369 {
368 destroy (); 370 destroy ();
369 return; 371 return;
… …
377 return; 379 return;
378 } 380 }
379 381
380 // should not be here, normally 382 // should not be here, normally
381 } 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 }
382 else 498 else
383 { 499 {
384 inbuf_len += amount; 500 inbuf_len += amount;
385 501 inbuf_handle ();
386 cmd_ev.start ();
387 } 502 }
388 } 503 }
389}
390
391// called whenever we have additional commands to process
392void
393client::cmd_cb (iw &w)
394{
395 if (handle_packet ())
396 w.start ();
397 else
398 flush ();
399} 504}
400 505
401/******************************************************************************* 506/*******************************************************************************
402 * 507 *
403 * Start of write related routines. 508 * Start of write related routines.
… …
459client::send_packet (packet &sl) 564client::send_packet (packet &sl)
460{ 565{
461 if (destroyed ()) 566 if (destroyed ())
462 return; 567 return;
463 568
464 if (sl.length () >= MAXSOCKBUF) 569 if (sl.length () > MAXSOCKBUF)
465 { 570 {
466 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 ());
467 /* 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
468 * it easier to debug. 573 * it easier to debug.
469 */ 574 */
… …
471 } 576 }
472 577
473 if (!sl.length ()) 578 if (!sl.length ())
474 return; 579 return;
475 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 {
476 assert (sl.hdrlen == 2); 637 assert (sl.hdrlen == 2);
477 638
478 sl.buf_ [0] = sl.length () >> 8; 639 sl.buf_ [0] = sl.length () >> 8;
479 sl.buf_ [1] = sl.length () ; 640 sl.buf_ [1] = sl.length () ;
480 641
481 send (sl.buf_, sl.length () + sl.hdrlen); 642 send (sl.buf_, sl.length () + sl.hdrlen);
643 }
482} 644}
483 645
484void 646void
485client::send_packet (const char *buf, int len) 647client::send_packet (const char *buf, int len)
486{ 648{
… …
508 670
509 send_packet (sl); 671 send_packet (sl);
510} 672}
511 673
512void 674void
513client::send_drawinfo (const char *msg, int flags)
514{
515 send_packet_printf ("drawinfo %d %s", flags, msg);
516}
517
518void
519client::send_msg (int color, const char *type, const char *msg) 675client::send_msg (int color, const char *type, const char *msg)
520{ 676{
521 if (can_msg) 677 if (!msg || !type) // it can happen (for example, missing attack messages cause this)
522 send_packet_printf ("msg %d %s %s", color, type, msg);
523 else if (color < 0)
524 return; // client cannot handle this
525 else if (strchr (msg, '<') || strchr (msg, '&'))
526 {
527 //TODO: should escape/modify to old syntax
528 send_packet_printf ("drawinfo %d %s", color, msg);
529 } 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)
686 && (msg_is_special (msg)
687 || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128)))
688 cfperl_send_msg (this, color, type, msg);
530 else 689 else
531 send_packet_printf ("drawinfo %d %s", color, msg); 690 send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg);
532} 691}
533 692
534/*********************************************************************** 693/***********************************************************************
535 * 694 *
536 * packet functions/utilities 695 * packet functions/utilities
… …
546 *cur++ = ' '; 705 *cur++ = ' ';
547} 706}
548 707
549packet &packet::operator <<(const ber32 v) 708packet &packet::operator <<(const ber32 v)
550{ 709{
551 enum { maxlen = 32 / 7 + 1}; 710 enum { maxlen = 32 / 7 + 1 };
552 uint8 buf[maxlen]; 711 uint8 buf[maxlen];
553 uint8 *p = buf + maxlen; 712 uint8 *p = buf + maxlen;
554 uint32 val = v.val; 713 uint32 val = v.val;
555 714
556 *--p = val & 0x7F; 715 *--p = val & 0x7F;

Diff Legend

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