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

Diff Legend

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