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.5 by root, Sun Sep 10 13:43:33 2006 UTC vs.
Revision 1.20 by root, Thu Dec 14 21:46:34 2006 UTC

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

Diff Legend

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