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.14 by root, Thu Dec 14 01:21:58 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 * packet functions/utilities 141 * packet functions/utilities
86 * 142 *
87 **********************************************************************/ 143 **********************************************************************/
88 144
89packet &packet::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
… …
115} 176}
116 177
117void 178void
118packet::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 185 int len = vsnprintf ((char *)cur, size, format, ap);
123 len += vsnprintf ((char *)buf + len, MAXSOCKBUF, format, ap);
124
125 va_end (ap); 186 va_end (ap);
187
188 if (len >= size)
189 return reset ();
190
191 cur += len;
126} 192}
127 193
128/****************************************************************************** 194/******************************************************************************
129 * 195 *
130 * Start of read routines. 196 * Start of read routines.
131 * 197 *
132 ******************************************************************************/ 198 ******************************************************************************/
133 199
134int 200int
135NewSocket::read_packet () 201client_socket::read_packet ()
136{ 202{
137 for (;;) 203 for (;;)
138 { 204 {
139 if (inbuf_len >= 2) 205 if (inbuf_len >= 2)
140 { 206 {
… …
161 } 227 }
162 else if (amount < 0) 228 else if (amount < 0)
163 { 229 {
164 if (errno != EAGAIN && errno != EINTR) 230 if (errno != EAGAIN && errno != EINTR)
165 { 231 {
166 LOG (llevError, "read error: %s", strerror (errno)); 232 LOG (llevError, "read error: %s\n", strerror (errno));
167 return -1; 233 return -1;
168 } 234 }
169 235
170 return 0; 236 return 0;
171 } 237 }
… …
176 cst_lst.ibytes += amount; 242 cst_lst.ibytes += amount;
177 } 243 }
178} 244}
179 245
180void 246void
181NewSocket::skip_packet (int len) 247client_socket::skip_packet (int len)
182{ 248{
183 inbuf_len -= len; 249 inbuf_len -= len;
184 memmove (inbuf, inbuf + len, inbuf_len); 250 memmove (inbuf, inbuf + len, inbuf_len);
185} 251}
186 252
… …
194 * Adds data to a socket buffer for whatever reason. 260 * Adds data to a socket buffer for whatever reason.
195 * 261 *
196 * 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
197 * data, and len is the number of bytes to add. 263 * data, and len is the number of bytes to add.
198 */ 264 */
199 265void
200static void 266client_socket::send (void *buf_, int len)
201add_to_buffer (NewSocket *ns, char *buf, int len)
202{ 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
203 int avail, end; 285 int avail, end;
204
205 if ((len + ns->outputbuffer.len) > SOCKETBUFSIZE)
206 {
207 LOG (llevDebug, "Socket on fd %d has overrun internal buffer - marking as dead\n", ns->fd);
208 ns->status = Ns_Dead;
209 return;
210 }
211 286
212 /* 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
213 * currently in use is actually data + end -1 288 * currently in use is actually data + end -1
214 */ 289 */
215
216 end = ns->outputbuffer.start + ns->outputbuffer.len; 290 end = outputbuffer.start + outputbuffer.len;
217 /* The buffer is already in a wrapped state, so adjust end */ 291 /* The buffer is already in a wrapped state, so adjust end */
218 if (end >= SOCKETBUFSIZE) 292 if (end >= SOCKETBUFSIZE)
219 end -= SOCKETBUFSIZE; 293 end -= SOCKETBUFSIZE;
220 294
221 avail = SOCKETBUFSIZE - end; 295 avail = SOCKETBUFSIZE - end;
222 296
223 /* We can all fit it behind the current data without wrapping */ 297 /* We can all fit it behind the current data without wrapping */
224 if (avail >= len) 298 if (avail >= len)
225 memcpy (ns->outputbuffer.data + end, buf, len); 299 memcpy (outputbuffer.data + end, buf, len);
226 else 300 else
227 { 301 {
228 memcpy (ns->outputbuffer.data + end, buf, avail); 302 memcpy (outputbuffer.data + end, buf, avail);
229 memcpy (ns->outputbuffer.data, buf + avail, len - avail); 303 memcpy (outputbuffer.data, buf + avail, len - avail);
230 } 304 }
231 305
232 ns->outputbuffer.len += len; 306 outputbuffer.len += len;
233#if 0
234 LOG (llevDebug, "Added %d to output buffer, total length now %d, start=%d\n", len, ns->outputbuffer.len, ns->outputbuffer.start);
235#endif
236} 307}
237 308
238/**
239 * Writes data to socket.
240 *
241 * When the socket is clear to write, and we have backlogged data, this
242 * is called to write it out.
243 */
244void 309void
245write_socket_buffer (NewSocket * ns) 310client_socket::socket_cb (iow &w, int got)
246{ 311{
247 int amt, max; 312 write_outputbuffer ();
248 313
249 if (ns->outputbuffer.len == 0) 314 if (!outputbuffer.len)
250 { 315 socket_ev.poll (socket_ev.poll () & ~PE_W);
251 LOG (llevDebug, "write_socket_buffer called when there is no data, fd=%d\n", ns->fd);
252 return;
253 }
254
255 do
256 {
257 max = SOCKETBUFSIZE - ns->outputbuffer.start;
258 if (ns->outputbuffer.len < max)
259 max = ns->outputbuffer.len;
260
261 do
262 {
263 amt = write (ns->fd, ns->outputbuffer.data + ns->outputbuffer.start, max);
264 }
265 while ((amt < 0) && (errno == EINTR));
266
267 if (amt < 0)
268 { /* We got an error */
269
270 if (errno != EWOULDBLOCK)
271 {
272 LOG (llevError, "New socket write failed (wsb) (%d: %s).\n", errno, strerror (errno));
273 ns->status = Ns_Dead;
274 return;
275 }
276 else
277 { /* EWOULDBLOCK */
278 /* can't write it, so store it away. */
279 ns->can_write = 0;
280 return;
281 }
282 }
283 ns->outputbuffer.start += amt;
284 /* wrap back to start of buffer */
285 if (ns->outputbuffer.start == SOCKETBUFSIZE)
286 ns->outputbuffer.start = 0;
287 ns->outputbuffer.len -= amt;
288#ifdef CS_LOGSTATS
289 cst_tot.obytes += amt;
290 cst_lst.obytes += amt;
291#endif
292 }
293 while (ns->outputbuffer.len > 0);
294}
295
296/**
297 * This writes data to the socket. - It is very low level -
298 * all we try and do is write out the data to the socket
299 * provided (ns). buf is the data to write, len is the number
300 * of bytes to write. IT doesn't return anything - rather, it
301 * updates the ns structure if we get an error.
302 */
303void
304Write_To_Socket (NewSocket * ns, char *buf, int len)
305{
306 int amt = 0;
307 char *pos = buf;
308
309 if (ns->status == Ns_Dead || !buf)
310 {
311 LOG (llevDebug, "Write_To_Socket called with dead socket\n");
312 return;
313 }
314
315#ifndef __GNU__ /* This caused problems on Hurd */
316 if (!ns->can_write)
317 {
318 add_to_buffer (ns, buf, len);
319 return;
320 }
321#endif
322 /* If we manage to write more than we wanted, take it as a bonus */
323 while (len > 0)
324 {
325
326 do
327 {
328 amt = write (ns->fd, pos, len);
329 }
330 while ((amt < 0) && (errno == EINTR));
331
332 if (amt < 0)
333 { /* We got an error */
334 if (errno != EWOULDBLOCK)
335 {
336 LOG (llevError, "New socket write failed WTS (%d: %s).\n", /* ---WIN32 */
337 errno, strerror (errno));
338 ns->status = Ns_Dead;
339 return;
340 }
341 else
342 { /* EWOULDBLOCK */
343 /* can't write it, so store it away. */
344 add_to_buffer (ns, pos, len);
345 ns->can_write = 0;
346 return;
347 }
348 }
349 /* amt gets set to 0 above in blocking code, so we do this as
350 * an else if to make sure we don't reprocess it.
351 */
352 else if (amt == 0)
353 {
354 LOG (llevError, "Write_To_Socket: No data written out.\n");
355 }
356 len -= amt;
357 pos += amt;
358#ifdef CS_LOGSTATS
359 cst_tot.obytes += amt;
360 cst_lst.obytes += amt;
361#endif
362 }
363} 316}
364 317
365/** 318/**
366 * 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
367 * shortcut function. 320 * shortcut function.
368 */ 321 */
369
370void 322void
371NewSocket::send_packet (packet &sl) 323client_socket::send_packet (packet &sl)
372{ 324{
373 Send_With_Handling (this, &sl);
374}
375
376void
377NewSocket::send_packet (const char *buf, int len)
378{
379 packet sl;
380
381 sl << data (buf, len);
382 send_packet (sl);
383}
384
385void
386NewSocket::send_packet (const char *buf)
387{
388 send_packet (buf, strlen (buf));
389}
390
391/**
392 * Calls Write_To_Socket to send data to the client.
393 *
394 * The only difference in this function is that we take a packet
395 *, and we prepend the length information.
396 */
397void
398Send_With_Handling (NewSocket *ns, packet *msg)
399{
400 unsigned char sbuf[4];
401
402 if (ns->status == Ns_Dead || !msg) 325 if (status == Ns_Dead)
403 return; 326 return;
404 327
405 if (msg->len >= MAXSOCKBUF) 328 if (sl.length () >= MAXSOCKBUF)
406 { 329 {
407 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 ());
408 /* 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
409 * it easier to debug. 332 * it easier to debug.
410 */ 333 */
411 abort (); 334 abort ();
412 } 335 }
413 sbuf[0] = ((uint32) (msg->len) >> 8) & 0xFF; 336
414 sbuf[1] = ((uint32) (msg->len)) & 0xFF; 337 if (!sl.length ())
415 if (ns->status != Ns_Old) 338 return;
416 Write_To_Socket (ns, (char *) sbuf, 2); 339
417 Write_To_Socket (ns, (char *) msg->buf, msg->len); 340 assert (sl.hdrlen == 2);
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));
418} 361}
419 362
420/****************************************************************************** 363/******************************************************************************
421 * 364 *
422 * statistics logging functions. 365 * statistics logging functions.
… …
446 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",
447 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,
448 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);
449 cst_lst.ibytes = 0; 392 cst_lst.ibytes = 0;
450 cst_lst.obytes = 0; 393 cst_lst.obytes = 0;
451 cst_lst.max_conn = socket_info.nconns;
452 cst_lst.time_start = now; 394 cst_lst.time_start = now;
453} 395}
454#endif 396#endif
455 397

Diff Legend

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