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.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 * packet functions/utilities 143 * packet functions/utilities
86 * 144 *
87 **********************************************************************/ 145 **********************************************************************/
88 146
89packet &packet::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
… …
115} 178}
116 179
117void 180void
118packet::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 187 int len = vsnprintf ((char *)cur, size, format, ap);
123 len += vsnprintf ((char *)buf + len, MAXSOCKBUF, format, ap);
124
125 va_end (ap); 188 va_end (ap);
189
190 if (len >= size)
191 return reset ();
192
193 cur += len;
126} 194}
127 195
128/****************************************************************************** 196/******************************************************************************
129 * 197 *
130 * Start of read routines. 198 * Start of read routines.
131 * 199 *
132 ******************************************************************************/ 200 ******************************************************************************/
133 201
134int 202int
135NewSocket::read_packet () 203client::read_packet ()
136{ 204{
137 for (;;) 205 for (;;)
138 { 206 {
139 if (inbuf_len >= 2) 207 if (inbuf_len >= 2)
140 { 208 {
… …
161 } 229 }
162 else if (amount < 0) 230 else if (amount < 0)
163 { 231 {
164 if (errno != EAGAIN && errno != EINTR) 232 if (errno != EAGAIN && errno != EINTR)
165 { 233 {
166 LOG (llevError, "read error: %s", strerror (errno)); 234 LOG (llevError, "read error: %s\n", strerror (errno));
167 return -1; 235 return -1;
168 } 236 }
169 237
170 return 0; 238 return 0;
171 } 239 }
… …
176 cst_lst.ibytes += amount; 244 cst_lst.ibytes += amount;
177 } 245 }
178} 246}
179 247
180void 248void
181NewSocket::skip_packet (int len) 249client::skip_packet (int len)
182{ 250{
183 inbuf_len -= len; 251 inbuf_len -= len;
184 memmove (inbuf, inbuf + len, inbuf_len); 252 memmove (inbuf, inbuf + len, inbuf_len);
185} 253}
186 254
… …
194 * Adds data to a socket buffer for whatever reason. 262 * Adds data to a socket buffer for whatever reason.
195 * 263 *
196 * 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
197 * data, and len is the number of bytes to add. 265 * data, and len is the number of bytes to add.
198 */ 266 */
199 267void
200static void 268client::send (void *buf_, int len)
201add_to_buffer (NewSocket *ns, char *buf, int len)
202{ 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
203 int avail, end; 287 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 288
212 /* 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
213 * currently in use is actually data + end -1 290 * currently in use is actually data + end -1
214 */ 291 */
215
216 end = ns->outputbuffer.start + ns->outputbuffer.len; 292 end = outputbuffer.start + outputbuffer.len;
217 /* The buffer is already in a wrapped state, so adjust end */ 293 /* The buffer is already in a wrapped state, so adjust end */
218 if (end >= SOCKETBUFSIZE) 294 if (end >= SOCKETBUFSIZE)
219 end -= SOCKETBUFSIZE; 295 end -= SOCKETBUFSIZE;
220 296
221 avail = SOCKETBUFSIZE - end; 297 avail = SOCKETBUFSIZE - end;
222 298
223 /* We can all fit it behind the current data without wrapping */ 299 /* We can all fit it behind the current data without wrapping */
224 if (avail >= len) 300 if (avail >= len)
225 memcpy (ns->outputbuffer.data + end, buf, len); 301 memcpy (outputbuffer.data + end, buf, len);
226 else 302 else
227 { 303 {
228 memcpy (ns->outputbuffer.data + end, buf, avail); 304 memcpy (outputbuffer.data + end, buf, avail);
229 memcpy (ns->outputbuffer.data, buf + avail, len - avail); 305 memcpy (outputbuffer.data, buf + avail, len - avail);
230 } 306 }
231 307
232 ns->outputbuffer.len += len; 308 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} 309}
237 310
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 311void
245write_socket_buffer (NewSocket * ns) 312client::socket_cb (iow &w, int got)
246{ 313{
247 int amt, max; 314 write_outputbuffer ();
248 315
249 if (ns->outputbuffer.len == 0) 316 if (!outputbuffer.len)
250 { 317 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} 318}
364 319
365/** 320/**
366 * 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
367 * shortcut function. 322 * shortcut function.
368 */ 323 */
369
370void 324void
371NewSocket::send_packet (packet &sl) 325client::send_packet (packet &sl)
372{ 326{
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) 327 if (status == Ns_Dead)
403 return; 328 return;
404 329
405 if (msg->len >= MAXSOCKBUF) 330 if (sl.length () >= MAXSOCKBUF)
406 { 331 {
407 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 ());
408 /* 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
409 * it easier to debug. 334 * it easier to debug.
410 */ 335 */
411 abort (); 336 abort ();
412 } 337 }
413 sbuf[0] = ((uint32) (msg->len) >> 8) & 0xFF; 338
414 sbuf[1] = ((uint32) (msg->len)) & 0xFF; 339 if (!sl.length ())
415 if (ns->status != Ns_Old) 340 return;
416 Write_To_Socket (ns, (char *) sbuf, 2); 341
417 Write_To_Socket (ns, (char *) msg->buf, msg->len); 342 assert (sl.hdrlen == 2);
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));
418} 363}
419 364
420/****************************************************************************** 365/******************************************************************************
421 * 366 *
422 * statistics logging functions. 367 * statistics logging functions.
… …
446 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",
447 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,
448 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);
449 cst_lst.ibytes = 0; 394 cst_lst.ibytes = 0;
450 cst_lst.obytes = 0; 395 cst_lst.obytes = 0;
451 cst_lst.max_conn = socket_info.nconns;
452 cst_lst.time_start = now; 396 cst_lst.time_start = now;
453} 397}
454#endif 398#endif
455 399

Diff Legend

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