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

Diff Legend

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