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

Diff Legend

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