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

Diff Legend

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