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.70 by root, Sat Feb 21 06:25:46 2009 UTC vs.
Revision 1.102 by root, Wed Dec 5 19:03:27 2018 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2018 Marc Alexander Lehmann / the Deliantra team
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 1992,2007 Frank Tore Johansen
6 * 6 *
7 * Deliantra is free software: you can redistribute it and/or modify 7 * 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 8 * 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 9 * Free Software Foundation, either version 3 of the License, or (at your
10 * (at your option) any later version. 10 * option) any later version.
11 * 11 *
12 * This program is distributed in the hope that it will be useful, 12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License 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 17 * 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/>. 18 * and the GNU General Public License along with this program. If not, see
19 * <http://www.gnu.org/licenses/>.
19 * 20 *
20 * The authors can be reached via e-mail to <support@deliantra.net> 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 */ 22 */
22
23using namespace std;
24 23
25#include <global.h> 24#include <global.h>
26#include <sproto.h> 25#include <sproto.h>
27#include <cstdarg> 26#include <cstdarg>
28 27
… …
31# include <sys/socket.h> 30# include <sys/socket.h>
32# include <netinet/in.h> 31# include <netinet/in.h>
33# include <netinet/tcp.h> 32# include <netinet/tcp.h>
34#endif 33#endif
35 34
35using namespace std;
36
36// force a packet when idle for more than this many seconds, 37// force a packet when idle for more than this many seconds,
37// forcing an ack regularly. 38// forcing an ack regularly.
38#define IDLE_PING 2. 39#define IDLE_PING 2.
39 40
40void 41void
… …
48 * 49 *
49 * 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
50 * is called to write it out. 51 * is called to write it out.
51 */ 52 */
52 53
53 // 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.
54 if (!outputbuffer.len) 55 if (!outputbuffer.len)
55 { 56 {
56 if (last_send + IDLE_PING <= NOW && pl && pl->active) 57 if (last_send + IDLE_PING <= NOW && pl && pl->active)
57 { 58 {
58 // 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
59 // nop'able commands and they are quite small. 60 // nop'able command and it is quite small.
60 packet sl (mapmode == Map1Cmd ? "map1" : "map1a"); 61 packet sl ("map1a");
61 send_packet (sl); 62 send_packet (sl);
62 } 63 }
63 else 64 else
64 return; 65 return;
65 } 66 }
… …
132 if (inbuf_len >= 2 + pkt_len) 133 if (inbuf_len >= 2 + pkt_len)
133 return 2 + pkt_len; 134 return 2 + pkt_len;
134 135
135 if (inbuf_len == sizeof (inbuf)) 136 if (inbuf_len == sizeof (inbuf))
136 { 137 {
137 send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED | NDI_REPLY); 138 send_packet_printf ("msg %d log input buffer overflow - closing connection.", NDI_RED | NDI_REPLY);
138 destroy (); 139 destroy ();
139 return -1; 140 return -1;
140 } 141 }
141 } 142 }
142 143
… …
150 memmove (inbuf, inbuf + len, inbuf_len); 151 memmove (inbuf, inbuf + len, inbuf_len);
151} 152}
152 153
153/***************************************************************************** 154/*****************************************************************************
154 * Start of command dispatch area. 155 * Start of command dispatch area.
155 * The commands here are protocol commands. 156 * The commands here are protocol commands.
156 ****************************************************************************/ 157 ****************************************************************************/
157 158
158// SocketCommand, PlayingCommand, should not exist with those ugly casts 159// SocketCommand, PlayingCommand, should not exist with those ugly casts
159#define SC(cb) (void *)static_cast<void (*)(char *, int, client *)>(cb), 160#define SC(cb) (void *)static_cast<void (*)(char *, int, client *)>(cb),
160#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}
161 168
162/** 169/**
163 * Dispatch table for the server. 170 * Dispatch table for the server.
164 */ 171 */
165static struct packet_type packets[] = { 172static struct packet_type packets[] = {
166 {"ncom", PC(NewPlayerCmd) PF_PLAYING | PF_COMMAND6 },
167 {"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND0 }, 173 {"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND },
168 174
169 {"examine", PC(ExamineCmd) PF_PLAYING }, 175 {"examine", PC(ExamineCmd) PF_PLAYING },
170 {"ex", PC(ExCmd) PF_PLAYING }, 176 {"ex", PC(ExCmd) PF_PLAYING },
171 {"apply", PC(ApplyCmd) PF_PLAYING }, 177 {"apply", PC(ApplyCmd) PF_PLAYING },
172 {"lookat", PC(LookAt) PF_PLAYING }, 178 {"lookat", PC(LookAt) PF_PLAYING },
173 {"lock", PC(LockItem) PF_PLAYING }, 179 {"lock", PC(LockItem) PF_PLAYING },
174 {"mark", PC(MarkItem) PF_PLAYING }, 180 {"mark", PC(MarkItem) PF_PLAYING },
175 {"move", PC(MoveCmd) PF_PLAYING }, 181 {"move", PC(MoveCmd) PF_PLAYING },
176 {"ext", PC(ExtCmd) 0 }, // CF+ 182 {"ext", PC(ExtCmd) 0 }, // CF+/Deliantra
177 {"mapredraw", PC(MapRedrawCmd) 0 }, 183 {"mapredraw", PC(MapRedrawCmd) 0 },
178 {"mapinfo", PC(MapInfoCmd) 0 }, // CF+ 184 {"mapinfo", PC(MapInfoCmd) 0 }, // CF+/Deliantra
179 185
180 {"reply", SC(ReplyCmd) 0 }, 186 {"reply", SC(ReplyCmd) 0 },
181 {"exti", SC(ExtiCmd) 0 }, // CF+ 187 {"exti", SC(ExtiCmd) 0 }, // CF+/Deliantra
182 {"addme", SC(AddMeCmd) 0 }, 188 {"addme", SC(AddMeCmd) 0 },
183 {"askface", SC(AskFaceCmd) 0 }, 189 {"askface", SC(AskFaceCmd) 0 },
184 {"requestinfo", SC(RequestInfo) 0 }, 190 {"requestinfo", SC(RequestInfo) 0 },
185 {"setsound", SC(SetSound) 0 }, 191 {"setsound", SC(SetSound) 0 },
186 {"setup", SC(SetUp) 0 }, 192 {"setup", SC(SetUp) 0 },
187 {"version", SC(VersionCmd) 0 }, 193 {"version", SC(VersionCmd) 0 },
188 {"toggleextendedtext", SC(ToggleExtendedText) 0 }, /*Added: tchize */ 194
195 {"toggleextendedtext", SC(NopCmd) 0 }, // deliantra: disabled
189}; 196};
190 197
191bool 198bool
192client::may_execute (const packet_type *pkt) const 199client::may_execute (const packet_type *pkt) const
193{ 200{
194 return (!(pkt->flags & PF_PLAYER) || pl) 201 return (!(pkt->flags & PF_PLAYER) || pl)
195 && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING); 202 && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING);
196} 203}
197 204
198// HACK: some commands currently should be executed 205// HACK: some commands currently should be executed
199// even when the player is frozen. this hack detects 206// even when the player is frozen. this hack detects
200// those commands. it should be folded into may_execute, 207// those commands. it should be folded into may_execute,
201// but kept seperate to emphasise the hack aspect, i.e. 208// but kept seperate to emphasise the hack aspect, i.e.
202// do it better, then remove. 209// do it better, then remove.
203static bool 210static bool
204always_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)
205{ 212{
206 if (!(pkt->flags & (PF_COMMAND0 | PF_COMMAND6))) 213 if (!(pkt->flags & PF_COMMAND))
207 return false; 214 return false;
208 215
209 if (!ns->pl || !ns->pl->ob || !ns->pl->ob->map) 216 if (!ns->pl || !ns->pl->ob || !ns->pl->ob->map)
210 return false; 217 return false;
211
212 if (pkt->flags & PF_COMMAND6)
213 {
214 data += 6;
215 len -= 6;
216 }
217 218
218 if (len > 4 && data [ 3] == ' ' && !strncmp (data, "say " , 4)) return true; 219 if (len > 4 && data [ 3] == ' ' && !strncmp (data, "say " , 4)) return true;
219 if (len > 5 && data [ 4] == ' ' && !strncmp (data, "chat " , 5)) return true; 220 if (len > 5 && data [ 4] == ' ' && !strncmp (data, "chat " , 5)) return true;
220 if (len > 6 && data [ 5] == ' ' && !strncmp (data, "shout " , 6)) return true; 221 if (len > 6 && data [ 5] == ' ' && !strncmp (data, "shout " , 6)) return true;
221 if (len > 8 && data [ 7] == ' ' && !strncmp (data, "suicide " , 8)) return true; 222 if (len > 8 && data [ 7] == ' ' && !strncmp (data, "suicide " , 8)) return true;
… …
231{ 232{
232 if (may_execute (pkt) || always_immediate (this, pkt, data, datalen)) 233 if (may_execute (pkt) || always_immediate (this, pkt, data, datalen))
233 { 234 {
234 //TODO: only one format 235 //TODO: only one format
235 if (pkt->flags & PF_PLAYER) 236 if (pkt->flags & PF_PLAYER)
237 {
236 ((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 }
237 else 241 else
238 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this); 242 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this);
239 } 243 }
240 else 244 else
241 send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED | NDI_REPLY, pkt->name); 245 send_packet_printf ("msg %d log ERROR: you cannot execute '%s' now.", NDI_RED | NDI_REPLY, pkt->name);
242} 246}
243 247
244bool 248bool
245client::handle_packet () 249client::handle_packet ()
246{ 250{
… …
254 pl && pl->ob ? &pl->ob->name : "[anonymous]"); 258 pl && pl->ob ? &pl->ob->name : "[anonymous]");
255 destroy (); 259 destroy ();
256 return false; 260 return false;
257 } 261 }
258 262
263 uint8_t save_byte = inbuf [pkt_len]; // rather ugly
259 inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */ 264 inbuf [pkt_len] = 0; /* temporarily terminate buffer - useful for string data */
260 265
261 /* First, break out beginning word. There are at least 266 /* First, break out beginning word. There are at least
262 * a few commands that do not have any paremeters. If 267 * a few commands that do not have any paremeters. If
263 * we get such a command, don't worry about trying 268 * we get such a command, don't worry about trying
264 * to break it up. 269 * to break it up.
… …
275 { 280 {
276 data = (char *)inbuf + 2; // better read garbage than segfault 281 data = (char *)inbuf + 2; // better read garbage than segfault
277 datalen = 0; 282 datalen = 0;
278 } 283 }
279 284
280 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)
281 if (!strcmp ((char *)inbuf + 2, pkt->name)) 286 if (!strcmp ((char *)inbuf + 2, pkt->name))
282 { 287 {
283 if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen)) 288 if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen))
284 queue_command (pkt, data, datalen); 289 queue_command (pkt, data, datalen);
285 else 290 else
… …
287 292
288 goto next_packet; 293 goto next_packet;
289 } 294 }
290 295
291 // If we get here, we didn't find a valid command. 296 // If we get here, we didn't find a valid command.
292 send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED | NDI_REPLY, (char *)inbuf + 2); 297 send_packet_printf ("msg %d log ERROR: command '%s' not supported.", NDI_RED | NDI_REPLY, (char *)inbuf + 2);
298
293next_packet: 299next_packet:
300 inbuf [pkt_len] = save_byte; // rather ugly
294 skip_packet (pkt_len); 301 skip_packet (pkt_len);
295 302
296 // input buffer has space again 303 // input buffer has space again
297 socket_ev.poll (socket_ev.poll () | EV_READ); 304 socket_ev.poll (socket_ev.poll () | EV_READ);
298 305
299 return true; 306 return true;
300} 307}
301 308
309void
310client::inbuf_handle ()
311{
312 if (!handle_packet ())
313 return;
314
315 while (handle_packet ())
316 ;
317
318 flush ();
319}
320
302// callback called when socket is either readable or writable 321// callback called when socket is either readable or writable
303void 322void
304client::socket_cb (iow &w, int revents) 323client::socket_cb (iow &w, int revents)
305{ 324{
306 //TODO remove when we have better socket cleanup logic 325 //TODO remove when we have better socket cleanup logic
… …
318 socket_ev.poll (socket_ev.poll () & ~EV_WRITE); 337 socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
319 } 338 }
320 339
321 if (revents & EV_READ) 340 if (revents & EV_READ)
322 { 341 {
323 //TODO: rate-limit tcp connection in better ways, important 342 int amount;
343 uint8 *rbuf;
324 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;
325 int amount = sizeof (inbuf) - inbuf_len; 356 amount = sizeof (inbuf) - inbuf_len;
357 }
326 358
327 if (!amount) 359 if (!amount)
328 { 360 {
329 // input buffer full 361 // input buffer full
330 socket_ev.poll (socket_ev.poll () & ~EV_READ); 362 LOG (llevError, "input buffer overflow.");
363 destroy ();
331 return; 364 return;
332 } 365 }
333 366
334 amount = read (fd, inbuf + inbuf_len, amount); 367 amount = read (fd, rbuf, amount);
335 368
336 if (!amount) 369 if (!amount)
337 { 370 {
338 destroy (); 371 destroy ();
339 return; 372 return;
… …
347 return; 380 return;
348 } 381 }
349 382
350 // should not be here, normally 383 // should not be here, normally
351 } 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 }
352 else 499 else
353 { 500 {
354 inbuf_len += amount; 501 inbuf_len += amount;
355 502 inbuf_handle ();
356 if (handle_packet ())
357 {
358 while (handle_packet ())
359 ;
360
361 flush ();
362 }
363 } 503 }
364 } 504 }
365} 505}
366 506
367/******************************************************************************* 507/*******************************************************************************
… …
437 } 577 }
438 578
439 if (!sl.length ()) 579 if (!sl.length ())
440 return; 580 return;
441 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 {
442 assert (sl.hdrlen == 2); 638 assert (sl.hdrlen == 2);
443 639
444 sl.buf_ [0] = sl.length () >> 8; 640 sl.buf_ [0] = sl.length () >> 8;
445 sl.buf_ [1] = sl.length () ; 641 sl.buf_ [1] = sl.length () ;
446 642
447 send (sl.buf_, sl.length () + sl.hdrlen); 643 send (sl.buf_, sl.length () + sl.hdrlen);
644 }
448} 645}
449 646
450void 647void
451client::send_packet (const char *buf, int len) 648client::send_packet (const char *buf, int len)
452{ 649{
453 packet sl; 650 packet sl;
454 651
455 sl << data (buf, len); 652 sl << data_n (buf, len);
456 send_packet (sl); 653 send_packet (sl);
457} 654}
458 655
459void 656void
460client::send_packet (const char *buf) 657client::send_packet (const char *buf)
… …
492 cfperl_send_msg (this, color, type, msg); 689 cfperl_send_msg (this, color, type, msg);
493 else 690 else
494 send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg); 691 send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg);
495} 692}
496 693
497void
498client::send_drawinfo (const char *msg, int flags)
499{
500 send_msg (flags, "log", msg);
501}
502
503/*********************************************************************** 694/***********************************************************************
504 * 695 *
505 * packet functions/utilities 696 * packet functions/utilities
506 * 697 *
507 **********************************************************************/ 698 **********************************************************************/
… …
515 *cur++ = ' '; 706 *cur++ = ' ';
516} 707}
517 708
518packet &packet::operator <<(const ber32 v) 709packet &packet::operator <<(const ber32 v)
519{ 710{
520 enum { maxlen = 32 / 7 + 1}; 711 enum { maxlen = 32 / 7 + 1 };
521 uint8 buf[maxlen]; 712 uint8 buf[maxlen];
522 uint8 *p = buf + maxlen; 713 uint8 *p = buf + maxlen;
523 uint32 val = v.val; 714 uint32 val = v.val;
524 715
525 *--p = val & 0x7F; 716 *--p = val & 0x7F;
… …
528 { 719 {
529 val >>= 7; 720 val >>= 7;
530 *--p = (val & 0x7F) | 0x80; 721 *--p = (val & 0x7F) | 0x80;
531 } 722 }
532 723
533 return *this << data (p, buf + maxlen - p); 724 return *this << data_n (p, buf + maxlen - p);
534} 725}
535 726
536packet &packet::operator <<(const data &v) 727packet &packet::operator <<(const data_n &v)
537{ 728{
538 if (room () < v.len) 729 if (room () < v.len)
539 reset (); 730 reset ();
540 else 731 else
541 { 732 {
… …
550} 741}
551 742
552packet &packet::operator <<(const data8 &v) 743packet &packet::operator <<(const data8 &v)
553{ 744{
554 unsigned int len = min (v.len, 0x00FF); 745 unsigned int len = min (v.len, 0x00FF);
555 return *this << uint8 (len) << data (v.ptr, len); 746 return *this << uint8 (len) << data_n (v.ptr, len);
556} 747}
557 748
558packet &packet::operator <<(const data16 &v) 749packet &packet::operator <<(const data16 &v)
559{ 750{
560 unsigned int len = min (v.len, 0xFFFF); 751 unsigned int len = min (v.len, 0xFFFF);
561 return *this << uint16 (len) << data (v.ptr, len); 752 return *this << uint16 (len) << data_n (v.ptr, len);
562} 753}
563 754
564packet &packet::operator <<(const char *v) 755packet &packet::operator <<(const char *v)
565{ 756{
566 return *this << data (v, strlen (v ? v : 0)); 757 return *this << data_n (v, v ? strlen (v) : 0);
567} 758}
568 759
569void 760void
570packet::vprintf (const char *format, va_list ap) 761packet::vprintf (const char *format, va_list ap)
571{ 762{

Diff Legend

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