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.10 by root, Wed Dec 13 18:51:50 2006 UTC vs.
Revision 1.20 by root, Thu Dec 14 21:46:34 2006 UTC

… …
35using namespace std; 35using namespace std;
36 36
37#include <global.h> 37#include <global.h>
38#include <newclient.h> 38#include <newclient.h>
39#include <sproto.h> 39#include <sproto.h>
40#include <cstdarg>
40 41
41#ifdef __linux__ 42#ifdef __linux__
42# include <sys/types.h> 43# include <sys/types.h>
43# include <sys/socket.h> 44# include <sys/socket.h>
44# include <netinet/in.h> 45# include <netinet/in.h>
… …
50// easily die in 20 seconds... 51// easily die in 20 seconds...
51#define SOCKET_TIMEOUT1 10 52#define SOCKET_TIMEOUT1 10
52#define SOCKET_TIMEOUT2 20 53#define SOCKET_TIMEOUT2 20
53 54
54void 55void
55Socket_Flush (NewSocket * ns) 56client_socket::flush ()
56{ 57{
57#ifdef __linux__ 58#ifdef __linux__
58 // check time of last ack, and, if too old, kill connection 59 // check time of last ack, and, if too old, kill connection
59 struct tcp_info tcpi; 60 struct tcp_info tcpi;
60 socklen_t len = sizeof (tcpi); 61 socklen_t len = sizeof (tcpi);
61 62
62 if (!getsockopt (ns->fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi)) 63 if (!getsockopt (fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi))
63 { 64 {
64 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;
65 66
66 if (tcpi.tcpi_unacked && 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
67 && 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
68 { 69 {
69 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", fd,
70 (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);
71 ns->status = Ns_Dead; 72 status = Ns_Dead;
72 } 73 }
73 } 74 }
74
75 int val;
76
77 val = 0; setsockopt (ns->fd, IPPROTO_TCP, TCP_CORK, &val, sizeof (val));
78 val = 1; setsockopt (ns->fd, IPPROTO_TCP, TCP_CORK, &val, sizeof (val));
79#endif 75#endif
76
77 /**
78 * Writes data to socket.
79 *
80 * When the socket is clear to write, and we have backlogged data, this
81 * is called to write it out.
82 */
83
84 if (!outputbuffer.len || socket_ev.poll () & PE_W)
85 return;
86
87 write_outputbuffer ();
88}
89
90void
91client_socket::write_outputbuffer ()
92{
93 while (outputbuffer.len)
94 {
95 int res = write (fd, outputbuffer.data + outputbuffer.start,
96 min (outputbuffer.len, SOCKETBUFSIZE - outputbuffer.start));
97
98 if (res > 0)
99 {
100 outputbuffer.start += res;
101 /* wrap back to start of buffer */
102 if (outputbuffer.start == SOCKETBUFSIZE)
103 outputbuffer.start = 0;
104
105 outputbuffer.len -= res;
106#ifdef CS_LOGSTATS
107 cst_tot.obytes += res;
108 cst_lst.obytes += res;
109#endif
110 }
111 else if (res == 0)
112 {
113 LOG (llevError, "socket write failed, connection closed.\n");
114 status = Ns_Dead;
115 return;
116 }
117 else if (errno == EINTR)
118 {
119 // just retry
120 }
121 else if (errno == EAGAIN)
122 {
123 // delay till ready
124 socket_ev.poll (socket_ev.poll () | PE_W);
125 socket_ev.start ();
126 return;
127 }
128 else
129 {
130 LOG (llevError, "socket write failed: %s\n", strerror (errno));
131 status = Ns_Dead;
132 return;
133 }
134 }
135
136 socket_ev.poll (socket_ev.poll () & ~PE_W);
80} 137}
81 138
82/*********************************************************************** 139/***********************************************************************
83 * 140 *
84 * SockList functions/utilities 141 * packet functions/utilities
85 * 142 *
86 **********************************************************************/ 143 **********************************************************************/
87 144
88SockList &SockList::operator <<(const data8 &v) 145packet &packet::operator <<(const data &v)
89{ 146{
90 *this << uint8 (v.len); 147 if (room () < v.len)
91 148 reset ();
92 memcpy (buf + len, v.data, v.len); 149 else
93 len += v.len; 150 {
151 if (v.len)
152 {
153 memcpy (cur, v.ptr, v.len);
154 cur += v.len;
155 }
156 }
94 157
95 return *this; 158 return *this;
96} 159}
97 160
161packet &packet::operator <<(const data8 &v)
162{
163 unsigned int len = min (v.len, 0x00FF);
164 return *this << uint8 (len) << data (v.ptr, len);
165}
166
98SockList &SockList::operator <<(const data16 &v) 167packet &packet::operator <<(const data16 &v)
99{ 168{
100 *this << uint16 (v.len); 169 unsigned int len = min (v.len, 0xFFFF);
101 170 return *this << uint16 (len) << data (v.ptr, len);
102 memcpy (buf + len, v.data, v.len);
103 len += v.len;
104
105 return *this;
106} 171}
107 172
108SockList &SockList::operator <<(const char *v) 173packet &packet::operator <<(const char *v)
109{ 174{
110 if (v) 175 return *this << data (v, strlen (v ? v : 0));
111 {
112 int l = strlen (v);
113 memcpy (buf + len, v, l);
114 len += l;
115 }
116
117 return *this;
118} 176}
119 177
120/* Basically does the reverse of SockList_AddInt, but on 178void
121 * strings instead. Same for the GetShort, but for 16 bits. 179packet::printf (const char *format, ...)
180{
181 int size = room ();
182
183 va_list ap;
184 va_start (ap, format);
185 int len = vsnprintf ((char *)cur, size, format, ap);
186 va_end (ap);
187
188 if (len >= size)
189 return reset ();
190
191 cur += len;
192}
193
194/******************************************************************************
122 */ 195 *
196 * Start of read routines.
197 *
198 ******************************************************************************/
199
123int 200int
124GetInt_String (unsigned char *data) 201client_socket::read_packet ()
125{ 202{
126 return ((data[0] << 24) + (data[1] << 16) + (data[2] << 8) + data[3]); 203 for (;;)
127}
128
129short
130GetShort_String (unsigned char *data)
131{
132 return ((data[0] << 8) + data[1]);
133}
134
135/******************************************************************************
136 *
137 * Start of read routines.
138 *
139 ******************************************************************************/
140
141/**
142 * This reads from fd and puts the data in sl. We return true if we think
143 * we have a full packet, 0 if we have a partial packet. The only processing
144 * we do is remove the intial size value. len (As passed) is the size of the
145 * buffer allocated in the socklist. We make the assumption the buffer is
146 * at least 2 bytes long.
147 */
148
149int
150SockList_ReadPacket (int fd, SockList * sl, int len)
151{
152 int stat, toread;
153
154 /* Sanity check - shouldn't happen */
155 if (sl->len < 0)
156 {
157 abort ();
158 } 204 {
159 /* We already have a partial packet */ 205 if (inbuf_len >= 2)
160 if (sl->len < 2)
161 {
162 do
163 {
164 stat = read (fd, sl->buf + sl->len, 2 - sl->len);
165 } 206 {
166 while ((stat == -1) && (errno == EINTR)); 207 unsigned int pkt_len = (inbuf [0] << 8) | inbuf [1];
167 208
168 if (stat < 0) 209 if (inbuf_len >= 2 + pkt_len)
210 return pkt_len + 2;
169 { 211 }
170 /* In non blocking mode, EAGAIN is set when there is no 212
171 * data available. 213 int amount = sizeof (inbuf) - inbuf_len;
172 */ 214
215 if (amount <= 0)
216 {
217 LOG (llevError, "packet too large");//TODO
218 return -1;
219 }
220
221 amount = read (fd, inbuf + inbuf_len, amount);
222
223 if (!amount)
224 {
225 status = Ns_Dead;
226 return -1;
227 }
228 else if (amount < 0)
229 {
173 if (errno != EAGAIN && errno != EWOULDBLOCK) 230 if (errno != EAGAIN && errno != EINTR)
174 { 231 {
175 LOG (llevDebug, "ReadPacket got error %s, returning 0\n", strerror (errno)); 232 LOG (llevError, "read error: %s\n", strerror (errno));
233 return -1;
176 } 234 }
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 235
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
215 if (errno != EAGAIN && errno != EWOULDBLOCK)
216 {
217 LOG (llevDebug, "ReadPacket got error %s, returning 0\n", strerror (errno));
218 }
219 return 0; /*Error */
220 }
221 if (stat == 0)
222 return -1;
223 sl->len += stat;
224#ifdef CS_LOGSTATS
225 cst_tot.ibytes += stat;
226 cst_lst.ibytes += stat;
227#endif
228 toread -= stat;
229 if (toread == 0)
230 return 1;
231 if (toread < 0)
232 {
233 LOG (llevError, "SockList_ReadPacket: Read more bytes than desired.\n");
234 return 1; 236 return 0;
235 } 237 }
238
239 inbuf_len += amount;
240
241 cst_tot.ibytes += amount;
242 cst_lst.ibytes += amount;
236 } 243 }
237 while (toread > 0); 244}
238 return 0; 245
246void
247client_socket::skip_packet (int len)
248{
249 inbuf_len -= len;
250 memmove (inbuf, inbuf + len, inbuf_len);
239} 251}
240 252
241/******************************************************************************* 253/*******************************************************************************
242 * 254 *
243 * Start of write related routines. 255 * Start of write related routines.
… …
248 * Adds data to a socket buffer for whatever reason. 260 * Adds data to a socket buffer for whatever reason.
249 * 261 *
250 * ns is the socket we are adding the data to, buf is the start of the 262 * ns is the socket we are adding the data to, buf is the start of the
251 * data, and len is the number of bytes to add. 263 * data, and len is the number of bytes to add.
252 */ 264 */
253 265void
254static void 266client_socket::send (void *buf_, int len)
255add_to_buffer (NewSocket * ns, char *buf, int len)
256{ 267{
268 char *buf = (char *)buf_;
269 char *pos = buf;
270 int amt = 0;
271
272 if (status == Ns_Dead || !buf)
273 {
274 LOG (llevDebug, "Write_To_Socket called with dead socket\n");
275 return;
276 }
277
278 if ((len + outputbuffer.len) > SOCKETBUFSIZE)
279 {
280 LOG (llevDebug, "Socket on fd %d has overrun internal buffer - marking as dead\n", fd);
281 status = Ns_Dead;
282 return;
283 }
284
257 int avail, end; 285 int avail, end;
258
259 if ((len + ns->outputbuffer.len) > SOCKETBUFSIZE)
260 {
261 LOG (llevDebug, "Socket on fd %d has overrun internal buffer - marking as dead\n", ns->fd);
262 ns->status = Ns_Dead;
263 return;
264 }
265 286
266 /* data + end is where we start putting the new data. The last byte 287 /* data + end is where we start putting the new data. The last byte
267 * currently in use is actually data + end -1 288 * currently in use is actually data + end -1
268 */ 289 */
269
270 end = ns->outputbuffer.start + ns->outputbuffer.len; 290 end = outputbuffer.start + outputbuffer.len;
271 /* The buffer is already in a wrapped state, so adjust end */ 291 /* The buffer is already in a wrapped state, so adjust end */
272 if (end >= SOCKETBUFSIZE) 292 if (end >= SOCKETBUFSIZE)
273 end -= SOCKETBUFSIZE; 293 end -= SOCKETBUFSIZE;
274 294
275 avail = SOCKETBUFSIZE - end; 295 avail = SOCKETBUFSIZE - end;
276 296
277 /* We can all fit it behind the current data without wrapping */ 297 /* We can all fit it behind the current data without wrapping */
278 if (avail >= len) 298 if (avail >= len)
279 memcpy (ns->outputbuffer.data + end, buf, len); 299 memcpy (outputbuffer.data + end, buf, len);
280 else 300 else
281 { 301 {
282 memcpy (ns->outputbuffer.data + end, buf, avail); 302 memcpy (outputbuffer.data + end, buf, avail);
283 memcpy (ns->outputbuffer.data, buf + avail, len - avail); 303 memcpy (outputbuffer.data, buf + avail, len - avail);
284 } 304 }
285 305
286 ns->outputbuffer.len += len; 306 outputbuffer.len += len;
287#if 0
288 LOG (llevDebug, "Added %d to output buffer, total length now %d, start=%d\n", len, ns->outputbuffer.len, ns->outputbuffer.start);
289#endif
290} 307}
291 308
292/**
293 * Writes data to socket.
294 *
295 * When the socket is clear to write, and we have backlogged data, this
296 * is called to write it out.
297 */
298void 309void
299write_socket_buffer (NewSocket * ns) 310client_socket::socket_cb (iow &w, int got)
300{ 311{
301 int amt, max; 312 write_outputbuffer ();
302 313
303 if (ns->outputbuffer.len == 0) 314 if (!outputbuffer.len)
304 { 315 socket_ev.poll (socket_ev.poll () & ~PE_W);
305 LOG (llevDebug, "write_socket_buffer called when there is no data, fd=%d\n", ns->fd);
306 return;
307 }
308
309 do
310 {
311 max = SOCKETBUFSIZE - ns->outputbuffer.start;
312 if (ns->outputbuffer.len < max)
313 max = ns->outputbuffer.len;
314
315 do
316 {
317 amt = write (ns->fd, ns->outputbuffer.data + ns->outputbuffer.start, max);
318 }
319 while ((amt < 0) && (errno == EINTR));
320
321 if (amt < 0)
322 { /* We got an error */
323
324 if (errno != EWOULDBLOCK)
325 {
326 LOG (llevError, "New socket write failed (wsb) (%d: %s).\n", errno, strerror (errno));
327 ns->status = Ns_Dead;
328 return;
329 }
330 else
331 { /* EWOULDBLOCK */
332 /* can't write it, so store it away. */
333 ns->can_write = 0;
334 return;
335 }
336 }
337 ns->outputbuffer.start += amt;
338 /* wrap back to start of buffer */
339 if (ns->outputbuffer.start == SOCKETBUFSIZE)
340 ns->outputbuffer.start = 0;
341 ns->outputbuffer.len -= amt;
342#ifdef CS_LOGSTATS
343 cst_tot.obytes += amt;
344 cst_lst.obytes += amt;
345#endif
346 }
347 while (ns->outputbuffer.len > 0);
348} 316}
349
350/**
351 * This writes data to the socket. - It is very low level -
352 * all we try and do is write out the data to the socket
353 * provided (ns). buf is the data to write, len is the number
354 * of bytes to write. IT doesn't return anything - rather, it
355 * updates the ns structure if we get an error.
356 */
357void
358Write_To_Socket (NewSocket * ns, char *buf, int len)
359{
360 int amt = 0;
361 char *pos = buf;
362
363 if (ns->status == Ns_Dead || !buf)
364 {
365 LOG (llevDebug, "Write_To_Socket called with dead socket\n");
366 return;
367 }
368
369#ifndef __GNU__ /* This caused problems on Hurd */
370 if (!ns->can_write)
371 {
372 add_to_buffer (ns, buf, len);
373 return;
374 }
375#endif
376 /* If we manage to write more than we wanted, take it as a bonus */
377 while (len > 0)
378 {
379
380 do
381 {
382 amt = write (ns->fd, pos, len);
383 }
384 while ((amt < 0) && (errno == EINTR));
385
386 if (amt < 0)
387 { /* We got an error */
388 if (errno != EWOULDBLOCK)
389 {
390 LOG (llevError, "New socket write failed WTS (%d: %s).\n", /* ---WIN32 */
391 errno, strerror (errno));
392 ns->status = Ns_Dead;
393 return;
394 }
395 else
396 { /* EWOULDBLOCK */
397 /* can't write it, so store it away. */
398 add_to_buffer (ns, pos, len);
399 ns->can_write = 0;
400 return;
401 }
402 }
403 /* amt gets set to 0 above in blocking code, so we do this as
404 * an else if to make sure we don't reprocess it.
405 */
406 else if (amt == 0)
407 {
408 LOG (llevError, "Write_To_Socket: No data written out.\n");
409 }
410 len -= amt;
411 pos += amt;
412#ifdef CS_LOGSTATS
413 cst_tot.obytes += amt;
414 cst_lst.obytes += amt;
415#endif
416 }
417}
418
419 317
420/** 318/**
421 * Takes a string of data, and writes it out to the socket. A very handy 319 * Takes a string of data, and writes it out to the socket. A very handy
422 * shortcut function. 320 * shortcut function.
423 */ 321 */
424void 322void
425cs_write_string (NewSocket * ns, const char *buf, int len) 323client_socket::send_packet (packet &sl)
426{ 324{
427 SockList sl;
428
429 sl.len = len;
430 sl.buf = (unsigned char *) buf;
431 Send_With_Handling (ns, &sl);
432}
433
434
435/**
436 * Calls Write_To_Socket to send data to the client.
437 *
438 * The only difference in this function is that we take a SockList
439 *, and we prepend the length information.
440 */
441void
442Send_With_Handling (NewSocket * ns, SockList * msg)
443{
444 unsigned char sbuf[4];
445
446 if (ns->status == Ns_Dead || !msg) 325 if (status == Ns_Dead)
447 return; 326 return;
448 327
449 if (msg->len >= MAXSOCKBUF) 328 if (sl.length () >= MAXSOCKBUF)
450 { 329 {
451 LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", msg->len); 330 LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ());
452 /* Almost certainly we've overflowed a buffer, so quite now to make 331 /* Almost certainly we've overflowed a buffer, so quit now to make
453 * it easier to debug. 332 * it easier to debug.
454 */ 333 */
455 abort (); 334 abort ();
456 } 335 }
457 sbuf[0] = ((uint32) (msg->len) >> 8) & 0xFF;
458 sbuf[1] = ((uint32) (msg->len)) & 0xFF;
459 if (ns->status != Ns_Old)
460 Write_To_Socket (ns, (char *) sbuf, 2);
461 Write_To_Socket (ns, (char *) msg->buf, msg->len);
462}
463 336
464/** 337 if (!sl.length ())
465 * Takes a string of data, and writes it out to the socket. A very handy 338 return;
466 * shortcut function.
467 */
468void
469Write_String_To_Socket (NewSocket * ns, char *buf, int len)
470{
471 SockList sl;
472 339
473 sl.len = len; 340 assert (sl.hdrlen == 2);
474 sl.buf = (unsigned char *) buf;
475 Send_With_Handling (ns, &sl);
476}
477 341
342 sl.buf_ [0] = sl.length () >> 8;
343 sl.buf_ [1] = sl.length () ;
344
345 send (sl.buf_, sl.length () + sl.hdrlen);
346}
347
348void
349client_socket::send_packet (const char *buf, int len)
350{
351 packet sl;
352
353 sl << data (buf, len);
354 send_packet (sl);
355}
356
357void
358client_socket::send_packet (const char *buf)
359{
360 send_packet (buf, strlen (buf));
361}
478 362
479/****************************************************************************** 363/******************************************************************************
480 * 364 *
481 * statistics logging functions. 365 * statistics logging functions.
482 * 366 *
… …
505 LOG (llevInfo, "CSSTAT: %.16s tot %d %d %d %d inc %d %d %d %d\n", 389 LOG (llevInfo, "CSSTAT: %.16s tot %d %d %d %d inc %d %d %d %d\n",
506 ctime (&now), cst_tot.ibytes, cst_tot.obytes, cst_tot.max_conn, 390 ctime (&now), cst_tot.ibytes, cst_tot.obytes, cst_tot.max_conn,
507 now - cst_tot.time_start, cst_lst.ibytes, cst_lst.obytes, cst_lst.max_conn, now - cst_lst.time_start); 391 now - cst_tot.time_start, cst_lst.ibytes, cst_lst.obytes, cst_lst.max_conn, now - cst_lst.time_start);
508 cst_lst.ibytes = 0; 392 cst_lst.ibytes = 0;
509 cst_lst.obytes = 0; 393 cst_lst.obytes = 0;
510 cst_lst.max_conn = socket_info.nconns;
511 cst_lst.time_start = now; 394 cst_lst.time_start = now;
512} 395}
513#endif 396#endif
514 397

Diff Legend

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