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.3 by root, Tue Aug 29 08:01:38 2006 UTC vs.
Revision 1.21 by root, Fri Dec 15 00:14:13 2006 UTC

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

Diff Legend

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