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.14 by root, Thu Dec 14 01:21:58 2006 UTC vs.
Revision 1.29 by root, Thu Dec 21 23:37:06 2006 UTC

… …
33 */ 33 */
34 34
35using namespace std; 35using namespace std;
36 36
37#include <global.h> 37#include <global.h>
38#include <newclient.h>
39#include <sproto.h> 38#include <sproto.h>
40#include <cstdarg> 39#include <cstdarg>
41 40
42#ifdef __linux__ 41#ifdef __linux__
43# include <sys/types.h> 42# include <sys/types.h>
44# include <sys/socket.h> 43# include <sys/socket.h>
45# include <netinet/in.h> 44# include <netinet/in.h>
46# define TCP_HZ 1000 // sorry...
47# include <netinet/tcp.h> 45# include <netinet/tcp.h>
48#endif 46#endif
49 47
50// use a really low timeout, as it doesn't cost any bandwidth, and you can 48// use a really low timeout, as it doesn't cost any bandwidth, and you can
51// easily die in 20 seconds... 49// easily die in 20 seconds...
52#define SOCKET_TIMEOUT1 10 50#define SOCKET_TIMEOUT1 10 * 1000
53#define SOCKET_TIMEOUT2 20 51#define SOCKET_TIMEOUT2 20 * 1000
54 52
55void 53void
56Socket_Flush (NewSocket * ns) 54client::flush ()
57{ 55{
56 if (destroyed ())
57 return;
58
58#ifdef __linux__ 59#ifdef __linux__
59 // check time of last ack, and, if too old, kill connection 60 // check time of last ack, and, if too old, kill connection
60 struct tcp_info tcpi; 61 struct tcp_info tcpi;
61 socklen_t len = sizeof (tcpi); 62 socklen_t len = sizeof (tcpi);
62 63
63 if (!getsockopt (ns->fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi)) 64 if (!getsockopt (fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi))
64 { 65 {
65 unsigned int diff = tcpi.tcpi_last_ack_recv - tcpi.tcpi_last_data_sent; 66 unsigned int diff = tcpi.tcpi_last_ack_recv - tcpi.tcpi_last_data_sent;
66 67
68 rtt = tcpi.tcpi_rtt;
69 rttvar = tcpi.tcpi_rttvar;
70
67 if (tcpi.tcpi_unacked && SOCKET_TIMEOUT1 * TCP_HZ < diff && diff < 0x80000000UL // ack delayed for 20s 71 if (tcpi.tcpi_unacked && SOCKET_TIMEOUT1 < diff && diff < 0x80000000UL // ack delayed for 20s
68 && SOCKET_TIMEOUT2 * TCP_HZ < tcpi.tcpi_last_data_sent) // no data sent for 10s 72 && SOCKET_TIMEOUT2 < tcpi.tcpi_last_data_sent) // no data sent for 10s
69 { 73 {
70 LOG (llevDebug, "Connection on fd %d closed due to ack timeout (%u/%u/%u)\n", ns->fd, 74 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); 75 (unsigned) tcpi.tcpi_last_ack_recv, (unsigned) tcpi.tcpi_last_data_sent, (unsigned) tcpi.tcpi_unacked);
72 ns->status = Ns_Dead; 76 destroy ();
73 } 77 }
74 } 78 }
75
76 int val;
77
78 val = 0; setsockopt (ns->fd, IPPROTO_TCP, TCP_CORK, &val, sizeof (val));
79 val = 1; setsockopt (ns->fd, IPPROTO_TCP, TCP_CORK, &val, sizeof (val));
80#endif 79#endif
81}
82 80
83/*********************************************************************** 81 /**
84 * 82 * Writes data to socket.
85 * packet functions/utilities 83 *
86 * 84 * When the socket is clear to write, and we have backlogged data, this
87 **********************************************************************/ 85 * is called to write it out.
86 */
88 87
89packet &packet::operator <<(const data &v) 88 if (!outputbuffer.len || socket_ev.poll () & PE_W)
89 return;
90
91 write_outputbuffer ();
92}
93
94void
95client::write_outputbuffer ()
90{ 96{
91 if (v.len) 97 while (outputbuffer.len)
92 {
93 memcpy (buf + len, v.ptr, v.len);
94 len += v.len;
95 } 98 {
99 int res = write (fd, outputbuffer.data + outputbuffer.start,
100 min (outputbuffer.len, SOCKETBUFSIZE - outputbuffer.start));
96 101
97 return *this; 102 if (res > 0)
98} 103 {
104 outputbuffer.start += res;
105 /* wrap back to start of buffer */
106 if (outputbuffer.start == SOCKETBUFSIZE)
107 outputbuffer.start = 0;
99 108
100packet &packet::operator <<(const data8 &v) 109 outputbuffer.len -= res;
101{ 110#ifdef CS_LOGSTATS
102 unsigned int len = min (v.len, 0x00FF); 111 cst_tot.obytes += res;
103 return *this << uint8 (len) << data (v.ptr, len); 112 cst_lst.obytes += res;
104} 113#endif
114 }
115 else if (res == 0)
116 {
117 LOG (llevError, "socket write failed, connection closed.\n");
118 destroy ();
119 return;
120 }
121 else if (errno == EINTR)
122 {
123 // just retry
124 }
125 else if (errno == EAGAIN)
126 {
127 // delay till ready
128 socket_ev.poll (socket_ev.poll () | PE_W);
129 socket_ev.start ();
130 return;
131 }
132 else
133 {
134 LOG (llevError, "socket write failed: %s\n", strerror (errno));
135 destroy ();
136 return;
137 }
138 }
105 139
106packet &packet::operator <<(const data16 &v) 140 socket_ev.poll (socket_ev.poll () & ~PE_W);
107{
108 unsigned int len = min (v.len, 0xFFFF);
109 return *this << uint16 (len) << data (v.ptr, len);
110}
111
112packet &packet::operator <<(const char *v)
113{
114 return *this << data (v, strlen (v ? v : 0));
115}
116
117void
118packet::printf (const char *format, ...)
119{
120 va_list ap;
121 va_start (ap, format);
122
123 len += vsnprintf ((char *)buf + len, MAXSOCKBUF, format, ap);
124
125 va_end (ap);
126} 141}
127 142
128/****************************************************************************** 143/******************************************************************************
129 * 144 *
130 * Start of read routines. 145 * Start of read routines.
131 * 146 *
132 ******************************************************************************/ 147 ******************************************************************************/
133 148
134int 149int
135NewSocket::read_packet () 150client::next_packet ()
136{ 151{
137 for (;;)
138 {
139 if (inbuf_len >= 2) 152 if (inbuf_len >= 2)
140 { 153 {
141 unsigned int pkt_len = (inbuf [0] << 8) | inbuf [1]; 154 int pkt_len = (inbuf [0] << 8) | inbuf [1];
142 155
143 if (inbuf_len >= 2 + pkt_len) 156 if (inbuf_len >= 2 + pkt_len)
144 return pkt_len + 2; 157 return 2 + pkt_len;
158
159 if (inbuf_len == sizeof (inbuf))
145 } 160 {
161 send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED);
162 destroy ();
163 return -1;
164 }
165 }
166
167 return 0;
168}
169
170void
171client::skip_packet (int len)
172{
173 inbuf_len -= len;
174 memmove (inbuf, inbuf + len, inbuf_len);
175}
176
177/*****************************************************************************
178 * Start of command dispatch area.
179 * The commands here are protocol commands.
180 ****************************************************************************/
181
182// SocketCommand, PlayingCommand, should not exist with those ugly casts
183#define SC(cb) (void *)static_cast<void (*)(char *, int, client *)>(cb),
184#define PC(cb) (void *)static_cast<void (*)(char *, int, player *)>(cb), PF_PLAYER |
185
186/**
187 * Dispatch table for the server.
188 */
189static struct packet_type packets[] = {
190 {"ncom", PC(NewPlayerCmd) PF_PLAYING },
191 {"command", PC(PlayerCmd) PF_PLAYING },
192
193 {"examine", PC(ExamineCmd) PF_PLAYING },
194 {"apply", PC(ApplyCmd) PF_PLAYING },
195 {"lookat", PC(LookAt) PF_PLAYING },
196 {"lock", PC(LockItem) PF_PLAYING },
197 {"mark", PC(MarkItem) PF_PLAYING },
198 {"move", PC(MoveCmd) PF_PLAYING },
199 {"ext", PC(ExtCmd) 0 }, /* CF+ */
200 {"mapredraw", PC(MapRedrawCmd) 0 }, /* Added: phil */
201 {"mapinfo", PC(MapInfoCmd) 0 }, /* CF+ */
202
203 {"reply", SC(ReplyCmd) 0 },
204 {"exti", SC(ExtiCmd) 0 }, /* CF+ */
205 {"addme", SC(AddMeCmd) 0 },
206 {"askface", SC(SendFaceCmd) 0 }, /* Added: phil */
207 {"requestinfo", SC(RequestInfo) 0 },
208 {"setfacemode", SC(SetFaceMode) 0 },
209 {"setsound", SC(SetSound) 0 },
210 {"setup", SC(SetUp) 0 },
211 {"version", SC(VersionCmd) 0 },
212 {"toggleextendedinfos", SC(ToggleExtendedInfos) 0 }, /*Added: tchize */
213 {"toggleextendedtext", SC(ToggleExtendedText) 0 }, /*Added: tchize */
214 {"asksmooth", SC(AskSmooth) 0 }, /*Added: tchize (smoothing technologies) */
215};
216
217bool
218client::may_execute (const packet_type *pkt) const
219{
220 return (!(pkt->flags & PF_PLAYER) || pl)
221 && (!(pkt->flags & PF_PLAYING) || state == ST_PLAYING);
222}
223
224void
225client::execute (const packet_type *pkt, char *data, int datalen)
226{
227 if (may_execute (pkt))
228 {
229 //TODO: only one format
230 if (pkt->flags & PF_PLAYER)
231 ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl);
232 else
233 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this);
234 }
235 else
236 send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED, pkt->name);
237}
238
239bool
240client::handle_packet ()
241{
242 int pkt_len = next_packet ();
243
244 if (!pkt_len)
245 return false;
246 else if (pkt_len < 0)
247 {
248 LOG (llevError, "read error on player %s\n",
249 pl && pl->ob ? &pl->ob->name : "[anonymous]");
250 destroy ();
251 return false;
252 }
253
254 inbuf [pkt_len] = 0; /* Terminate buffer - useful for string data */
255
256 /* First, break out beginning word. There are at least
257 * a few commands that do not have any paremeters. If
258 * we get such a command, don't worry about trying
259 * to break it up.
260 */
261 int datalen;
262 char *data = strchr ((char *)inbuf + 2, ' ');
263
264 if (data)
265 {
266 *data++ = 0;
267 datalen = pkt_len - (data - (char *)inbuf);
268 }
269 else
270 {
271 data = (char *)inbuf + 2; // better read garbage than segfault
272 datalen = 0;
273 }
274
275 for (packet_type *pkt = packets; pkt < packets + (sizeof (packets) / sizeof (packets[0])); ++pkt)
276 if (!strcmp ((char *)inbuf + 2, pkt->name))
277 {
278 if (pkt->flags & PF_PLAYER)
279 queue_command (pkt, data, datalen);
280 else
281 execute (pkt, data, datalen);
282
283 goto next_packet;
284 }
285
286 // If we get here, we didn't find a valid command.
287 send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED, (char *)inbuf + 2);
288next_packet:
289 skip_packet (pkt_len);
290
291 // input buffer has space again
292 socket_ev.poll (socket_ev.poll () | PE_R);
293
294 return true;
295}
296
297// callback called when socket is either readable or writable
298void
299client::socket_cb (iow &w, int got)
300{
301 //TODO remove when we have better socket cleanup logic
302 if (destroyed ())
303 {
304 socket_ev.poll (0);
305 return;
306 }
307
308 if (got & PE_W)
309 {
310 write_outputbuffer ();
311
312 if (!outputbuffer.len)
313 socket_ev.poll (socket_ev.poll () & ~PE_W);
314 }
315
316 if (got & PE_R)
317 {
318 //TODO: rate-limit tcp connection in better ways, important
146 319
147 int amount = sizeof (inbuf) - inbuf_len; 320 int amount = sizeof (inbuf) - inbuf_len;
148 321
149 if (amount <= 0) 322 if (!amount)
150 { 323 {
151 LOG (llevError, "packet too large");//TODO 324 // input buffer full
325 socket_ev.poll (socket_ev.poll () & ~PE_R);
152 return -1; 326 return;
153 } 327 }
154 328
155 amount = read (fd, inbuf + inbuf_len, amount); 329 amount = read (fd, inbuf + inbuf_len, amount);
156 330
157 if (!amount) 331 if (!amount)
158 { 332 {
159 status = Ns_Dead; 333 destroy ();
160 return -1; 334 return;
161 } 335 }
162 else if (amount < 0) 336 else if (amount < 0)
163 { 337 {
164 if (errno != EAGAIN && errno != EINTR) 338 if (errno != EAGAIN && errno != EINTR)
165 { 339 {
166 LOG (llevError, "read error: %s", strerror (errno)); 340 LOG (llevError, "read error: %s\n", strerror (errno));
341 destroy ();
167 return -1; 342 return;
168 } 343 }
169 344
170 return 0; 345 // should not be here, normally
346 }
347 else
171 } 348 {
172
173 inbuf_len += amount; 349 inbuf_len += amount;
174 350
175 cst_tot.ibytes += amount; 351 cst_tot.ibytes += amount;
176 cst_lst.ibytes += amount; 352 cst_lst.ibytes += amount;
177 }
178}
179 353
354 cmd_ev.start ();
355 }
356 }
357}
358
359// called whenever we have additional commands to process
180void 360void
181NewSocket::skip_packet (int len) 361client::cmd_cb (iw &w)
182{ 362{
183 inbuf_len -= len; 363 if (handle_packet ())
184 memmove (inbuf, inbuf + len, inbuf_len); 364 w.start ();
365 else
366 flush ();
185} 367}
186 368
187/******************************************************************************* 369/*******************************************************************************
188 * 370 *
189 * Start of write related routines. 371 * Start of write related routines.
… …
194 * Adds data to a socket buffer for whatever reason. 376 * Adds data to a socket buffer for whatever reason.
195 * 377 *
196 * ns is the socket we are adding the data to, buf is the start of the 378 * ns is the socket we are adding the data to, buf is the start of the
197 * data, and len is the number of bytes to add. 379 * data, and len is the number of bytes to add.
198 */ 380 */
199 381void
200static void 382client::send (void *buf_, int len)
201add_to_buffer (NewSocket *ns, char *buf, int len)
202{ 383{
384 char *buf = (char *)buf_;
385 char *pos = buf;
386 int amt = 0;
387
388 if (destroyed () || !buf)
389 return;
390
391 if ((len + outputbuffer.len) > SOCKETBUFSIZE)
392 {
393 LOG (llevDebug, "socket on fd %d has overrun internal buffer - marking as dead\n", fd);
394 destroy ();
395 return;
396 }
397
203 int avail, end; 398 int avail, end;
204
205 if ((len + ns->outputbuffer.len) > SOCKETBUFSIZE)
206 {
207 LOG (llevDebug, "Socket on fd %d has overrun internal buffer - marking as dead\n", ns->fd);
208 ns->status = Ns_Dead;
209 return;
210 }
211 399
212 /* data + end is where we start putting the new data. The last byte 400 /* data + end is where we start putting the new data. The last byte
213 * currently in use is actually data + end -1 401 * currently in use is actually data + end -1
214 */ 402 */
215
216 end = ns->outputbuffer.start + ns->outputbuffer.len; 403 end = outputbuffer.start + outputbuffer.len;
217 /* The buffer is already in a wrapped state, so adjust end */ 404 /* The buffer is already in a wrapped state, so adjust end */
218 if (end >= SOCKETBUFSIZE) 405 if (end >= SOCKETBUFSIZE)
219 end -= SOCKETBUFSIZE; 406 end -= SOCKETBUFSIZE;
220 407
221 avail = SOCKETBUFSIZE - end; 408 avail = SOCKETBUFSIZE - end;
222 409
223 /* We can all fit it behind the current data without wrapping */ 410 /* We can all fit it behind the current data without wrapping */
224 if (avail >= len) 411 if (avail >= len)
225 memcpy (ns->outputbuffer.data + end, buf, len); 412 memcpy (outputbuffer.data + end, buf, len);
226 else 413 else
227 { 414 {
228 memcpy (ns->outputbuffer.data + end, buf, avail); 415 memcpy (outputbuffer.data + end, buf, avail);
229 memcpy (ns->outputbuffer.data, buf + avail, len - avail); 416 memcpy (outputbuffer.data, buf + avail, len - avail);
230 } 417 }
231 418
232 ns->outputbuffer.len += len; 419 outputbuffer.len += len;
233#if 0
234 LOG (llevDebug, "Added %d to output buffer, total length now %d, start=%d\n", len, ns->outputbuffer.len, ns->outputbuffer.start);
235#endif
236}
237
238/**
239 * Writes data to socket.
240 *
241 * When the socket is clear to write, and we have backlogged data, this
242 * is called to write it out.
243 */
244void
245write_socket_buffer (NewSocket * ns)
246{
247 int amt, max;
248
249 if (ns->outputbuffer.len == 0)
250 {
251 LOG (llevDebug, "write_socket_buffer called when there is no data, fd=%d\n", ns->fd);
252 return;
253 }
254
255 do
256 {
257 max = SOCKETBUFSIZE - ns->outputbuffer.start;
258 if (ns->outputbuffer.len < max)
259 max = ns->outputbuffer.len;
260
261 do
262 {
263 amt = write (ns->fd, ns->outputbuffer.data + ns->outputbuffer.start, max);
264 }
265 while ((amt < 0) && (errno == EINTR));
266
267 if (amt < 0)
268 { /* We got an error */
269
270 if (errno != EWOULDBLOCK)
271 {
272 LOG (llevError, "New socket write failed (wsb) (%d: %s).\n", errno, strerror (errno));
273 ns->status = Ns_Dead;
274 return;
275 }
276 else
277 { /* EWOULDBLOCK */
278 /* can't write it, so store it away. */
279 ns->can_write = 0;
280 return;
281 }
282 }
283 ns->outputbuffer.start += amt;
284 /* wrap back to start of buffer */
285 if (ns->outputbuffer.start == SOCKETBUFSIZE)
286 ns->outputbuffer.start = 0;
287 ns->outputbuffer.len -= amt;
288#ifdef CS_LOGSTATS
289 cst_tot.obytes += amt;
290 cst_lst.obytes += amt;
291#endif
292 }
293 while (ns->outputbuffer.len > 0);
294}
295
296/**
297 * This writes data to the socket. - It is very low level -
298 * all we try and do is write out the data to the socket
299 * provided (ns). buf is the data to write, len is the number
300 * of bytes to write. IT doesn't return anything - rather, it
301 * updates the ns structure if we get an error.
302 */
303void
304Write_To_Socket (NewSocket * ns, char *buf, int len)
305{
306 int amt = 0;
307 char *pos = buf;
308
309 if (ns->status == Ns_Dead || !buf)
310 {
311 LOG (llevDebug, "Write_To_Socket called with dead socket\n");
312 return;
313 }
314
315#ifndef __GNU__ /* This caused problems on Hurd */
316 if (!ns->can_write)
317 {
318 add_to_buffer (ns, buf, len);
319 return;
320 }
321#endif
322 /* If we manage to write more than we wanted, take it as a bonus */
323 while (len > 0)
324 {
325
326 do
327 {
328 amt = write (ns->fd, pos, len);
329 }
330 while ((amt < 0) && (errno == EINTR));
331
332 if (amt < 0)
333 { /* We got an error */
334 if (errno != EWOULDBLOCK)
335 {
336 LOG (llevError, "New socket write failed WTS (%d: %s).\n", /* ---WIN32 */
337 errno, strerror (errno));
338 ns->status = Ns_Dead;
339 return;
340 }
341 else
342 { /* EWOULDBLOCK */
343 /* can't write it, so store it away. */
344 add_to_buffer (ns, pos, len);
345 ns->can_write = 0;
346 return;
347 }
348 }
349 /* amt gets set to 0 above in blocking code, so we do this as
350 * an else if to make sure we don't reprocess it.
351 */
352 else if (amt == 0)
353 {
354 LOG (llevError, "Write_To_Socket: No data written out.\n");
355 }
356 len -= amt;
357 pos += amt;
358#ifdef CS_LOGSTATS
359 cst_tot.obytes += amt;
360 cst_lst.obytes += amt;
361#endif
362 }
363} 420}
364 421
365/** 422/**
366 * Takes a string of data, and writes it out to the socket. A very handy 423 * Takes a string of data, and writes it out to the socket. A very handy
367 * shortcut function. 424 * shortcut function.
368 */ 425 */
369
370void 426void
371NewSocket::send_packet (packet &sl) 427client::send_packet (packet &sl)
372{ 428{
373 Send_With_Handling (this, &sl); 429 if (destroyed ())
374}
375
376void
377NewSocket::send_packet (const char *buf, int len)
378{
379 packet sl;
380
381 sl << data (buf, len);
382 send_packet (sl);
383}
384
385void
386NewSocket::send_packet (const char *buf)
387{
388 send_packet (buf, strlen (buf));
389}
390
391/**
392 * Calls Write_To_Socket to send data to the client.
393 *
394 * The only difference in this function is that we take a packet
395 *, and we prepend the length information.
396 */
397void
398Send_With_Handling (NewSocket *ns, packet *msg)
399{
400 unsigned char sbuf[4];
401
402 if (ns->status == Ns_Dead || !msg)
403 return; 430 return;
404 431
405 if (msg->len >= MAXSOCKBUF) 432 if (sl.length () >= MAXSOCKBUF)
406 { 433 {
407 LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", msg->len); 434 LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ());
408 /* Almost certainly we've overflowed a buffer, so quite now to make 435 /* Almost certainly we've overflowed a buffer, so quit now to make
409 * it easier to debug. 436 * it easier to debug.
410 */ 437 */
411 abort (); 438 abort ();
412 } 439 }
413 sbuf[0] = ((uint32) (msg->len) >> 8) & 0xFF; 440
414 sbuf[1] = ((uint32) (msg->len)) & 0xFF; 441 if (!sl.length ())
415 if (ns->status != Ns_Old) 442 return;
416 Write_To_Socket (ns, (char *) sbuf, 2); 443
417 Write_To_Socket (ns, (char *) msg->buf, msg->len); 444 assert (sl.hdrlen == 2);
445
446 sl.buf_ [0] = sl.length () >> 8;
447 sl.buf_ [1] = sl.length () ;
448
449 send (sl.buf_, sl.length () + sl.hdrlen);
450}
451
452void
453client::send_packet (const char *buf, int len)
454{
455 packet sl;
456
457 sl << data (buf, len);
458 send_packet (sl);
459}
460
461void
462client::send_packet (const char *buf)
463{
464 send_packet (buf, strlen (buf));
465}
466
467void
468client::send_packet_printf (const char *format, ...)
469{
470 packet sl;
471
472 va_list ap;
473 va_start (ap, format);
474 sl.vprintf (format, ap);
475 va_end (ap);
476
477 send_packet (sl);
478}
479
480/***********************************************************************
481 *
482 * packet functions/utilities
483 *
484 **********************************************************************/
485
486packet::packet (const char *name)
487{
488 reset ();
489
490 int len = strlen (name);
491 memcpy (cur, name, len); cur += len;
492 *cur++ = ' ';
493}
494
495packet &packet::operator <<(const data &v)
496{
497 if (room () < v.len)
498 reset ();
499 else
500 {
501 if (v.len)
502 {
503 memcpy (cur, v.ptr, v.len);
504 cur += v.len;
505 }
506 }
507
508 return *this;
509}
510
511packet &packet::operator <<(const data8 &v)
512{
513 unsigned int len = min (v.len, 0x00FF);
514 return *this << uint8 (len) << data (v.ptr, len);
515}
516
517packet &packet::operator <<(const data16 &v)
518{
519 unsigned int len = min (v.len, 0xFFFF);
520 return *this << uint16 (len) << data (v.ptr, len);
521}
522
523packet &packet::operator <<(const char *v)
524{
525 return *this << data (v, strlen (v ? v : 0));
526}
527
528void
529packet::vprintf (const char *format, va_list ap)
530{
531 int size = room ();
532
533 int len = vsnprintf ((char *)cur, size, format, ap);
534
535 if (len >= size)
536 return reset ();
537
538 cur += len;
418} 539}
419 540
420/****************************************************************************** 541/******************************************************************************
421 * 542 *
422 * statistics logging functions. 543 * statistics logging functions.
… …
446 LOG (llevInfo, "CSSTAT: %.16s tot %d %d %d %d inc %d %d %d %d\n", 567 LOG (llevInfo, "CSSTAT: %.16s tot %d %d %d %d inc %d %d %d %d\n",
447 ctime (&now), cst_tot.ibytes, cst_tot.obytes, cst_tot.max_conn, 568 ctime (&now), cst_tot.ibytes, cst_tot.obytes, cst_tot.max_conn,
448 now - cst_tot.time_start, cst_lst.ibytes, cst_lst.obytes, cst_lst.max_conn, now - cst_lst.time_start); 569 now - cst_tot.time_start, cst_lst.ibytes, cst_lst.obytes, cst_lst.max_conn, now - cst_lst.time_start);
449 cst_lst.ibytes = 0; 570 cst_lst.ibytes = 0;
450 cst_lst.obytes = 0; 571 cst_lst.obytes = 0;
451 cst_lst.max_conn = socket_info.nconns;
452 cst_lst.time_start = now; 572 cst_lst.time_start = now;
453} 573}
454#endif 574#endif
455 575

Diff Legend

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