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

Diff Legend

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