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.20 by root, Thu Dec 14 21:46:34 2006 UTC

… …
51// easily die in 20 seconds... 51// easily die in 20 seconds...
52#define SOCKET_TIMEOUT1 10 52#define SOCKET_TIMEOUT1 10
53#define SOCKET_TIMEOUT2 20 53#define SOCKET_TIMEOUT2 20
54 54
55void 55void
56Socket_Flush (NewSocket * ns) 56client_socket::flush ()
57{ 57{
58#ifdef __linux__ 58#ifdef __linux__
59 // check time of last ack, and, if too old, kill connection 59 // check time of last ack, and, if too old, kill connection
60 struct tcp_info tcpi; 60 struct tcp_info tcpi;
61 socklen_t len = sizeof (tcpi); 61 socklen_t len = sizeof (tcpi);
62 62
63 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))
64 { 64 {
65 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;
66 66
67 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
68 && 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
69 { 69 {
70 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,
71 (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);
72 ns->status = Ns_Dead; 72 status = Ns_Dead;
73 } 73 }
74 } 74 }
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 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);
81} 137}
82 138
83/*********************************************************************** 139/***********************************************************************
84 * 140 *
85 * SockList functions/utilities 141 * packet functions/utilities
86 * 142 *
87 **********************************************************************/ 143 **********************************************************************/
88 144
89SockList &SockList::operator <<(const data &v) 145packet &packet::operator <<(const data &v)
90{ 146{
147 if (room () < v.len)
148 reset ();
149 else
150 {
91 if (v.len) 151 if (v.len)
92 { 152 {
93 memcpy (buf + len, v.ptr, v.len); 153 memcpy (cur, v.ptr, v.len);
94 len += v.len; 154 cur += v.len;
155 }
95 } 156 }
96 157
97 return *this; 158 return *this;
98} 159}
99 160
100SockList &SockList::operator <<(const data8 &v) 161packet &packet::operator <<(const data8 &v)
101{ 162{
102 unsigned int len = min (v.len, 0x00FF); 163 unsigned int len = min (v.len, 0x00FF);
103 return *this << uint8 (len) << data (v.ptr, len); 164 return *this << uint8 (len) << data (v.ptr, len);
104} 165}
105 166
106SockList &SockList::operator <<(const data16 &v) 167packet &packet::operator <<(const data16 &v)
107{ 168{
108 unsigned int len = min (v.len, 0xFFFF); 169 unsigned int len = min (v.len, 0xFFFF);
109 return *this << uint16 (len) << data (v.ptr, len); 170 return *this << uint16 (len) << data (v.ptr, len);
110} 171}
111 172
112SockList &SockList::operator <<(const char *v) 173packet &packet::operator <<(const char *v)
113{ 174{
114 return *this << data (v, strlen (v ? v : 0)); 175 return *this << data (v, strlen (v ? v : 0));
115} 176}
116 177
117void 178void
118SockList::printf (const char *format, ...) 179packet::printf (const char *format, ...)
119{ 180{
181 int size = room ();
182
120 va_list ap; 183 va_list ap;
121 va_start (ap, format); 184 va_start (ap, format);
122
123 len += vsprintf ((char *)buf + len, format, ap); 185 int len = vsnprintf ((char *)cur, size, format, ap);
124
125 va_end (ap); 186 va_end (ap);
126}
127 187
128/* Basically does the reverse of SockList_AddInt, but on 188 if (len >= size)
129 * strings instead. Same for the GetShort, but for 16 bits. 189 return reset ();
190
191 cur += len;
192}
193
194/******************************************************************************
130 */ 195 *
196 * Start of read routines.
197 *
198 ******************************************************************************/
199
131int 200int
132GetInt_String (unsigned char *data) 201client_socket::read_packet ()
133{ 202{
134 return ((data[0] << 24) + (data[1] << 16) + (data[2] << 8) + data[3]); 203 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 } 204 {
167 /* We already have a partial packet */ 205 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 } 206 {
174 while ((stat == -1) && (errno == EINTR)); 207 unsigned int pkt_len = (inbuf [0] << 8) | inbuf [1];
175 208
176 if (stat < 0) 209 if (inbuf_len >= 2 + pkt_len)
210 return pkt_len + 2;
177 { 211 }
178 /* In non blocking mode, EAGAIN is set when there is no 212
179 * data available. 213 int amount = sizeof (inbuf) - inbuf_len;
180 */ 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 {
181 if (errno != EAGAIN && errno != EWOULDBLOCK) 230 if (errno != EAGAIN && errno != EINTR)
182 { 231 {
183 LOG (llevDebug, "ReadPacket got error %s, returning 0\n", strerror (errno)); 232 LOG (llevError, "read error: %s\n", strerror (errno));
233 return -1;
184 } 234 }
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 235
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; 236 return 0;
243 } 237 }
238
239 inbuf_len += amount;
240
241 cst_tot.ibytes += amount;
242 cst_lst.ibytes += amount;
244 } 243 }
245 while (toread > 0); 244}
246 return 0; 245
246void
247client_socket::skip_packet (int len)
248{
249 inbuf_len -= len;
250 memmove (inbuf, inbuf + len, inbuf_len);
247} 251}
248 252
249/******************************************************************************* 253/*******************************************************************************
250 * 254 *
251 * Start of write related routines. 255 * Start of write related routines.
… …
256 * Adds data to a socket buffer for whatever reason. 260 * Adds data to a socket buffer for whatever reason.
257 * 261 *
258 * 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
259 * data, and len is the number of bytes to add. 263 * data, and len is the number of bytes to add.
260 */ 264 */
261 265void
262static void 266client_socket::send (void *buf_, int len)
263add_to_buffer (NewSocket * ns, char *buf, int len)
264{ 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
265 int avail, end; 285 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 286
274 /* 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
275 * currently in use is actually data + end -1 288 * currently in use is actually data + end -1
276 */ 289 */
277
278 end = ns->outputbuffer.start + ns->outputbuffer.len; 290 end = outputbuffer.start + outputbuffer.len;
279 /* The buffer is already in a wrapped state, so adjust end */ 291 /* The buffer is already in a wrapped state, so adjust end */
280 if (end >= SOCKETBUFSIZE) 292 if (end >= SOCKETBUFSIZE)
281 end -= SOCKETBUFSIZE; 293 end -= SOCKETBUFSIZE;
282 294
283 avail = SOCKETBUFSIZE - end; 295 avail = SOCKETBUFSIZE - end;
284 296
285 /* We can all fit it behind the current data without wrapping */ 297 /* We can all fit it behind the current data without wrapping */
286 if (avail >= len) 298 if (avail >= len)
287 memcpy (ns->outputbuffer.data + end, buf, len); 299 memcpy (outputbuffer.data + end, buf, len);
288 else 300 else
289 { 301 {
290 memcpy (ns->outputbuffer.data + end, buf, avail); 302 memcpy (outputbuffer.data + end, buf, avail);
291 memcpy (ns->outputbuffer.data, buf + avail, len - avail); 303 memcpy (outputbuffer.data, buf + avail, len - avail);
292 } 304 }
293 305
294 ns->outputbuffer.len += len; 306 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} 307}
299 308
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 309void
307write_socket_buffer (NewSocket * ns) 310client_socket::socket_cb (iow &w, int got)
308{ 311{
309 int amt, max; 312 write_outputbuffer ();
310 313
311 if (ns->outputbuffer.len == 0) 314 if (!outputbuffer.len)
312 { 315 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} 316}
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 317
428/** 318/**
429 * 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
430 * shortcut function. 320 * shortcut function.
431 */ 321 */
432void 322void
433cs_write_string (NewSocket *ns, const char *buf, int len) 323client_socket::send_packet (packet &sl)
434{ 324{
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) 325 if (status == Ns_Dead)
455 return; 326 return;
456 327
457 if (msg->len >= MAXSOCKBUF) 328 if (sl.length () >= MAXSOCKBUF)
458 { 329 {
459 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 ());
460 /* 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
461 * it easier to debug. 332 * it easier to debug.
462 */ 333 */
463 abort (); 334 abort ();
464 } 335 }
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 336
472/** 337 if (!sl.length ())
473 * Takes a string of data, and writes it out to the socket. A very handy 338 return;
474 * shortcut function.
475 */
476void
477Write_String_To_Socket (NewSocket *ns, char *buf, int len)
478{
479 SockList sl;
480 339
481 sl.len = len; 340 assert (sl.hdrlen == 2);
482 sl.buf = (unsigned char *) buf;
483 Send_With_Handling (ns, &sl);
484}
485 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}
486 362
487/****************************************************************************** 363/******************************************************************************
488 * 364 *
489 * statistics logging functions. 365 * statistics logging functions.
490 * 366 *
… …
513 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",
514 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,
515 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);
516 cst_lst.ibytes = 0; 392 cst_lst.ibytes = 0;
517 cst_lst.obytes = 0; 393 cst_lst.obytes = 0;
518 cst_lst.max_conn = socket_info.nconns;
519 cst_lst.time_start = now; 394 cst_lst.time_start = now;
520} 395}
521#endif 396#endif
522 397

Diff Legend

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