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.11 by root, Wed Dec 13 21:27:09 2006 UTC vs.
Revision 1.22 by root, Fri Dec 15 19:59:20 2006 UTC

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

Diff Legend

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