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.20 by root, Thu Dec 14 21:46:34 2006 UTC vs.
Revision 1.51 by root, Sat Jul 28 00:15:03 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines