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.7 by root, Sun Nov 26 19:48:50 2006 UTC vs.
Revision 1.20 by root, Thu Dec 14 21:46:34 2006 UTC

… …
35using namespace std; 35using namespace std;
36 36
37#include <global.h> 37#include <global.h>
38#include <newclient.h> 38#include <newclient.h>
39#include <sproto.h> 39#include <sproto.h>
40#include <cstdarg>
40 41
41#ifdef __linux__ 42#ifdef __linux__
42# include <sys/types.h> 43# include <sys/types.h>
43# include <sys/socket.h> 44# include <sys/socket.h>
44# include <netinet/in.h> 45# include <netinet/in.h>
… …
50// easily die in 20 seconds... 51// easily die in 20 seconds...
51#define SOCKET_TIMEOUT1 10 52#define SOCKET_TIMEOUT1 10
52#define SOCKET_TIMEOUT2 20 53#define SOCKET_TIMEOUT2 20
53 54
54void 55void
55Socket_Flush (NewSocket * ns) 56client_socket::flush ()
56{ 57{
57#ifdef __linux__ 58#ifdef __linux__
58 // check time of last ack, and, if too old, kill connection 59 // check time of last ack, and, if too old, kill connection
59 struct tcp_info tcpi; 60 struct tcp_info tcpi;
60 socklen_t len = sizeof (tcpi); 61 socklen_t len = sizeof (tcpi);
61 62
62 if (!getsockopt (ns->fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi)) 63 if (!getsockopt (fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi))
63 { 64 {
64 unsigned int diff = tcpi.tcpi_last_ack_recv - tcpi.tcpi_last_data_sent; 65 unsigned int diff = tcpi.tcpi_last_ack_recv - tcpi.tcpi_last_data_sent;
65 66
66 if (tcpi.tcpi_unacked && SOCKET_TIMEOUT1 * TCP_HZ < diff && diff < 0x80000000UL // ack delayed for 20s 67 if (tcpi.tcpi_unacked && SOCKET_TIMEOUT1 * TCP_HZ < diff && diff < 0x80000000UL // ack delayed for 20s
67 && SOCKET_TIMEOUT2 * TCP_HZ < tcpi.tcpi_last_data_sent) // no data sent for 10s 68 && SOCKET_TIMEOUT2 * TCP_HZ < tcpi.tcpi_last_data_sent) // no data sent for 10s
68 { 69 {
69 LOG (llevDebug, "Connection on fd %d closed due to ack timeout (%u/%u/%u)\n", ns->fd, 70 LOG (llevDebug, "Connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd,
70 (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);
71 ns->status = Ns_Dead; 72 status = Ns_Dead;
72 } 73 }
73 } 74 }
74
75 int val;
76
77 val = 0;
78 setsockopt (ns->fd, IPPROTO_TCP, TCP_CORK, &val, sizeof (val));
79 val = 1;
80 setsockopt (ns->fd, IPPROTO_TCP, TCP_CORK, &val, sizeof (val));
81#endif 75#endif
76
77 /**
78 * Writes data to socket.
79 *
80 * When the socket is clear to write, and we have backlogged data, this
81 * is called to write it out.
82 */
83
84 if (!outputbuffer.len || socket_ev.poll () & PE_W)
85 return;
86
87 write_outputbuffer ();
88}
89
90void
91client_socket::write_outputbuffer ()
92{
93 while (outputbuffer.len)
94 {
95 int res = write (fd, outputbuffer.data + outputbuffer.start,
96 min (outputbuffer.len, SOCKETBUFSIZE - outputbuffer.start));
97
98 if (res > 0)
99 {
100 outputbuffer.start += res;
101 /* wrap back to start of buffer */
102 if (outputbuffer.start == SOCKETBUFSIZE)
103 outputbuffer.start = 0;
104
105 outputbuffer.len -= res;
106#ifdef CS_LOGSTATS
107 cst_tot.obytes += res;
108 cst_lst.obytes += res;
109#endif
110 }
111 else if (res == 0)
112 {
113 LOG (llevError, "socket write failed, connection closed.\n");
114 status = Ns_Dead;
115 return;
116 }
117 else if (errno == EINTR)
118 {
119 // just retry
120 }
121 else if (errno == EAGAIN)
122 {
123 // delay till ready
124 socket_ev.poll (socket_ev.poll () | PE_W);
125 socket_ev.start ();
126 return;
127 }
128 else
129 {
130 LOG (llevError, "socket write failed: %s\n", strerror (errno));
131 status = Ns_Dead;
132 return;
133 }
134 }
135
136 socket_ev.poll (socket_ev.poll () & ~PE_W);
82} 137}
83 138
84/*********************************************************************** 139/***********************************************************************
85 * 140 *
86 * SockList functions/utilities 141 * packet functions/utilities
87 * 142 *
88 **********************************************************************/ 143 **********************************************************************/
89 144
90void 145packet &packet::operator <<(const data &v)
91SockList_Init (SockList * sl)
92{ 146{
93 sl->len = 0; 147 if (room () < v.len)
94 sl->buf = NULL; 148 reset ();
95} 149 else
150 {
151 if (v.len)
152 {
153 memcpy (cur, v.ptr, v.len);
154 cur += v.len;
155 }
156 }
96 157
97void 158 return *this;
98SockList_AddInt (SockList * sl, uint32 data)
99{
100 sl->buf[sl->len++] = (data >> 24) & 0xff;
101 sl->buf[sl->len++] = (data >> 16) & 0xff;
102 sl->buf[sl->len++] = (data >> 8) & 0xff;
103 sl->buf[sl->len++] = data & 0xff;
104} 159}
105 160
106void 161packet &packet::operator <<(const data8 &v)
107SockList_AddInt64 (SockList * sl, uint64 data)
108{ 162{
109 sl->buf[sl->len++] = (char) ((data >> 56) & 0xff); 163 unsigned int len = min (v.len, 0x00FF);
110 sl->buf[sl->len++] = (char) ((data >> 48) & 0xff); 164 return *this << uint8 (len) << data (v.ptr, len);
111 sl->buf[sl->len++] = (char) ((data >> 40) & 0xff);
112 sl->buf[sl->len++] = (char) ((data >> 32) & 0xff);
113
114 sl->buf[sl->len++] = (char) ((data >> 24) & 0xff);
115 sl->buf[sl->len++] = (char) ((data >> 16) & 0xff);
116 sl->buf[sl->len++] = (char) ((data >> 8) & 0xff);
117 sl->buf[sl->len++] = (char) (data & 0xff);
118} 165}
119 166
120/* Basically does the reverse of SockList_AddInt, but on 167packet &packet::operator <<(const data16 &v)
121 * strings instead. Same for the GetShort, but for 16 bits. 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}
193
194/******************************************************************************
122 */ 195 *
196 * Start of read routines.
197 *
198 ******************************************************************************/
199
123int 200int
124GetInt_String (unsigned char *data) 201client_socket::read_packet ()
125{ 202{
126 return ((data[0] << 24) + (data[1] << 16) + (data[2] << 8) + data[3]); 203 for (;;)
127}
128
129short
130GetShort_String (unsigned char *data)
131{
132 return ((data[0] << 8) + data[1]);
133}
134
135/******************************************************************************
136 *
137 * Start of read routines.
138 *
139 ******************************************************************************/
140
141/**
142 * This reads from fd and puts the data in sl. We return true if we think
143 * we have a full packet, 0 if we have a partial packet. The only processing
144 * we do is remove the intial size value. len (As passed) is the size of the
145 * buffer allocated in the socklist. We make the assumption the buffer is
146 * at least 2 bytes long.
147 */
148
149int
150SockList_ReadPacket (int fd, SockList * sl, int len)
151{
152 int stat, toread;
153
154 /* Sanity check - shouldn't happen */
155 if (sl->len < 0)
156 {
157 abort ();
158 } 204 {
159 /* We already have a partial packet */ 205 if (inbuf_len >= 2)
160 if (sl->len < 2)
161 {
162#ifdef WIN32 /* ***WIN32 SockList_ReadPacket: change read() to recv() */
163
164 stat = recv (fd, sl->buf + sl->len, 2 - sl->len, 0);
165
166#else
167 do
168 {
169 stat = read (fd, sl->buf + sl->len, 2 - sl->len);
170 } 206 {
171 while ((stat == -1) && (errno == EINTR)); 207 unsigned int pkt_len = (inbuf [0] << 8) | inbuf [1];
172#endif 208
173 if (stat < 0) 209 if (inbuf_len >= 2 + pkt_len)
210 return pkt_len + 2;
174 { 211 }
175 /* In non blocking mode, EAGAIN is set when there is no 212
176 * data available. 213 int amount = sizeof (inbuf) - inbuf_len;
177 */ 214
178#ifdef WIN32 /* ***WIN32 SockList_ReadPacket: error handling for win32 */ 215 if (amount <= 0)
179 if ((stat == -1) && WSAGetLastError () != WSAEWOULDBLOCK) 216 {
217 LOG (llevError, "packet too large");//TODO
218 return -1;
219 }
220
221 amount = read (fd, inbuf + inbuf_len, amount);
222
223 if (!amount)
224 {
225 status = Ns_Dead;
226 return -1;
227 }
228 else if (amount < 0)
229 {
230 if (errno != EAGAIN && errno != EINTR)
180 { 231 {
181 if (WSAGetLastError () == WSAECONNRESET) 232 LOG (llevError, "read error: %s\n", strerror (errno));
182 LOG (llevDebug, "Connection closed by client\n"); 233 return -1;
183 else
184 {
185 LOG (llevDebug, "ReadPacket got error %d, returning 0\n", WSAGetLastError ());
186 }
187 return -1; /* kick this user! */
188 } 234 }
189#else
190 if (errno != EAGAIN && errno != EWOULDBLOCK)
191 {
192 LOG (llevDebug, "ReadPacket got error %s, returning 0\n", strerror (errno));
193 }
194#endif
195 return 0; /*Error */
196 }
197 if (stat == 0)
198 return -1;
199 sl->len += stat;
200#ifdef CS_LOGSTATS
201 cst_tot.ibytes += stat;
202 cst_lst.ibytes += stat;
203#endif
204 if (stat < 2)
205 return 0; /* Still don't have a full packet */
206 }
207 /* Figure out how much more data we need to read. Add 2 from the
208 * end of this - size header information is not included.
209 */
210 toread = 2 + (sl->buf[0] << 8) + sl->buf[1] - sl->len;
211 if ((toread + sl->len) >= len)
212 {
213 LOG (llevError, "SockList_ReadPacket: Want to read more bytes than will fit in buffer (%d>=%d).\n", toread + sl->len, len);
214 /* Quick hack in case for 'oldsocketmode' input. If we are
215 * closing the socket anyways, then reading this extra 100 bytes
216 * shouldn't hurt.
217 */
218#ifdef WIN32 /* ***win32 SockList_ReadPacket: change read() to recv() */
219 recv (fd, sl->buf + 2, 100, 0);
220#else
221 read (fd, sl->buf + 2, 100);
222#endif /* end win32 */
223 235
224 /* return error so the socket is closed */
225 return -1;
226 }
227 do
228 {
229#ifdef WIN32 /* ***win32 SockList_ReadPacket: change read() to recv() */
230 stat = recv (fd, sl->buf + sl->len, toread, 0);
231#else
232 do
233 {
234 stat = read (fd, sl->buf + sl->len, toread);
235 }
236 while ((stat < 0) && (errno == EINTR));
237#endif
238 if (stat < 0)
239 {
240
241#ifdef WIN32 /* ***win32 SockList_ReadPacket: change error handling for win32 */
242 if ((stat == -1) && WSAGetLastError () != WSAEWOULDBLOCK)
243 {
244 if (WSAGetLastError () == WSAECONNRESET)
245 LOG (llevDebug, "Connection closed by client\n");
246 else
247 {
248 LOG (llevDebug, "ReadPacket got error %d, returning 0\n", WSAGetLastError ());
249 }
250 return -1; /* kick this user! */
251 }
252#else
253 if (errno != EAGAIN && errno != EWOULDBLOCK)
254 {
255 LOG (llevDebug, "ReadPacket got error %s, returning 0\n", strerror (errno));
256 }
257#endif
258 return 0; /*Error */
259 }
260 if (stat == 0)
261 return -1;
262 sl->len += stat;
263#ifdef CS_LOGSTATS
264 cst_tot.ibytes += stat;
265 cst_lst.ibytes += stat;
266#endif
267 toread -= stat;
268 if (toread == 0)
269 return 1;
270 if (toread < 0)
271 {
272 LOG (llevError, "SockList_ReadPacket: Read more bytes than desired.\n");
273 return 1; 236 return 0;
274 } 237 }
238
239 inbuf_len += amount;
240
241 cst_tot.ibytes += amount;
242 cst_lst.ibytes += amount;
275 } 243 }
276 while (toread > 0); 244}
277 return 0; 245
246void
247client_socket::skip_packet (int len)
248{
249 inbuf_len -= len;
250 memmove (inbuf, inbuf + len, inbuf_len);
278} 251}
279 252
280/******************************************************************************* 253/*******************************************************************************
281 * 254 *
282 * Start of write related routines. 255 * Start of write related routines.
… …
287 * Adds data to a socket buffer for whatever reason. 260 * Adds data to a socket buffer for whatever reason.
288 * 261 *
289 * ns is the socket we are adding the data to, buf is the start of the 262 * ns is the socket we are adding the data to, buf is the start of the
290 * data, and len is the number of bytes to add. 263 * data, and len is the number of bytes to add.
291 */ 264 */
292 265void
293static void 266client_socket::send (void *buf_, int len)
294add_to_buffer (NewSocket * ns, char *buf, int len)
295{ 267{
268 char *buf = (char *)buf_;
269 char *pos = buf;
270 int amt = 0;
271
272 if (status == Ns_Dead || !buf)
273 {
274 LOG (llevDebug, "Write_To_Socket called with dead socket\n");
275 return;
276 }
277
278 if ((len + outputbuffer.len) > SOCKETBUFSIZE)
279 {
280 LOG (llevDebug, "Socket on fd %d has overrun internal buffer - marking as dead\n", fd);
281 status = Ns_Dead;
282 return;
283 }
284
296 int avail, end; 285 int avail, end;
297
298 if ((len + ns->outputbuffer.len) > SOCKETBUFSIZE)
299 {
300 LOG (llevDebug, "Socket on fd %d has overrun internal buffer - marking as dead\n", ns->fd);
301 ns->status = Ns_Dead;
302 return;
303 }
304 286
305 /* data + end is where we start putting the new data. The last byte 287 /* data + end is where we start putting the new data. The last byte
306 * currently in use is actually data + end -1 288 * currently in use is actually data + end -1
307 */ 289 */
308
309 end = ns->outputbuffer.start + ns->outputbuffer.len; 290 end = outputbuffer.start + outputbuffer.len;
310 /* The buffer is already in a wrapped state, so adjust end */ 291 /* The buffer is already in a wrapped state, so adjust end */
311 if (end >= SOCKETBUFSIZE) 292 if (end >= SOCKETBUFSIZE)
312 end -= SOCKETBUFSIZE; 293 end -= SOCKETBUFSIZE;
313 294
314 avail = SOCKETBUFSIZE - end; 295 avail = SOCKETBUFSIZE - end;
315 296
316 /* We can all fit it behind the current data without wrapping */ 297 /* We can all fit it behind the current data without wrapping */
317 if (avail >= len) 298 if (avail >= len)
318 memcpy (ns->outputbuffer.data + end, buf, len); 299 memcpy (outputbuffer.data + end, buf, len);
319 else 300 else
320 { 301 {
321 memcpy (ns->outputbuffer.data + end, buf, avail); 302 memcpy (outputbuffer.data + end, buf, avail);
322 memcpy (ns->outputbuffer.data, buf + avail, len - avail); 303 memcpy (outputbuffer.data, buf + avail, len - avail);
323 } 304 }
324 305
325 ns->outputbuffer.len += len; 306 outputbuffer.len += len;
326#if 0
327 LOG (llevDebug, "Added %d to output buffer, total length now %d, start=%d\n", len, ns->outputbuffer.len, ns->outputbuffer.start);
328#endif
329} 307}
330 308
331/**
332 * Writes data to socket.
333 *
334 * When the socket is clear to write, and we have backlogged data, this
335 * is called to write it out.
336 */
337void 309void
338write_socket_buffer (NewSocket * ns) 310client_socket::socket_cb (iow &w, int got)
339{ 311{
340 int amt, max; 312 write_outputbuffer ();
341 313
342 if (ns->outputbuffer.len == 0) 314 if (!outputbuffer.len)
343 { 315 socket_ev.poll (socket_ev.poll () & ~PE_W);
344 LOG (llevDebug, "write_socket_buffer called when there is no data, fd=%d\n", ns->fd);
345 return;
346 }
347
348 do
349 {
350 max = SOCKETBUFSIZE - ns->outputbuffer.start;
351 if (ns->outputbuffer.len < max)
352 max = ns->outputbuffer.len;
353
354#ifdef WIN32 /* ***win32 write_socket_buffer: change write() to send() */
355 amt = send (ns->fd, ns->outputbuffer.data + ns->outputbuffer.start, max, 0);
356#else
357 do
358 {
359 amt = write (ns->fd, ns->outputbuffer.data + ns->outputbuffer.start, max);
360 }
361 while ((amt < 0) && (errno == EINTR));
362#endif
363
364 if (amt < 0)
365 { /* We got an error */
366
367#ifdef WIN32 /* ***win32 write_socket_buffer: change error handling */
368 if (amt == -1 && WSAGetLastError () != WSAEWOULDBLOCK)
369 {
370 LOG (llevError, "New socket write failed (wsb) (%d).\n", WSAGetLastError ());
371#else
372 if (errno != EWOULDBLOCK)
373 {
374 LOG (llevError, "New socket write failed (wsb) (%d: %s).\n", errno, strerror (errno));
375#endif
376 ns->status = Ns_Dead;
377 return;
378 }
379 else
380 { /* EWOULDBLOCK */
381 /* can't write it, so store it away. */
382 ns->can_write = 0;
383 return;
384 }
385 }
386 ns->outputbuffer.start += amt;
387 /* wrap back to start of buffer */
388 if (ns->outputbuffer.start == SOCKETBUFSIZE)
389 ns->outputbuffer.start = 0;
390 ns->outputbuffer.len -= amt;
391#ifdef CS_LOGSTATS
392 cst_tot.obytes += amt;
393 cst_lst.obytes += amt;
394#endif
395 }
396 while (ns->outputbuffer.len > 0);
397} 316}
398
399/**
400 * This writes data to the socket. - It is very low level -
401 * all we try and do is write out the data to the socket
402 * provided (ns). buf is the data to write, len is the number
403 * of bytes to write. IT doesn't return anything - rather, it
404 * updates the ns structure if we get an error.
405 */
406void
407Write_To_Socket (NewSocket * ns, char *buf, int len)
408{
409 int amt = 0;
410 char *pos = buf;
411
412 if (ns->status == Ns_Dead || !buf)
413 {
414 LOG (llevDebug, "Write_To_Socket called with dead socket\n");
415 return;
416 }
417
418#ifndef __GNU__ /* This caused problems on Hurd */
419 if (!ns->can_write)
420 {
421 add_to_buffer (ns, buf, len);
422 return;
423 }
424#endif
425 /* If we manage to write more than we wanted, take it as a bonus */
426 while (len > 0)
427 {
428
429#ifdef WIN32 /* ***win32 Write_To_Socket: change write() to send() */
430 amt = send (ns->fd, pos, len, 0);
431#else
432 do
433 {
434 amt = write (ns->fd, pos, len);
435 }
436 while ((amt < 0) && (errno == EINTR));
437#endif
438
439 if (amt < 0)
440 { /* We got an error */
441#ifdef WIN32 /* ***win32 Write_To_Socket: change error handling */
442 if (amt == -1 && WSAGetLastError () != WSAEWOULDBLOCK)
443 {
444 LOG (llevError, "New socket write failed WTS (%d).\n", WSAGetLastError ());
445#else
446 if (errno != EWOULDBLOCK)
447 {
448 LOG (llevError, "New socket write failed WTS (%d: %s).\n", /* ---WIN32 */
449 errno, strerror (errno));
450#endif
451 ns->status = Ns_Dead;
452 return;
453 }
454 else
455 { /* EWOULDBLOCK */
456 /* can't write it, so store it away. */
457 add_to_buffer (ns, pos, len);
458 ns->can_write = 0;
459 return;
460 }
461 }
462 /* amt gets set to 0 above in blocking code, so we do this as
463 * an else if to make sure we don't reprocess it.
464 */
465 else if (amt == 0)
466 {
467 LOG (llevError, "Write_To_Socket: No data written out.\n");
468 }
469 len -= amt;
470 pos += amt;
471#ifdef CS_LOGSTATS
472 cst_tot.obytes += amt;
473 cst_lst.obytes += amt;
474#endif
475 }
476}
477
478 317
479/** 318/**
480 * Takes a string of data, and writes it out to the socket. A very handy 319 * Takes a string of data, and writes it out to the socket. A very handy
481 * shortcut function. 320 * shortcut function.
482 */ 321 */
483void 322void
484cs_write_string (NewSocket * ns, const char *buf, int len) 323client_socket::send_packet (packet &sl)
485{ 324{
486 SockList sl;
487
488 sl.len = len;
489 sl.buf = (unsigned char *) buf;
490 Send_With_Handling (ns, &sl);
491}
492
493
494/**
495 * Calls Write_To_Socket to send data to the client.
496 *
497 * The only difference in this function is that we take a SockList
498 *, and we prepend the length information.
499 */
500void
501Send_With_Handling (NewSocket * ns, SockList * msg)
502{
503 unsigned char sbuf[4];
504
505 if (ns->status == Ns_Dead || !msg) 325 if (status == Ns_Dead)
506 return; 326 return;
507 327
508 if (msg->len >= MAXSOCKBUF) 328 if (sl.length () >= MAXSOCKBUF)
509 { 329 {
510 LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", msg->len); 330 LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ());
511 /* Almost certainly we've overflowed a buffer, so quite now to make 331 /* Almost certainly we've overflowed a buffer, so quit now to make
512 * it easier to debug. 332 * it easier to debug.
513 */ 333 */
514 abort (); 334 abort ();
515 } 335 }
516 sbuf[0] = ((uint32) (msg->len) >> 8) & 0xFF;
517 sbuf[1] = ((uint32) (msg->len)) & 0xFF;
518 if (ns->status != Ns_Old)
519 Write_To_Socket (ns, (char *) sbuf, 2);
520 Write_To_Socket (ns, (char *) msg->buf, msg->len);
521}
522 336
523/** 337 if (!sl.length ())
524 * Takes a string of data, and writes it out to the socket. A very handy 338 return;
525 * shortcut function.
526 */
527void
528Write_String_To_Socket (NewSocket * ns, char *buf, int len)
529{
530 SockList sl;
531 339
532 sl.len = len; 340 assert (sl.hdrlen == 2);
533 sl.buf = (unsigned char *) buf;
534 Send_With_Handling (ns, &sl);
535}
536 341
342 sl.buf_ [0] = sl.length () >> 8;
343 sl.buf_ [1] = sl.length () ;
344
345 send (sl.buf_, sl.length () + sl.hdrlen);
346}
347
348void
349client_socket::send_packet (const char *buf, int len)
350{
351 packet sl;
352
353 sl << data (buf, len);
354 send_packet (sl);
355}
356
357void
358client_socket::send_packet (const char *buf)
359{
360 send_packet (buf, strlen (buf));
361}
537 362
538/****************************************************************************** 363/******************************************************************************
539 * 364 *
540 * statistics logging functions. 365 * statistics logging functions.
541 * 366 *
… …
564 LOG (llevInfo, "CSSTAT: %.16s tot %d %d %d %d inc %d %d %d %d\n", 389 LOG (llevInfo, "CSSTAT: %.16s tot %d %d %d %d inc %d %d %d %d\n",
565 ctime (&now), cst_tot.ibytes, cst_tot.obytes, cst_tot.max_conn, 390 ctime (&now), cst_tot.ibytes, cst_tot.obytes, cst_tot.max_conn,
566 now - cst_tot.time_start, cst_lst.ibytes, cst_lst.obytes, cst_lst.max_conn, now - cst_lst.time_start); 391 now - cst_tot.time_start, cst_lst.ibytes, cst_lst.obytes, cst_lst.max_conn, now - cst_lst.time_start);
567 cst_lst.ibytes = 0; 392 cst_lst.ibytes = 0;
568 cst_lst.obytes = 0; 393 cst_lst.obytes = 0;
569 cst_lst.max_conn = socket_info.nconns;
570 cst_lst.time_start = now; 394 cst_lst.time_start = now;
571} 395}
572#endif 396#endif
397

Diff Legend

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