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.46 by root, Sun Jun 10 04:44:21 2007 UTC vs.
Revision 1.87 by root, Tue Nov 6 03:45:17 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 if (tcpi.tcpi_snd_mss)
61 mss = tcpi.tcpi_snd_mss;
62
63 rtt = tcpi.tcpi_rtt;
64 rttvar = tcpi.tcpi_rttvar;
65
66 if (tcpi.tcpi_last_ack_recv > int (SOCKET_TIMEOUT * 1000))
67 {
68 send_msg (NDI_RED, "connection-timeout", "safety disconnect due to tcp/ip timeout (no packets received)");
69 write_outputbuffer ();
70
71 LOG (llevDebug, "connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd,
72 (unsigned)tcpi.tcpi_last_ack_recv, (unsigned)tcpi.tcpi_last_data_sent, (unsigned)tcpi.tcpi_unacked);
73 destroy ();
74 }
75 }
76 }
77#endif
78 45
79 /** 46 /**
80 * Writes data to socket. 47 * Writes data to socket.
81 * 48 *
82 * When the socket is clear to write, and we have backlogged data, this 49 * When the socket is clear to write, and we have backlogged data, this
84 */ 51 */
85 52
86 // write a nop to the socket at least every IDLE_NOP seconds. 53 // write a nop to the socket at least every IDLE_NOP seconds.
87 if (!outputbuffer.len) 54 if (!outputbuffer.len)
88 { 55 {
89 if (last_send + IDLE_PING <= NOW) 56 if (last_send + IDLE_PING <= NOW && pl && pl->active)
90 { 57 {
91 // 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
92 // nop'able commands and they are quite small. 59 // nop'able command and it is quite small.
93 packet sl (mapmode == Map1Cmd ? "map1" : "map1a"); 60 packet sl ("map1a");
94 send_packet (sl); 61 send_packet (sl);
95 } 62 }
96 else 63 else
97 return; 64 return;
98 } 65 }
99 66
100 if (socket_ev.poll () & PE_W) 67 if (socket_ev.poll () & EV_WRITE)
101 return; 68 return;
102 69
103 last_send = NOW; 70 last_send = NOW;
104 write_outputbuffer (); 71 write_outputbuffer ();
105} 72}
132 // just retry 99 // just retry
133 } 100 }
134 else if (errno == EAGAIN) 101 else if (errno == EAGAIN)
135 { 102 {
136 // delay till ready 103 // delay till ready
137 socket_ev.poll (socket_ev.poll () | PE_W); 104 socket_ev.poll (socket_ev.poll () | EV_WRITE);
138 socket_ev.start (); 105 socket_ev.start ();
139 return; 106 return;
140 } 107 }
141 else 108 else
142 { 109 {
144 destroy (); 111 destroy ();
145 return; 112 return;
146 } 113 }
147 } 114 }
148 115
149 socket_ev.poll (socket_ev.poll () & ~PE_W); 116 socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
150} 117}
151 118
152/****************************************************************************** 119/******************************************************************************
153 * 120 *
154 * Start of read routines. 121 * Start of read routines.
165 if (inbuf_len >= 2 + pkt_len) 132 if (inbuf_len >= 2 + pkt_len)
166 return 2 + pkt_len; 133 return 2 + pkt_len;
167 134
168 if (inbuf_len == sizeof (inbuf)) 135 if (inbuf_len == sizeof (inbuf))
169 { 136 {
170 send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED); 137 send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED | NDI_REPLY);
171 destroy (); 138 destroy ();
172 return -1; 139 return -1;
173 } 140 }
174 } 141 }
175 142
189 ****************************************************************************/ 156 ****************************************************************************/
190 157
191// SocketCommand, PlayingCommand, should not exist with those ugly casts 158// SocketCommand, PlayingCommand, should not exist with those ugly casts
192#define SC(cb) (void *)static_cast<void (*)(char *, int, client *)>(cb), 159#define SC(cb) (void *)static_cast<void (*)(char *, int, client *)>(cb),
193#define PC(cb) (void *)static_cast<void (*)(char *, int, player *)>(cb), PF_PLAYER | 160#define PC(cb) (void *)static_cast<void (*)(char *, int, player *)>(cb), PF_PLAYER |
161
162static void
163NopCmd (char *, int, client *)
164{
165 // do nothing
166}
194 167
195/** 168/**
196 * Dispatch table for the server. 169 * Dispatch table for the server.
197 */ 170 */
198static struct packet_type packets[] = { 171static struct packet_type packets[] = {
204 {"apply", PC(ApplyCmd) PF_PLAYING }, 177 {"apply", PC(ApplyCmd) PF_PLAYING },
205 {"lookat", PC(LookAt) PF_PLAYING }, 178 {"lookat", PC(LookAt) PF_PLAYING },
206 {"lock", PC(LockItem) PF_PLAYING }, 179 {"lock", PC(LockItem) PF_PLAYING },
207 {"mark", PC(MarkItem) PF_PLAYING }, 180 {"mark", PC(MarkItem) PF_PLAYING },
208 {"move", PC(MoveCmd) PF_PLAYING }, 181 {"move", PC(MoveCmd) PF_PLAYING },
209 {"ext", PC(ExtCmd) 0 }, // CF+ 182 {"ext", PC(ExtCmd) 0 }, // CF+/Deliantra
210 {"mapredraw", PC(MapRedrawCmd) 0 }, 183 {"mapredraw", PC(MapRedrawCmd) 0 },
211 {"mapinfo", PC(MapInfoCmd) 0 }, // CF+ 184 {"mapinfo", PC(MapInfoCmd) 0 }, // CF+/Deliantra
212 185
213 {"reply", SC(ReplyCmd) 0 }, 186 {"reply", SC(ReplyCmd) 0 },
214 {"exti", SC(ExtiCmd) 0 }, // CF+ 187 {"exti", SC(ExtiCmd) 0 }, // CF+/Deliantra
215 {"addme", SC(AddMeCmd) 0 }, 188 {"addme", SC(AddMeCmd) 0 },
216 {"askface", SC(AskFaceCmd) 0 }, 189 {"askface", SC(AskFaceCmd) 0 },
217 {"requestinfo", SC(RequestInfo) 0 }, 190 {"requestinfo", SC(RequestInfo) 0 },
218 {"setfacemode", SC(SetFaceMode) 0 },
219 {"setsound", SC(SetSound) 0 }, 191 {"setsound", SC(SetSound) 0 },
220 {"setup", SC(SetUp) 0 }, 192 {"setup", SC(SetUp) 0 },
221 {"version", SC(VersionCmd) 0 }, 193 {"version", SC(VersionCmd) 0 },
222 {"toggleextendedinfos", SC(ToggleExtendedInfos) 0 }, /*Added: tchize */ 194
223 {"toggleextendedtext", SC(ToggleExtendedText) 0 }, /*Added: tchize */ 195 {"toggleextendedtext", SC(NopCmd) 0 }, // deliantra: disabled
224 {"asksmooth", SC(AskSmooth) 0 }, /*Added: tchize (smoothing technologies) */
225}; 196};
226 197
227bool 198bool
228client::may_execute (const packet_type *pkt) const 199client::may_execute (const packet_type *pkt) const
229{ 200{
249 { 220 {
250 data += 6; 221 data += 6;
251 len -= 6; 222 len -= 6;
252 } 223 }
253 224
254 if (len > 4 && !strncmp (data, "say " , 4)) 225 if (len > 4 && data [ 3] == ' ' && !strncmp (data, "say " , 4)) return true;
255 return true; 226 if (len > 5 && data [ 4] == ' ' && !strncmp (data, "chat " , 5)) return true;
256 if (len > 5 && !strncmp (data, "chat ", 5)) 227 if (len > 6 && data [ 5] == ' ' && !strncmp (data, "shout " , 6)) return true;
257 return true; 228 if (len > 8 && data [ 7] == ' ' && !strncmp (data, "suicide " , 8)) return true;
229 if (len > 18 && data [17] == ' ' && !strncmp (data, "accept-invitation ", 18)) return true;
230
231 if (len == 7 && !strcmp (data, "suicide")) return true;
258 232
259 return false; 233 return false;
260} 234}
261 235
262void 236void
264{ 238{
265 if (may_execute (pkt) || always_immediate (this, pkt, data, datalen)) 239 if (may_execute (pkt) || always_immediate (this, pkt, data, datalen))
266 { 240 {
267 //TODO: only one format 241 //TODO: only one format
268 if (pkt->flags & PF_PLAYER) 242 if (pkt->flags & PF_PLAYER)
243 {
269 ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl); 244 ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl);
245 pl->need_updated_stats ();
246 }
270 else 247 else
271 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this); 248 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this);
272 } 249 }
273 else 250 else
274 send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED, pkt->name); 251 send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED | NDI_REPLY, pkt->name);
275} 252}
276 253
277bool 254bool
278client::handle_packet () 255client::handle_packet ()
279{ 256{
287 pl && pl->ob ? &pl->ob->name : "[anonymous]"); 264 pl && pl->ob ? &pl->ob->name : "[anonymous]");
288 destroy (); 265 destroy ();
289 return false; 266 return false;
290 } 267 }
291 268
269 uint8_t save_byte = inbuf [pkt_len]; // rather ugly
292 inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */ 270 inbuf [pkt_len] = 0; /* temporarily terminate buffer - useful for string data */
293 271
294 /* First, break out beginning word. There are at least 272 /* First, break out beginning word. There are at least
295 * a few commands that do not have any paremeters. If 273 * a few commands that do not have any paremeters. If
296 * we get such a command, don't worry about trying 274 * we get such a command, don't worry about trying
297 * to break it up. 275 * to break it up.
308 { 286 {
309 data = (char *)inbuf + 2; // better read garbage than segfault 287 data = (char *)inbuf + 2; // better read garbage than segfault
310 datalen = 0; 288 datalen = 0;
311 } 289 }
312 290
313 for (packet_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt) 291 for (packet_type *pkt = packets; pkt < packets + array_length (packets); ++pkt)
314 if (!strcmp ((char *)inbuf + 2, pkt->name)) 292 if (!strcmp ((char *)inbuf + 2, pkt->name))
315 { 293 {
316 if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen)) 294 if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen))
317 queue_command (pkt, data, datalen); 295 queue_command (pkt, data, datalen);
318 else 296 else
320 298
321 goto next_packet; 299 goto next_packet;
322 } 300 }
323 301
324 // If we get here, we didn't find a valid command. 302 // If we get here, we didn't find a valid command.
325 send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED, (char *)inbuf + 2); 303 send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED | NDI_REPLY, (char *)inbuf + 2);
304
326next_packet: 305next_packet:
306 inbuf [pkt_len] = save_byte; // rather ugly
327 skip_packet (pkt_len); 307 skip_packet (pkt_len);
328 308
329 // input buffer has space again 309 // input buffer has space again
330 socket_ev.poll (socket_ev.poll () | PE_R); 310 socket_ev.poll (socket_ev.poll () | EV_READ);
331 311
332 return true; 312 return true;
333} 313}
334 314
315void
316client::inbuf_handle ()
317{
318 if (!handle_packet ())
319 return;
320
321 while (handle_packet ())
322 ;
323
324 flush ();
325}
326
335// callback called when socket is either readable or writable 327// callback called when socket is either readable or writable
336void 328void
337client::socket_cb (iow &w, int got) 329client::socket_cb (iow &w, int revents)
338{ 330{
339 //TODO remove when we have better socket cleanup logic 331 //TODO remove when we have better socket cleanup logic
340 if (destroyed ()) 332 if (destroyed ())
341 { 333 {
342 socket_ev.poll (0); 334 socket_ev.poll (0);
343 return; 335 return;
344 } 336 }
345 337
346 if (got & PE_W) 338 if (revents & EV_WRITE)
347 { 339 {
348 write_outputbuffer (); 340 write_outputbuffer ();
349 341
350 if (!outputbuffer.len) 342 if (!outputbuffer.len)
351 socket_ev.poll (socket_ev.poll () & ~PE_W); 343 socket_ev.poll (socket_ev.poll () & ~EV_WRITE);
352 } 344 }
353 345
354 if (got & PE_R) 346 if (revents & EV_READ)
355 { 347 {
356 //TODO: rate-limit tcp connection in better ways, important 348 //TODO: rate-limit tcp connection in better ways, important
357 349
358 int amount = sizeof (inbuf) - inbuf_len; 350 int amount = sizeof (inbuf) - inbuf_len;
359 351
360 if (!amount) 352 if (!amount)
361 { 353 {
362 // input buffer full 354 // input buffer full
363 socket_ev.poll (socket_ev.poll () & ~PE_R); 355 LOG (llevError, "input buffer overflow.");
356 destroy ();
364 return; 357 return;
365 } 358 }
366 359
360 if (ws_version)
361 {
362 if (ws_inbuf_len + 4096 > ws_inbuf_alloc)
363 ws_inbuf = (uint8 *)realloc (ws_inbuf, ws_inbuf_alloc += 4096);
364
365 int len = read (fd, ws_inbuf + ws_inbuf_len, ws_inbuf_alloc - ws_inbuf_len);
366
367 if (len > 0)
368 {
369 ws_inbuf_len += len;
370
371 if (ws_inbuf_len < 2 + 4) // 6 is minimum length: op, len, mask
372 return;
373
374 int d = 2;
375 int o = ws_inbuf [0] & 15;
376 int l = ws_inbuf [1] & 127;
377
378 if (l == 126)
379 {
380 l = (ws_inbuf [2] << 8) | ws_inbuf [3];
381 d += 2;
382 }
383 else if (l == 127)
384 {
385 if (ws_inbuf_len < 2 + 8)
386 return;
387
388 // we don't do extra long frames, if a browser wants to send >2**32 bytes,
389 // there are bigger issues to fix.
390 l = (ws_inbuf [6] << 24)
391 | (ws_inbuf [7] << 16)
392 | (ws_inbuf [8] << 8)
393 | ws_inbuf [9];
394 d += 8;
395 }
396
397 // we only continue if we have a complete frame
398 if (ws_inbuf_len < d + 4 + l)
399 return;
400
401 switch (o)
402 {
403 case 0: o = ws_inbuf_type; break; // continuation
404 case 1: ws_inbuf_type = 1; break; // utf-8
405 case 2: ws_inbuf_type = 2; break; // binary
406 }
407
408 if (l > amount)
409 {
410 // input buffer full
411 LOG (llevError, "input buffer overflow (ws).");
412 destroy ();
413 return;
414 }
415
416 for (int i = 0; i < l; ++i)
417 inbuf [inbuf_len + i] = ws_inbuf [d + 4 + i] ^ ws_inbuf [d + (i & 3)];
418
419 // remove frame
420 ws_inbuf_len -= d + 4 + l;
421 memmove (ws_inbuf, ws_inbuf + d + 4 + l, ws_inbuf_len);
422
423 switch (o)
424 {
425 case 1: // utf-8
426 //TODO
427 break;
428 case 2: // binary
429 break;
430
431 case 9: // ping
432 {
433 // send pong - we assume ping messages are <64k
434 // as we can't handle >10k at the moment anyway.
435 uint8 hdr [] = { 0x8a, 126, l >> 8, l };
436 send (hdr, sizeof (hdr));
437 send (inbuf + inbuf_len, l);
438 }
439 return;
440
441 case 10: // pong
442 return;
443
444 case 8: // close
445 default:
446 destroy ();
447 return;
448 }
449
450 amount = l;
451 }
452 else
453 amount = -1;
454 }
455 else
367 amount = read (fd, inbuf + inbuf_len, amount); 456 amount = read (fd, inbuf + inbuf_len, amount);
368 457
369 if (!amount) 458 if (!amount)
370 { 459 {
371 destroy (); 460 destroy ();
372 return; 461 return;
383 // should not be here, normally 472 // should not be here, normally
384 } 473 }
385 else 474 else
386 { 475 {
387 inbuf_len += amount; 476 inbuf_len += amount;
388 477 inbuf_handle ();
389 cmd_ev.start ();
390 } 478 }
391 } 479 }
392}
393
394// called whenever we have additional commands to process
395void
396client::cmd_cb (iw &w)
397{
398 if (handle_packet ())
399 w.start ();
400 else
401 flush ();
402} 480}
403 481
404/******************************************************************************* 482/*******************************************************************************
405 * 483 *
406 * Start of write related routines. 484 * Start of write related routines.
462client::send_packet (packet &sl) 540client::send_packet (packet &sl)
463{ 541{
464 if (destroyed ()) 542 if (destroyed ())
465 return; 543 return;
466 544
467 if (sl.length () >= MAXSOCKBUF) 545 if (sl.length () > MAXSOCKBUF)
468 { 546 {
469 LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ()); 547 LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ());
470 /* Almost certainly we've overflowed a buffer, so quit now to make 548 /* Almost certainly we've overflowed a buffer, so quit now to make
471 * it easier to debug. 549 * it easier to debug.
472 */ 550 */
474 } 552 }
475 553
476 if (!sl.length ()) 554 if (!sl.length ())
477 return; 555 return;
478 556
557 if (ws_version == 8)
558 {
559 uint8 hdr [4] = { 0x81, 126, sl.length () >> 8, sl.length () };
560 // TODO: utf-8 encoding
561 send (hdr, 4);
562 send (sl.buf_ + sl.hdrlen, sl.cur - sl.buf_ - sl.hdrlen);
563 }
564 else if (ws_version == 13)
565 {
566 uint8 hdr [4] = { 0x82, 126, sl.length () >> 8, sl.length () };
567 send (hdr, 4);
568 send (sl.buf_ + sl.hdrlen, sl.cur - sl.buf_ - sl.hdrlen);
569 }
570 else
571 {
479 assert (sl.hdrlen == 2); 572 assert (sl.hdrlen == 2);
480 573
481 sl.buf_ [0] = sl.length () >> 8; 574 sl.buf_ [0] = sl.length () >> 8;
482 sl.buf_ [1] = sl.length () ; 575 sl.buf_ [1] = sl.length () ;
483 576
484 send (sl.buf_, sl.length () + sl.hdrlen); 577 send (sl.buf_, sl.length () + sl.hdrlen);
578 }
485} 579}
486 580
487void 581void
488client::send_packet (const char *buf, int len) 582client::send_packet (const char *buf, int len)
489{ 583{
511 605
512 send_packet (sl); 606 send_packet (sl);
513} 607}
514 608
515void 609void
610client::send_msg (int color, const char *type, const char *msg)
611{
612 if (!msg || !type) // it can happen (for example, missing attack messages cause this)
613 {
614 LOG (logBacktrace | llevError, "send_msg(%d,%p,%p) called with NULL msg or type.\n", color, type, msg);
615 return;
616 }
617
618 int len = strlen (msg);
619
620 if (!(color & NDI_VERBATIM)
621 && (msg_is_special (msg)
622 || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128)))
623 cfperl_send_msg (this, color, type, msg);
624 else
625 send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg);
626}
627
628void
516client::send_drawinfo (const char *msg, int flags) 629client::send_drawinfo (const char *msg, int flags)
517{ 630{
518 send_packet_printf ("drawinfo %d %s", flags, msg); 631 send_msg (flags, "log", msg);
519}
520
521void
522client::send_msg (int color, const char *type, const char *msg)
523{
524 if (can_msg)
525 send_packet_printf ("msg %d %s %s", color, type, msg);
526 else if (color < 0)
527 return; // client cannot handle this
528 else if (strchr (msg, '<') || strchr (msg, '&'))
529 {
530 //TODO: should escape/modify to old syntax
531 send_packet_printf ("drawinfo %d %s", color, msg);
532 }
533 else
534 send_packet_printf ("drawinfo %d %s", color, msg);
535} 632}
536 633
537/*********************************************************************** 634/***********************************************************************
538 * 635 *
539 * packet functions/utilities 636 * packet functions/utilities
549 *cur++ = ' '; 646 *cur++ = ' ';
550} 647}
551 648
552packet &packet::operator <<(const ber32 v) 649packet &packet::operator <<(const ber32 v)
553{ 650{
554 enum { maxlen = 32 / 7 + 1}; 651 enum { maxlen = 32 / 7 + 1 };
555 uint8 buf[maxlen]; 652 uint8 buf[maxlen];
556 uint8 *p = buf + maxlen; 653 uint8 *p = buf + maxlen;
557 uint32 val = v.val; 654 uint32 val = v.val;
558 655
559 *--p = val & 0x7F; 656 *--p = val & 0x7F;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines