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

Diff Legend

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