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

Diff Legend

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