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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines