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.21 by root, Fri Dec 15 00:14:13 2006 UTC vs.
Revision 1.46 by root, Sun Jun 10 04:44:21 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4 Copyright (C) 1992 Frank Tore Johansen 5 * Copyright (©) 1992,2007 Frank Tore Johansen
5 6 *
6 This program is free software; you can redistribute it and/or modify 7 * Crossfire TRT is free software; you can redistribute it and/or modify it
7 it under the terms of the GNU General Public License as published by 8 * under the terms of the GNU General Public License as published by the Free
8 the Free Software Foundation; either version 2 of the License, or 9 * Software Foundation; either version 2 of the License, or (at your option)
9 (at your option) any later version. 10 * any later version.
10 11 *
11 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, but
12 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
14 GNU General Public License for more details. 15 * for more details.
15 16 *
16 You should have received a copy of the GNU General Public License 17 * You should have received a copy of the GNU General Public License along
17 along with this program; if not, write to the Free Software 18 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
18 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19
20 The author can be reached via e-mail to mark@pyramid.com
21*/
22
23/**
24 * \file
25 * Low-level socket-related functions.
26 * 20 *
27 * \date 2003-12-02 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
28 *
29 * Contains some base functions that both the client and server
30 * can use. As such, depending what we are being compiled for will
31 * determine what we can include. the client is designed have
32 * CFCLIENT defined as part of its compile flags.
33 */ 22 */
34 23
35using namespace std; 24using namespace std;
36 25
37#include <global.h> 26#include <global.h>
38#include <newclient.h>
39#include <sproto.h> 27#include <sproto.h>
40#include <cstdarg> 28#include <cstdarg>
41 29
42#ifdef __linux__ 30#if HAVE_TCP_INFO
43# include <sys/types.h> 31# include <sys/types.h>
44# include <sys/socket.h> 32# include <sys/socket.h>
45# include <netinet/in.h> 33# include <netinet/in.h>
46# define TCP_HZ 1000 // sorry...
47# include <netinet/tcp.h> 34# include <netinet/tcp.h>
48#endif 35#endif
49 36
50// use a really low timeout, as it doesn't cost any bandwidth, and you can 37// disconnect a socket after this many seconds without an ack
51// easily die in 20 seconds...
52#define SOCKET_TIMEOUT1 10 38#define SOCKET_TIMEOUT 8.
53#define SOCKET_TIMEOUT2 20
54 39
40// force a packet when idle for more than this many seconds,
41// forcing an ack regularly.
42#define IDLE_PING 2.
43
55void 44void
56client_socket::flush () 45client::flush ()
57{ 46{
58#ifdef __linux__ 47 if (destroyed ())
48 return;
49
50#if HAVE_TCP_INFO
51 // check about once per second, spread evenly over all clients
52 if (!((pticks + fd) & 7))
53 {
59 // check time of last ack, and, if too old, kill connection 54 // check time of last ack, and, if too old, kill connection
60 struct tcp_info tcpi; 55 struct tcp_info tcpi;
61 socklen_t len = sizeof (tcpi); 56 socklen_t len = sizeof (tcpi);
62 57
63 if (!getsockopt (fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi)) 58 if (!getsockopt (fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi))
64 { 59 {
65 unsigned int diff = tcpi.tcpi_last_ack_recv - tcpi.tcpi_last_data_sent; 60 if (tcpi.tcpi_snd_mss)
61 mss = tcpi.tcpi_snd_mss;
66 62
67 rtt = tcpi.tcpi_rtt; 63 rtt = tcpi.tcpi_rtt;
68 rttvar = tcpi.tcpi_rttvar; 64 rttvar = tcpi.tcpi_rttvar;
69 65
70 if (tcpi.tcpi_unacked && SOCKET_TIMEOUT1 * TCP_HZ < diff && diff < 0x80000000UL // ack delayed for 20s 66 if (tcpi.tcpi_last_ack_recv > int (SOCKET_TIMEOUT * 1000))
71 && SOCKET_TIMEOUT2 * TCP_HZ < tcpi.tcpi_last_data_sent) // no data sent for 10s
72 { 67 {
68 send_msg (NDI_RED, "connection-timeout", "safety disconnect due to tcp/ip timeout (no packets received)");
69 write_outputbuffer ();
70
73 LOG (llevDebug, "Connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd, 71 LOG (llevDebug, "connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd,
74 (unsigned) tcpi.tcpi_last_ack_recv, (unsigned) tcpi.tcpi_last_data_sent, (unsigned) tcpi.tcpi_unacked); 72 (unsigned)tcpi.tcpi_last_ack_recv, (unsigned)tcpi.tcpi_last_data_sent, (unsigned)tcpi.tcpi_unacked);
75 status = Ns_Dead; 73 destroy ();
74 }
76 } 75 }
77 } 76 }
78#endif 77#endif
79 78
80 /** 79 /**
82 * 81 *
83 * When the socket is clear to write, and we have backlogged data, this 82 * When the socket is clear to write, and we have backlogged data, this
84 * is called to write it out. 83 * is called to write it out.
85 */ 84 */
86 85
87 if (!outputbuffer.len || socket_ev.poll () & PE_W) 86 // write a nop to the socket at least every IDLE_NOP seconds.
87 if (!outputbuffer.len)
88 {
89 if (last_send + IDLE_PING <= NOW)
90 {
91 // this is a bit ugly, but map1/map1a seem to be the only
92 // nop'able commands and they are quite small.
93 packet sl (mapmode == Map1Cmd ? "map1" : "map1a");
94 send_packet (sl);
95 }
96 else
97 return;
98 }
99
100 if (socket_ev.poll () & PE_W)
88 return; 101 return;
89 102
103 last_send = NOW;
90 write_outputbuffer (); 104 write_outputbuffer ();
91} 105}
92 106
93void 107void
94client_socket::write_outputbuffer () 108client::write_outputbuffer ()
95{ 109{
96 while (outputbuffer.len) 110 while (outputbuffer.len)
97 { 111 {
98 int res = write (fd, outputbuffer.data + outputbuffer.start, 112 int res = write (fd, outputbuffer.data + outputbuffer.start,
99 min (outputbuffer.len, SOCKETBUFSIZE - outputbuffer.start)); 113 min (outputbuffer.len, SOCKETBUFSIZE - outputbuffer.start));
104 /* wrap back to start of buffer */ 118 /* wrap back to start of buffer */
105 if (outputbuffer.start == SOCKETBUFSIZE) 119 if (outputbuffer.start == SOCKETBUFSIZE)
106 outputbuffer.start = 0; 120 outputbuffer.start = 0;
107 121
108 outputbuffer.len -= res; 122 outputbuffer.len -= res;
109#ifdef CS_LOGSTATS
110 cst_tot.obytes += res;
111 cst_lst.obytes += res;
112#endif
113 } 123 }
114 else if (res == 0) 124 else if (res == 0)
115 { 125 {
116 LOG (llevError, "socket write failed, connection closed.\n"); 126 LOG (llevError, "socket write failed, connection closed.\n");
117 status = Ns_Dead; 127 destroy ();
118 return; 128 return;
119 } 129 }
120 else if (errno == EINTR) 130 else if (errno == EINTR)
121 { 131 {
122 // just retry 132 // just retry
129 return; 139 return;
130 } 140 }
131 else 141 else
132 { 142 {
133 LOG (llevError, "socket write failed: %s\n", strerror (errno)); 143 LOG (llevError, "socket write failed: %s\n", strerror (errno));
134 status = Ns_Dead; 144 destroy ();
135 return; 145 return;
136 } 146 }
137 } 147 }
138 148
139 socket_ev.poll (socket_ev.poll () & ~PE_W); 149 socket_ev.poll (socket_ev.poll () & ~PE_W);
140}
141
142/***********************************************************************
143 *
144 * packet functions/utilities
145 *
146 **********************************************************************/
147
148packet &packet::operator <<(const data &v)
149{
150 if (room () < v.len)
151 reset ();
152 else
153 {
154 if (v.len)
155 {
156 memcpy (cur, v.ptr, v.len);
157 cur += v.len;
158 }
159 }
160
161 return *this;
162}
163
164packet &packet::operator <<(const data8 &v)
165{
166 unsigned int len = min (v.len, 0x00FF);
167 return *this << uint8 (len) << data (v.ptr, len);
168}
169
170packet &packet::operator <<(const data16 &v)
171{
172 unsigned int len = min (v.len, 0xFFFF);
173 return *this << uint16 (len) << data (v.ptr, len);
174}
175
176packet &packet::operator <<(const char *v)
177{
178 return *this << data (v, strlen (v ? v : 0));
179}
180
181void
182packet::printf (const char *format, ...)
183{
184 int size = room ();
185
186 va_list ap;
187 va_start (ap, format);
188 int len = vsnprintf ((char *)cur, size, format, ap);
189 va_end (ap);
190
191 if (len >= size)
192 return reset ();
193
194 cur += len;
195} 150}
196 151
197/****************************************************************************** 152/******************************************************************************
198 * 153 *
199 * Start of read routines. 154 * Start of read routines.
200 * 155 *
201 ******************************************************************************/ 156 ******************************************************************************/
202 157
203int 158int
204client_socket::read_packet () 159client::next_packet ()
205{ 160{
206 for (;;)
207 {
208 if (inbuf_len >= 2) 161 if (inbuf_len >= 2)
209 { 162 {
210 unsigned int pkt_len = (inbuf [0] << 8) | inbuf [1]; 163 int pkt_len = (inbuf [0] << 8) | inbuf [1];
211 164
212 if (inbuf_len >= 2 + pkt_len) 165 if (inbuf_len >= 2 + pkt_len)
213 return pkt_len + 2; 166 return 2 + pkt_len;
167
168 if (inbuf_len == sizeof (inbuf))
214 } 169 {
170 send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED);
171 destroy ();
172 return -1;
173 }
174 }
175
176 return 0;
177}
178
179void
180client::skip_packet (int len)
181{
182 inbuf_len -= len;
183 memmove (inbuf, inbuf + len, inbuf_len);
184}
185
186/*****************************************************************************
187 * Start of command dispatch area.
188 * The commands here are protocol commands.
189 ****************************************************************************/
190
191// SocketCommand, PlayingCommand, should not exist with those ugly casts
192#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 |
194
195/**
196 * Dispatch table for the server.
197 */
198static struct packet_type packets[] = {
199 {"ncom", PC(NewPlayerCmd) PF_PLAYING | PF_COMMAND6 },
200 {"command", PC(PlayerCmd) PF_PLAYING | PF_COMMAND0 },
201
202 {"examine", PC(ExamineCmd) PF_PLAYING },
203 {"ex", PC(ExCmd) PF_PLAYING },
204 {"apply", PC(ApplyCmd) PF_PLAYING },
205 {"lookat", PC(LookAt) PF_PLAYING },
206 {"lock", PC(LockItem) PF_PLAYING },
207 {"mark", PC(MarkItem) PF_PLAYING },
208 {"move", PC(MoveCmd) PF_PLAYING },
209 {"ext", PC(ExtCmd) 0 }, // CF+
210 {"mapredraw", PC(MapRedrawCmd) 0 },
211 {"mapinfo", PC(MapInfoCmd) 0 }, // CF+
212
213 {"reply", SC(ReplyCmd) 0 },
214 {"exti", SC(ExtiCmd) 0 }, // CF+
215 {"addme", SC(AddMeCmd) 0 },
216 {"askface", SC(AskFaceCmd) 0 },
217 {"requestinfo", SC(RequestInfo) 0 },
218 {"setfacemode", SC(SetFaceMode) 0 },
219 {"setsound", SC(SetSound) 0 },
220 {"setup", SC(SetUp) 0 },
221 {"version", SC(VersionCmd) 0 },
222 {"toggleextendedinfos", SC(ToggleExtendedInfos) 0 }, /*Added: tchize */
223 {"toggleextendedtext", SC(ToggleExtendedText) 0 }, /*Added: tchize */
224 {"asksmooth", SC(AskSmooth) 0 }, /*Added: tchize (smoothing technologies) */
225};
226
227bool
228client::may_execute (const packet_type *pkt) const
229{
230 return (!(pkt->flags & PF_PLAYER) || pl)
231 && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING);
232}
233
234// HACK: some commands currently should be executed
235// even when the player is frozen. this hack detects
236// those commands. it should be folded into may_execute,
237// but kept seperate to emphasise the hack aspect, i.e.
238// do it better, then remove.
239static bool
240always_immediate (const client *ns, const packet_type *pkt, const char *data, int len)
241{
242 if (!(pkt->flags & (PF_COMMAND0 | PF_COMMAND6)))
243 return false;
244
245 if (!ns->pl || !ns->pl->ob || !ns->pl->ob->map)
246 return false;
247
248 if (pkt->flags & PF_COMMAND6)
249 {
250 data += 6;
251 len -= 6;
252 }
253
254 if (len > 4 && !strncmp (data, "say " , 4))
255 return true;
256 if (len > 5 && !strncmp (data, "chat ", 5))
257 return true;
258
259 return false;
260}
261
262void
263client::execute (const packet_type *pkt, char *data, int datalen)
264{
265 if (may_execute (pkt) || always_immediate (this, pkt, data, datalen))
266 {
267 //TODO: only one format
268 if (pkt->flags & PF_PLAYER)
269 ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl);
270 else
271 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this);
272 }
273 else
274 send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED, pkt->name);
275}
276
277bool
278client::handle_packet ()
279{
280 int pkt_len = next_packet ();
281
282 if (!pkt_len)
283 return false;
284 else if (pkt_len < 0)
285 {
286 LOG (llevError, "read error on player %s\n",
287 pl && pl->ob ? &pl->ob->name : "[anonymous]");
288 destroy ();
289 return false;
290 }
291
292 inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */
293
294 /* First, break out beginning word. There are at least
295 * a few commands that do not have any paremeters. If
296 * we get such a command, don't worry about trying
297 * to break it up.
298 */
299 int datalen;
300 char *data = strchr ((char *)inbuf + 2, ' ');
301
302 if (data)
303 {
304 *data++ = 0;
305 datalen = pkt_len - (data - (char *)inbuf);
306 }
307 else
308 {
309 data = (char *)inbuf + 2; // better read garbage than segfault
310 datalen = 0;
311 }
312
313 for (packet_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt)
314 if (!strcmp ((char *)inbuf + 2, pkt->name))
315 {
316 if (pkt->flags & PF_PLAYER && !always_immediate (this, pkt, data, datalen))
317 queue_command (pkt, data, datalen);
318 else
319 execute (pkt, data, datalen);
320
321 goto next_packet;
322 }
323
324 // 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);
326next_packet:
327 skip_packet (pkt_len);
328
329 // input buffer has space again
330 socket_ev.poll (socket_ev.poll () | PE_R);
331
332 return true;
333}
334
335// callback called when socket is either readable or writable
336void
337client::socket_cb (iow &w, int got)
338{
339 //TODO remove when we have better socket cleanup logic
340 if (destroyed ())
341 {
342 socket_ev.poll (0);
343 return;
344 }
345
346 if (got & PE_W)
347 {
348 write_outputbuffer ();
349
350 if (!outputbuffer.len)
351 socket_ev.poll (socket_ev.poll () & ~PE_W);
352 }
353
354 if (got & PE_R)
355 {
356 //TODO: rate-limit tcp connection in better ways, important
215 357
216 int amount = sizeof (inbuf) - inbuf_len; 358 int amount = sizeof (inbuf) - inbuf_len;
217 359
218 if (amount <= 0) 360 if (!amount)
219 { 361 {
220 LOG (llevError, "packet too large");//TODO 362 // input buffer full
363 socket_ev.poll (socket_ev.poll () & ~PE_R);
221 return -1; 364 return;
222 } 365 }
223 366
224 amount = read (fd, inbuf + inbuf_len, amount); 367 amount = read (fd, inbuf + inbuf_len, amount);
225 368
226 if (!amount) 369 if (!amount)
227 { 370 {
228 status = Ns_Dead; 371 destroy ();
229 return -1; 372 return;
230 } 373 }
231 else if (amount < 0) 374 else if (amount < 0)
232 { 375 {
233 if (errno != EAGAIN && errno != EINTR) 376 if (errno != EAGAIN && errno != EINTR)
234 { 377 {
235 LOG (llevError, "read error: %s\n", strerror (errno)); 378 LOG (llevError, "read error: %s\n", strerror (errno));
379 destroy ();
236 return -1; 380 return;
237 } 381 }
238 382
239 return 0; 383 // should not be here, normally
384 }
385 else
240 } 386 {
241
242 inbuf_len += amount; 387 inbuf_len += amount;
243 388
244 cst_tot.ibytes += amount; 389 cmd_ev.start ();
245 cst_lst.ibytes += amount; 390 }
246 } 391 }
247} 392}
248 393
394// called whenever we have additional commands to process
249void 395void
250client_socket::skip_packet (int len) 396client::cmd_cb (iw &w)
251{ 397{
252 inbuf_len -= len; 398 if (handle_packet ())
253 memmove (inbuf, inbuf + len, inbuf_len); 399 w.start ();
400 else
401 flush ();
254} 402}
255 403
256/******************************************************************************* 404/*******************************************************************************
257 * 405 *
258 * Start of write related routines. 406 * Start of write related routines.
264 * 412 *
265 * ns is the socket we are adding the data to, buf is the start of the 413 * ns is the socket we are adding the data to, buf is the start of the
266 * data, and len is the number of bytes to add. 414 * data, and len is the number of bytes to add.
267 */ 415 */
268void 416void
269client_socket::send (void *buf_, int len) 417client::send (void *buf_, int len)
270{ 418{
271 char *buf = (char *)buf_; 419 char *buf = (char *)buf_;
272 char *pos = buf;
273 int amt = 0;
274 420
275 if (status == Ns_Dead || !buf) 421 if (destroyed () || !buf)
276 {
277 LOG (llevDebug, "Write_To_Socket called with dead socket\n");
278 return; 422 return;
279 }
280 423
281 if ((len + outputbuffer.len) > SOCKETBUFSIZE) 424 if (len + outputbuffer.len > SOCKETBUFSIZE)
282 { 425 {
283 LOG (llevDebug, "Socket on fd %d has overrun internal buffer - marking as dead\n", fd); 426 LOG (llevDebug, "socket on fd %d has overrun internal buffer - marking as dead\n", fd);
284 status = Ns_Dead; 427 // shutdown the socket, this is safer than destroying it immediately
428 // as lots of code in the callchain might still access the map etc.
429 shutdown (fd, SHUT_RDWR);
285 return; 430 return;
286 } 431 }
287 432
288 int avail, end; 433 int avail, end;
289 434
307 } 452 }
308 453
309 outputbuffer.len += len; 454 outputbuffer.len += len;
310} 455}
311 456
312void
313client_socket::socket_cb (iow &w, int got)
314{
315 write_outputbuffer ();
316
317 if (!outputbuffer.len)
318 socket_ev.poll (socket_ev.poll () & ~PE_W);
319}
320
321/** 457/**
322 * Takes a string of data, and writes it out to the socket. A very handy 458 * Takes a string of data, and writes it out to the socket. A very handy
323 * shortcut function. 459 * shortcut function.
324 */ 460 */
325void 461void
326client_socket::send_packet (packet &sl) 462client::send_packet (packet &sl)
327{ 463{
328 if (status == Ns_Dead) 464 if (destroyed ())
329 return; 465 return;
330 466
331 if (sl.length () >= MAXSOCKBUF) 467 if (sl.length () >= MAXSOCKBUF)
332 { 468 {
333 LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ()); 469 LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ());
347 483
348 send (sl.buf_, sl.length () + sl.hdrlen); 484 send (sl.buf_, sl.length () + sl.hdrlen);
349} 485}
350 486
351void 487void
352client_socket::send_packet (const char *buf, int len) 488client::send_packet (const char *buf, int len)
353{ 489{
354 packet sl; 490 packet sl;
355 491
356 sl << data (buf, len); 492 sl << data (buf, len);
357 send_packet (sl); 493 send_packet (sl);
358} 494}
359 495
360void 496void
361client_socket::send_packet (const char *buf) 497client::send_packet (const char *buf)
362{ 498{
363 send_packet (buf, strlen (buf)); 499 send_packet (buf, strlen (buf));
364} 500}
365 501
502void
503client::send_packet_printf (const char *format, ...)
504{
505 packet sl;
506
507 va_list ap;
508 va_start (ap, format);
509 sl.vprintf (format, ap);
510 va_end (ap);
511
512 send_packet (sl);
513}
514
515void
516client::send_drawinfo (const char *msg, int flags)
517{
518 send_packet_printf ("drawinfo %d %s", flags, 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}
536
366/****************************************************************************** 537/***********************************************************************
367 * 538 *
368 * statistics logging functions. 539 * packet functions/utilities
369 * 540 *
370 ******************************************************************************/ 541 **********************************************************************/
371 542
372#ifdef CS_LOGSTATS 543packet::packet (const char *name)
373
374/* cst_tot is for the life of the server, cst_last is for the last series of
375 * stats
376 */
377CS_Stats cst_tot, cst_lst;
378
379/**
380 * Writes out the gathered stats. We clear cst_lst.
381 */
382void
383write_cs_stats (void)
384{ 544{
385 time_t now = time (NULL); 545 reset ();
386 546
387 /* If no connections recently, don't both to log anything */ 547 int len = strlen (name);
388 if (cst_lst.ibytes == 0 && cst_lst.obytes == 0) 548 memcpy (cur, name, len); cur += len;
389 return; 549 *cur++ = ' ';
390
391 /* CSSTAT is put in so scripts can easily find the line */
392 LOG (llevInfo, "CSSTAT: %.16s tot %d %d %d %d inc %d %d %d %d\n",
393 ctime (&now), cst_tot.ibytes, cst_tot.obytes, cst_tot.max_conn,
394 now - cst_tot.time_start, cst_lst.ibytes, cst_lst.obytes, cst_lst.max_conn, now - cst_lst.time_start);
395 cst_lst.ibytes = 0;
396 cst_lst.obytes = 0;
397 cst_lst.time_start = now;
398} 550}
399#endif
400 551
552packet &packet::operator <<(const ber32 v)
553{
554 enum { maxlen = 32 / 7 + 1};
555 uint8 buf[maxlen];
556 uint8 *p = buf + maxlen;
557 uint32 val = v.val;
558
559 *--p = val & 0x7F;
560
561 while (val > 0x7F)
562 {
563 val >>= 7;
564 *--p = (val & 0x7F) | 0x80;
565 }
566
567 return *this << data (p, buf + maxlen - p);
568}
569
570packet &packet::operator <<(const data &v)
571{
572 if (room () < v.len)
573 reset ();
574 else
575 {
576 if (v.len)
577 {
578 memcpy (cur, v.ptr, v.len);
579 cur += v.len;
580 }
581 }
582
583 return *this;
584}
585
586packet &packet::operator <<(const data8 &v)
587{
588 unsigned int len = min (v.len, 0x00FF);
589 return *this << uint8 (len) << data (v.ptr, len);
590}
591
592packet &packet::operator <<(const data16 &v)
593{
594 unsigned int len = min (v.len, 0xFFFF);
595 return *this << uint16 (len) << data (v.ptr, len);
596}
597
598packet &packet::operator <<(const char *v)
599{
600 return *this << data (v, strlen (v ? v : 0));
601}
602
603void
604packet::vprintf (const char *format, va_list ap)
605{
606 int size = room ();
607
608 int len = vsnprintf ((char *)cur, size, format, ap);
609
610 if (len >= size)
611 return reset ();
612
613 cur += len;
614}
615

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines