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.101 by root, Sat Dec 1 20:22:13 2018 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 (©) 2018 Marc Alexander Lehmann / the Deliantra team
5 * Copyright (©) 1992,2007 Frank Tore Johansen 5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
6 * 6 *
7 * Crossfire TRT is free software; you can redistribute it and/or modify it 7 * 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 8 * 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) 9 * Free Software Foundation, either version 3 of the License, or (at your
10 * any later version. 10 * option) any later version.
11 * 11 *
12 * This program is distributed in the hope that it will be useful, but 12 * This program is distributed in the hope that it will be useful,
13 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * for more details. 15 * GNU General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU General Public License along 17 * 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 18 * and the GNU General Public License along with this program. If not, see
19 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19 * <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24using namespace std; 24using namespace std;
25 25
26#include <global.h> 26#include <global.h>
… …
32# include <sys/socket.h> 32# include <sys/socket.h>
33# include <netinet/in.h> 33# include <netinet/in.h>
34# include <netinet/tcp.h> 34# include <netinet/tcp.h>
35#endif 35#endif
36 36
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, 37// force a packet when idle for more than this many seconds,
41// forcing an ack regularly. 38// forcing an ack regularly.
42#define IDLE_PING 2. 39#define IDLE_PING 2.
43 40
44void 41void
45client::flush () 42client::flush ()
46{ 43{
47 if (destroyed ()) 44 if (destroyed ())
48 return; 45 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 46
76 /** 47 /**
77 * Writes data to socket. 48 * Writes data to socket.
78 * 49 *
79 * When the socket is clear to write, and we have backlogged data, this 50 * When the socket is clear to write, and we have backlogged data, this
80 * is called to write it out. 51 * is called to write it out.
81 */ 52 */
82 53
83 // write a nop to the socket at least every IDLE_NOP seconds. 54 // write a nop to the socket at least every IDLE_PING seconds.
84 if (!outputbuffer.len) 55 if (!outputbuffer.len)
85 { 56 {
86 if (last_send + IDLE_PING <= NOW) 57 if (last_send + IDLE_PING <= NOW && pl && pl->active)
87 { 58 {
88 // this is a bit ugly, but map1/map1a seem to be the only 59 // this is a bit ugly, but map1a seems to be the only
89 // nop'able commands and they are quite small. 60 // nop'able command and it is quite small.
90 packet sl (mapmode == Map1Cmd ? "map1" : "map1a"); 61 packet sl ("map1a");
91 send_packet (sl); 62 send_packet (sl);
92 } 63 }
93 else 64 else
94 return; 65 return;
95 } 66 }
96 67
97 if (socket_ev.poll () & PE_W) 68 if (socket_ev.poll () & EV_WRITE)
98 return; 69 return;
99 70
100 last_send = NOW; 71 last_send = NOW;
101 write_outputbuffer (); 72 write_outputbuffer ();
102} 73}
… …
129 // just retry 100 // just retry
130 } 101 }
131 else if (errno == EAGAIN) 102 else if (errno == EAGAIN)
132 { 103 {
133 // delay till ready 104 // delay till ready
134 socket_ev.poll (socket_ev.poll () | PE_W); 105 socket_ev.poll (socket_ev.poll () | EV_WRITE);
135 socket_ev.start (); 106 socket_ev.start ();
136 return; 107 return;
137 } 108 }
138 else 109 else
139 { 110 {
… …
141 destroy (); 112 destroy ();
142 return; 113 return;
143 } 114 }
144 } 115 }
145 116
146 socket_ev.poll (socket_ev.poll () & ~PE_W); 117 socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
147} 118}
148 119
149/****************************************************************************** 120/******************************************************************************
150 * 121 *
151 * Start of read routines. 122 * Start of read routines.
… …
162 if (inbuf_len >= 2 + pkt_len) 133 if (inbuf_len >= 2 + pkt_len)
163 return 2 + pkt_len; 134 return 2 + pkt_len;
164 135
165 if (inbuf_len == sizeof (inbuf)) 136 if (inbuf_len == sizeof (inbuf))
166 { 137 {
167 send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED); 138 send_packet_printf ("msg %d log input buffer overflow - closing connection.", NDI_RED | NDI_REPLY);
168 destroy (); 139 destroy ();
169 return -1; 140 return -1;
170 } 141 }
171 } 142 }
172 143
… …
180 memmove (inbuf, inbuf + len, inbuf_len); 151 memmove (inbuf, inbuf + len, inbuf_len);
181} 152}
182 153
183/***************************************************************************** 154/*****************************************************************************
184 * Start of command dispatch area. 155 * Start of command dispatch area.
185 * The commands here are protocol commands. 156 * The commands here are protocol commands.
186 ****************************************************************************/ 157 ****************************************************************************/
187 158
188// SocketCommand, PlayingCommand, should not exist with those ugly casts 159// SocketCommand, PlayingCommand, should not exist with those ugly casts
189#define SC(cb) (void *)static_cast<void (*)(char *, int, client *)>(cb), 160#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 | 161#define PC(cb) (void *)static_cast<void (*)(char *, int, player *)>(cb), PF_PLAYER |
162
163static void
164NopCmd (char *, int, client *)
165{
166 // do nothing
167}
191 168
192/** 169/**
193 * Dispatch table for the server. 170 * Dispatch table for the server.
194 */ 171 */
195static struct packet_type packets[] = { 172static struct packet_type packets[] = {
196 {"ncom", PC(NewPlayerCmd) PF_PLAYING | PF_COMMAND6 },
197 {"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND0 }, 173 {"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND },
198 174
199 {"examine", PC(ExamineCmd) PF_PLAYING }, 175 {"examine", PC(ExamineCmd) PF_PLAYING },
200 {"ex", PC(ExCmd) PF_PLAYING }, 176 {"ex", PC(ExCmd) PF_PLAYING },
201 {"apply", PC(ApplyCmd) PF_PLAYING }, 177 {"apply", PC(ApplyCmd) PF_PLAYING },
202 {"lookat", PC(LookAt) PF_PLAYING }, 178 {"lookat", PC(LookAt) PF_PLAYING },
203 {"lock", PC(LockItem) PF_PLAYING }, 179 {"lock", PC(LockItem) PF_PLAYING },
204 {"mark", PC(MarkItem) PF_PLAYING }, 180 {"mark", PC(MarkItem) PF_PLAYING },
205 {"move", PC(MoveCmd) PF_PLAYING }, 181 {"move", PC(MoveCmd) PF_PLAYING },
206 {"ext", PC(ExtCmd) 0 }, // CF+ 182 {"ext", PC(ExtCmd) 0 }, // CF+/Deliantra
207 {"mapredraw", PC(MapRedrawCmd) 0 }, 183 {"mapredraw", PC(MapRedrawCmd) 0 },
208 {"mapinfo", PC(MapInfoCmd) 0 }, // CF+ 184 {"mapinfo", PC(MapInfoCmd) 0 }, // CF+/Deliantra
209 185
210 {"reply", SC(ReplyCmd) 0 }, 186 {"reply", SC(ReplyCmd) 0 },
211 {"exti", SC(ExtiCmd) 0 }, // CF+ 187 {"exti", SC(ExtiCmd) 0 }, // CF+/Deliantra
212 {"addme", SC(AddMeCmd) 0 }, 188 {"addme", SC(AddMeCmd) 0 },
213 {"askface", SC(AskFaceCmd) 0 }, 189 {"askface", SC(AskFaceCmd) 0 },
214 {"requestinfo", SC(RequestInfo) 0 }, 190 {"requestinfo", SC(RequestInfo) 0 },
215 {"setfacemode", SC(SetFaceMode) 0 },
216 {"setsound", SC(SetSound) 0 }, 191 {"setsound", SC(SetSound) 0 },
217 {"setup", SC(SetUp) 0 }, 192 {"setup", SC(SetUp) 0 },
218 {"version", SC(VersionCmd) 0 }, 193 {"version", SC(VersionCmd) 0 },
219 {"toggleextendedinfos", SC(ToggleExtendedInfos) 0 }, /*Added: tchize */ 194
220 {"toggleextendedtext", SC(ToggleExtendedText) 0 }, /*Added: tchize */ 195 {"toggleextendedtext", SC(NopCmd) 0 }, // deliantra: disabled
221 {"asksmooth", SC(AskSmooth) 0 }, /*Added: tchize (smoothing technologies) */
222}; 196};
223 197
224bool 198bool
225client::may_execute (const packet_type *pkt) const 199client::may_execute (const packet_type *pkt) const
226{ 200{
227 return (!(pkt->flags & PF_PLAYER) || pl) 201 return (!(pkt->flags & PF_PLAYER) || pl)
228 && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING); 202 && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING);
229} 203}
230 204
231// HACK: some commands currently should be executed 205// HACK: some commands currently should be executed
232// even when the player is frozen. this hack detects 206// even when the player is frozen. this hack detects
233// those commands. it should be folded into may_execute, 207// those commands. it should be folded into may_execute,
234// but kept seperate to emphasise the hack aspect, i.e. 208// but kept seperate to emphasise the hack aspect, i.e.
235// do it better, then remove. 209// do it better, then remove.
236static bool 210static bool
237always_immediate (const client *ns, const packet_type *pkt, const char *data, int len) 211always_immediate (const client *ns, const packet_type *pkt, const char *data, int len)
238{ 212{
239 if (!(pkt->flags & (PF_COMMAND0 | PF_COMMAND6))) 213 if (!(pkt->flags & PF_COMMAND))
240 return false; 214 return false;
241 215
242 if (!ns->pl || !ns->pl->ob || !ns->pl->ob->map) 216 if (!ns->pl || !ns->pl->ob || !ns->pl->ob->map)
243 return false; 217 return false;
244 218
245 if (pkt->flags & PF_COMMAND6) 219 if (len > 4 && data [ 3] == ' ' && !strncmp (data, "say " , 4)) return true;
246 { 220 if (len > 5 && data [ 4] == ' ' && !strncmp (data, "chat " , 5)) return true;
247 data += 6; 221 if (len > 6 && data [ 5] == ' ' && !strncmp (data, "shout " , 6)) return true;
248 len -= 6; 222 if (len > 8 && data [ 7] == ' ' && !strncmp (data, "suicide " , 8)) return true;
249 } 223 if (len > 18 && data [17] == ' ' && !strncmp (data, "accept-invitation ", 18)) return true;
250 224
251 if (len > 4 && !strncmp (data, "say " , 4)) 225 if (len == 7 && !strcmp (data, "suicide")) return true;
252 return true;
253 if (len > 5 && !strncmp (data, "chat ", 5))
254 return true;
255 226
256 return false; 227 return false;
257} 228}
258 229
259void 230void
… …
261{ 232{
262 if (may_execute (pkt) || always_immediate (this, pkt, data, datalen)) 233 if (may_execute (pkt) || always_immediate (this, pkt, data, datalen))
263 { 234 {
264 //TODO: only one format 235 //TODO: only one format
265 if (pkt->flags & PF_PLAYER) 236 if (pkt->flags & PF_PLAYER)
237 {
266 ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl); 238 ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl);
239 pl->need_updated_stats ();
240 }
267 else 241 else
268 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this); 242 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this);
269 } 243 }
270 else 244 else
271 send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED, pkt->name); 245 send_packet_printf ("msg %d log ERROR: you cannot execute '%s' now.", NDI_RED | NDI_REPLY, pkt->name);
272} 246}
273 247
274bool 248bool
275client::handle_packet () 249client::handle_packet ()
276{ 250{
… …
284 pl && pl->ob ? &pl->ob->name : "[anonymous]"); 258 pl && pl->ob ? &pl->ob->name : "[anonymous]");
285 destroy (); 259 destroy ();
286 return false; 260 return false;
287 } 261 }
288 262
263 uint8_t save_byte = inbuf [pkt_len]; // rather ugly
289 inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */ 264 inbuf [pkt_len] = 0; /* temporarily terminate buffer - useful for string data */
290 265
291 /* First, break out beginning word. There are at least 266 /* First, break out beginning word. There are at least
292 * a few commands that do not have any paremeters. If 267 * a few commands that do not have any paremeters. If
293 * we get such a command, don't worry about trying 268 * we get such a command, don't worry about trying
294 * to break it up. 269 * to break it up.
… …
305 { 280 {
306 data = (char *)inbuf + 2; // better read garbage than segfault 281 data = (char *)inbuf + 2; // better read garbage than segfault
307 datalen = 0; 282 datalen = 0;
308 } 283 }
309 284
310 for (packet_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt) 285 for (packet_type *pkt = packets; pkt < packets + ecb_array_length (packets); ++pkt)
311 if (!strcmp ((char *)inbuf + 2, pkt->name)) 286 if (!strcmp ((char *)inbuf + 2, pkt->name))
312 { 287 {
313 if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen)) 288 if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen))
314 queue_command (pkt, data, datalen); 289 queue_command (pkt, data, datalen);
315 else 290 else
… …
317 292
318 goto next_packet; 293 goto next_packet;
319 } 294 }
320 295
321 // If we get here, we didn't find a valid command. 296 // 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); 297 send_packet_printf ("msg %d log ERROR: command '%s' not supported.", NDI_RED | NDI_REPLY, (char *)inbuf + 2);
298
323next_packet: 299next_packet:
300 inbuf [pkt_len] = save_byte; // rather ugly
324 skip_packet (pkt_len); 301 skip_packet (pkt_len);
325 302
326 // input buffer has space again 303 // input buffer has space again
327 socket_ev.poll (socket_ev.poll () | PE_R); 304 socket_ev.poll (socket_ev.poll () | EV_READ);
328 305
329 return true; 306 return true;
330} 307}
331 308
309void
310client::inbuf_handle ()
311{
312 if (!handle_packet ())
313 return;
314
315 while (handle_packet ())
316 ;
317
318 flush ();
319}
320
332// callback called when socket is either readable or writable 321// callback called when socket is either readable or writable
333void 322void
334client::socket_cb (iow &w, int got) 323client::socket_cb (iow &w, int revents)
335{ 324{
336 //TODO remove when we have better socket cleanup logic 325 //TODO remove when we have better socket cleanup logic
337 if (destroyed ()) 326 if (destroyed ())
338 { 327 {
339 socket_ev.poll (0); 328 socket_ev.poll (0);
340 return; 329 return;
341 } 330 }
342 331
343 if (got & PE_W) 332 if (revents & EV_WRITE)
344 { 333 {
345 write_outputbuffer (); 334 write_outputbuffer ();
346 335
347 if (!outputbuffer.len) 336 if (!outputbuffer.len)
348 socket_ev.poll (socket_ev.poll () & ~PE_W); 337 socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
349 }
350
351 if (got & PE_R)
352 { 338 }
353 //TODO: rate-limit tcp connection in better ways, important
354 339
340 if (revents & EV_READ)
341 {
342 int amount;
343 uint8 *rbuf;
344
345 if (ws_version)
346 {
347 if (ws_inbuf_len + 2048 > ws_inbuf_alloc)
348 ws_inbuf = (uint8 *)realloc (ws_inbuf, ws_inbuf_alloc += 4096);
349
350 rbuf = ws_inbuf + ws_inbuf_len;
351 amount = ws_inbuf_alloc - ws_inbuf_len;
352 }
353 else
354 {
355 rbuf = inbuf + inbuf_len;
355 int amount = sizeof (inbuf) - inbuf_len; 356 amount = sizeof (inbuf) - inbuf_len;
357 }
356 358
357 if (!amount) 359 if (!amount)
358 { 360 {
359 // input buffer full 361 // input buffer full
360 socket_ev.poll (socket_ev.poll () & ~PE_R); 362 LOG (llevError, "input buffer overflow.");
363 destroy ();
361 return; 364 return;
362 } 365 }
363 366
364 amount = read (fd, inbuf + inbuf_len, amount); 367 amount = read (fd, rbuf, amount);
365 368
366 if (!amount) 369 if (!amount)
367 { 370 {
368 destroy (); 371 destroy ();
369 return; 372 return;
… …
377 return; 380 return;
378 } 381 }
379 382
380 // should not be here, normally 383 // should not be here, normally
381 } 384 }
385
386 if (ws_version)
387 {
388 ws_inbuf_len += amount;
389
390 while (ws_inbuf_len)
391 {
392 if (ws_inbuf_len < 2 + 4) // 6 is minimum length: op, len, mask
393 break;
394
395 int d = 2;
396 int fin = ws_inbuf [0] & 0x80;
397 int op = ws_inbuf [0] & 0x0f;
398 int len = ws_inbuf [1] & 0x7f;
399
400 if (len == 126)
401 {
402 len = (ws_inbuf [2] << 8) | ws_inbuf [3];
403 d += 2;
404 }
405 else if (len == 127)
406 {
407 if (ws_inbuf_len < 2 + 8)
408 return;
409
410 // we don't do extra long frames, if a browser wants to send >2**32 bytes,
411 // there are bigger issues to fix.
412 len = (ws_inbuf [8] << 8) | ws_inbuf [9];
413 d += 8;
414 }
415
416 // we only continue if we have a complete frame
417 if (ws_inbuf_len < d + 4 + len)
418 return;
419
420 switch (op)
421 {
422 case 0: op = ws_inbuf_type; break; // continuation
423 case 1: ws_inbuf_type = 1; break; // utf-8
424 case 2: ws_inbuf_type = 2; break; // binary
425 }
426
427 if (len > sizeof (inbuf) - inbuf_len)
428 {
429 // input buffer full
430 LOG (llevError, "input buffer overflow (ws).");
431 destroy ();
432 return;
433 }
434
435 uint8 *buf = inbuf + inbuf_len + 2;
436
437 for (int i = 0; i < len; ++i)
438 buf [i] = ws_inbuf [d + 4 + i] ^ ws_inbuf [d + (i & 3)];
439
440 // remove frame
441 ws_inbuf_len -= d + 4 + len;
442 memmove (ws_inbuf, ws_inbuf + d + 4 + len, ws_inbuf_len);
443
444 switch (op)
445 {
446 case 1: // utf-8
447 // utf-8 encoded frames cannot have full length (MAXSOCKBUF) in all cases
448 // but we assume that these extra-long packets will be rare.
449 {
450 uint8 *a = buf;
451 uint8 *b = a;
452 uint8 *c = a + len;
453
454 for (; a < c; ++a, ++b)
455 {
456 *b = *a;
457
458 if (*a >= 0x80)
459 *b = (a [0] & 0x1f) << 6 | (a [1] & 0x3f), ++a;
460 }
461
462 len -= a - b;
463 }
464 /* FALLTHROUGH */
465 case 2: // binary
466 inbuf_len += len;
467
468 if (fin)
469 {
470 inbuf [0] = inbuf_len >> 8;
471 inbuf [1] = inbuf_len;
472
473 inbuf_len += 2;
474
475 inbuf_handle ();
476 }
477 break;
478
479 case 9: // ping
480 {
481 // send pong - we assume ping messages are <64k
482 // as we can't handle >10k at the moment anyway.
483 uint8 hdr [] = { 0x8a, 126, len >> 8, len };
484 send (hdr, sizeof (hdr));
485 send (inbuf + inbuf_len, len);
486 }
487 break;
488
489 case 10: // pong
490 break;
491
492 case 8: // close
493 default:
494 destroy ();
495 return;
496 }
497 }
498 }
382 else 499 else
383 { 500 {
384 inbuf_len += amount; 501 inbuf_len += amount;
385 502 inbuf_handle ();
386 cmd_ev.start ();
387 } 503 }
388 } 504 }
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} 505}
400 506
401/******************************************************************************* 507/*******************************************************************************
402 * 508 *
403 * Start of write related routines. 509 * Start of write related routines.
… …
459client::send_packet (packet &sl) 565client::send_packet (packet &sl)
460{ 566{
461 if (destroyed ()) 567 if (destroyed ())
462 return; 568 return;
463 569
464 if (sl.length () >= MAXSOCKBUF) 570 if (sl.length () > MAXSOCKBUF)
465 { 571 {
466 LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ()); 572 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 573 /* Almost certainly we've overflowed a buffer, so quit now to make
468 * it easier to debug. 574 * it easier to debug.
469 */ 575 */
… …
471 } 577 }
472 578
473 if (!sl.length ()) 579 if (!sl.length ())
474 return; 580 return;
475 581
582 if (ws_version == 8)
583 {
584 static uint8 buf [MAXSOCKBUF * 2 + 4];
585
586 uint8 *b = buf + 4;
587 for (uint8 *a = sl.buf_ + sl.hdrlen; a < sl.cur; ++a)
588 {
589 if (*a < 0x80)
590 *b++ = *a;
591 else
592 {
593 *b++ = 0xc0 | ((*a >> 6) & 0x1f);
594 *b++ = 0x80 | ( *a & 0x3f);
595 }
596 }
597
598 assert (b - buf < sizeof (buf));
599
600 int len = b - (buf + 4);
601
602 if (len < 126)
603 {
604 buf [2] = 0x81;
605 buf [3] = len;
606
607 send (buf + 2, len + 2);
608 }
609 else
610 {
611 buf [0] = 0x81;
612 buf [1] = 126;
613 buf [2] = len >> 8;
614 buf [3] = len;
615
616 send (buf, len + 4);
617 }
618 }
619 else if (ws_version == 13)
620 {
621 int len = sl.length ();
622
623 if (len < 126)
624 {
625 uint8 hdr [] = { 0x82, len };
626 send (hdr, sizeof (hdr));
627 }
628 else
629 {
630 uint8 hdr [] = { 0x82, 126, len >> 8, len };
631 send (hdr, sizeof (hdr));
632 }
633
634 send (sl.buf_ + sl.hdrlen, len);
635 }
636 else
637 {
476 assert (sl.hdrlen == 2); 638 assert (sl.hdrlen == 2);
477 639
478 sl.buf_ [0] = sl.length () >> 8; 640 sl.buf_ [0] = sl.length () >> 8;
479 sl.buf_ [1] = sl.length () ; 641 sl.buf_ [1] = sl.length () ;
480 642
481 send (sl.buf_, sl.length () + sl.hdrlen); 643 send (sl.buf_, sl.length () + sl.hdrlen);
644 }
482} 645}
483 646
484void 647void
485client::send_packet (const char *buf, int len) 648client::send_packet (const char *buf, int len)
486{ 649{
487 packet sl; 650 packet sl;
488 651
489 sl << data (buf, len); 652 sl << data_n (buf, len);
490 send_packet (sl); 653 send_packet (sl);
491} 654}
492 655
493void 656void
494client::send_packet (const char *buf) 657client::send_packet (const char *buf)
… …
508 671
509 send_packet (sl); 672 send_packet (sl);
510} 673}
511 674
512void 675void
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) 676client::send_msg (int color, const char *type, const char *msg)
520{ 677{
521 if (can_msg) 678 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 } 679 {
680 LOG (logBacktrace | llevError, "send_msg(%d,%p,%p) called with NULL msg or type.\n", color, type, msg);
681 return;
682 }
683
684 int len = strlen (msg);
685
686 if (!(color & NDI_VERBATIM)
687 && (msg_is_special (msg)
688 || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128)))
689 cfperl_send_msg (this, color, type, msg);
530 else 690 else
531 send_packet_printf ("drawinfo %d %s", color, msg); 691 send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg);
532} 692}
533 693
534/*********************************************************************** 694/***********************************************************************
535 * 695 *
536 * packet functions/utilities 696 * packet functions/utilities
… …
546 *cur++ = ' '; 706 *cur++ = ' ';
547} 707}
548 708
549packet &packet::operator <<(const ber32 v) 709packet &packet::operator <<(const ber32 v)
550{ 710{
551 enum { maxlen = 32 / 7 + 1}; 711 enum { maxlen = 32 / 7 + 1 };
552 uint8 buf[maxlen]; 712 uint8 buf[maxlen];
553 uint8 *p = buf + maxlen; 713 uint8 *p = buf + maxlen;
554 uint32 val = v.val; 714 uint32 val = v.val;
555 715
556 *--p = val & 0x7F; 716 *--p = val & 0x7F;
… …
559 { 719 {
560 val >>= 7; 720 val >>= 7;
561 *--p = (val & 0x7F) | 0x80; 721 *--p = (val & 0x7F) | 0x80;
562 } 722 }
563 723
564 return *this << data (p, buf + maxlen - p); 724 return *this << data_n (p, buf + maxlen - p);
565} 725}
566 726
567packet &packet::operator <<(const data &v) 727packet &packet::operator <<(const data_n &v)
568{ 728{
569 if (room () < v.len) 729 if (room () < v.len)
570 reset (); 730 reset ();
571 else 731 else
572 { 732 {
… …
581} 741}
582 742
583packet &packet::operator <<(const data8 &v) 743packet &packet::operator <<(const data8 &v)
584{ 744{
585 unsigned int len = min (v.len, 0x00FF); 745 unsigned int len = min (v.len, 0x00FF);
586 return *this << uint8 (len) << data (v.ptr, len); 746 return *this << uint8 (len) << data_n (v.ptr, len);
587} 747}
588 748
589packet &packet::operator <<(const data16 &v) 749packet &packet::operator <<(const data16 &v)
590{ 750{
591 unsigned int len = min (v.len, 0xFFFF); 751 unsigned int len = min (v.len, 0xFFFF);
592 return *this << uint16 (len) << data (v.ptr, len); 752 return *this << uint16 (len) << data_n (v.ptr, len);
593} 753}
594 754
595packet &packet::operator <<(const char *v) 755packet &packet::operator <<(const char *v)
596{ 756{
597 return *this << data (v, strlen (v ? v : 0)); 757 return *this << data_n (v, v ? strlen (v) : 0);
598} 758}
599 759
600void 760void
601packet::vprintf (const char *format, va_list ap) 761packet::vprintf (const char *format, va_list ap)
602{ 762{

Diff Legend

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