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.49 by root, Sun Jul 1 05:00:20 2007 UTC vs.
Revision 1.60 by root, Mon Oct 1 01:09:10 2007 UTC

… …
31# include <sys/socket.h> 31# include <sys/socket.h>
32# include <netinet/in.h> 32# include <netinet/in.h>
33# include <netinet/tcp.h> 33# include <netinet/tcp.h>
34#endif 34#endif
35 35
36// disconnect a socket after this many seconds without an ack
37#define SOCKET_TIMEOUT 8.
38
39// force a packet when idle for more than this many seconds, 36// force a packet when idle for more than this many seconds,
40// forcing an ack regularly. 37// forcing an ack regularly.
41#define IDLE_PING 2. 38#define IDLE_PING 2.
42 39
43void 40void
44client::flush () 41client::flush ()
45{ 42{
46 if (destroyed ()) 43 if (destroyed ())
47 return; 44 return;
48
49#if HAVE_TCP_INFO
50 // check about once per second, spread evenly over all clients
51 // do this only when player is active
52 if (!((pticks + fd) & 7) && pl && pl->active)
53 {
54 // check time of last ack, and, if too old, kill connection
55 struct tcp_info tcpi;
56 socklen_t len = sizeof (tcpi);
57
58 if (!getsockopt (fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi))
59 {
60 if (tcpi.tcpi_snd_mss)
61 mss = tcpi.tcpi_snd_mss;
62
63 rtt = tcpi.tcpi_rtt;
64 rttvar = tcpi.tcpi_rttvar;
65
66 if (tcpi.tcpi_last_ack_recv > int (SOCKET_TIMEOUT * 1000))
67 {
68 send_msg (NDI_RED, "connection-timeout", "safety disconnect due to tcp/ip timeout (no packets received)");
69 write_outputbuffer ();
70
71 LOG (llevDebug, "connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd,
72 (unsigned)tcpi.tcpi_last_ack_recv, (unsigned)tcpi.tcpi_last_data_sent, (unsigned)tcpi.tcpi_unacked);
73 destroy ();
74 }
75 }
76 }
77#endif
78 45
79 /** 46 /**
80 * Writes data to socket. 47 * Writes data to socket.
81 * 48 *
82 * When the socket is clear to write, and we have backlogged data, this 49 * When the socket is clear to write, and we have backlogged data, this
… …
165 if (inbuf_len >= 2 + pkt_len) 132 if (inbuf_len >= 2 + pkt_len)
166 return 2 + pkt_len; 133 return 2 + pkt_len;
167 134
168 if (inbuf_len == sizeof (inbuf)) 135 if (inbuf_len == sizeof (inbuf))
169 { 136 {
170 send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED); 137 send_packet_printf ("drawinfo %d input buffer overflow - closing connection.", NDI_RED | NDI_REPLY);
171 destroy (); 138 destroy ();
172 return -1; 139 return -1;
173 } 140 }
174 } 141 }
175 142
… …
269 ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl); 236 ((void (*)(char *, int, player *))pkt->cb)((char *)data, datalen, pl);
270 else 237 else
271 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this); 238 ((void (*)(char *, int, client *))pkt->cb)((char *)data, datalen, this);
272 } 239 }
273 else 240 else
274 send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED, pkt->name); 241 send_packet_printf ("drawinfo %d ERROR: you cannot execute '%s' now.", NDI_RED | NDI_REPLY, pkt->name);
275} 242}
276 243
277bool 244bool
278client::handle_packet () 245client::handle_packet ()
279{ 246{
… …
320 287
321 goto next_packet; 288 goto next_packet;
322 } 289 }
323 290
324 // If we get here, we didn't find a valid command. 291 // If we get here, we didn't find a valid command.
325 send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED, (char *)inbuf + 2); 292 send_packet_printf ("drawinfo %d ERROR: command '%s' not supported.", NDI_RED | NDI_REPLY, (char *)inbuf + 2);
326next_packet: 293next_packet:
327 skip_packet (pkt_len); 294 skip_packet (pkt_len);
328 295
329 // input buffer has space again 296 // input buffer has space again
330 socket_ev.poll (socket_ev.poll () | PE_R); 297 socket_ev.poll (socket_ev.poll () | PE_R);
… …
384 } 351 }
385 else 352 else
386 { 353 {
387 inbuf_len += amount; 354 inbuf_len += amount;
388 355
389 cmd_ev.start ();
390 }
391 }
392}
393
394// called whenever we have additional commands to process
395void
396client::cmd_cb (iw &w)
397{
398 if (handle_packet ()) 356 if (handle_packet ())
399 w.start (); 357 {
400 else 358 while (handle_packet ())
401 flush (); 359 ;
360
361 flush ();
362 }
363 }
364 }
402} 365}
403 366
404/******************************************************************************* 367/*******************************************************************************
405 * 368 *
406 * Start of write related routines. 369 * Start of write related routines.
… …
462client::send_packet (packet &sl) 425client::send_packet (packet &sl)
463{ 426{
464 if (destroyed ()) 427 if (destroyed ())
465 return; 428 return;
466 429
467 if (sl.length () >= MAXSOCKBUF) 430 if (sl.length () > MAXSOCKBUF)
468 { 431 {
469 LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ()); 432 LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ());
470 /* Almost certainly we've overflowed a buffer, so quit now to make 433 /* Almost certainly we've overflowed a buffer, so quit now to make
471 * it easier to debug. 434 * it easier to debug.
472 */ 435 */
… …
520} 483}
521 484
522void 485void
523client::send_msg (int color, const char *type, const char *msg) 486client::send_msg (int color, const char *type, const char *msg)
524{ 487{
525 if (msg_is_special (msg)) 488 if (!msg || !type) // it can happen (for example, missing attack messages cause this)
489 {
490 LOG (logBacktrace | llevError, "send_msg(%d,%p,%p) called with NULL msg or type.\n", color, type, msg);
491 return;
492 }
493
494 int len = strlen (msg);
495
496 if (msg_is_special (msg) || (type [0] == 'c' && type [1] == '/') || len > (MAXSOCKBUF - 128))
526 cfperl_send_msg (this, color, type, msg); 497 cfperl_send_msg (this, color, type, msg);
527 else if (can_msg) 498 else if (can_msg)
528 send_packet_printf ("msg %d %s %s", color, type, msg); 499 send_packet_printf ("msg %d %s %s", color & NDI_CLIENT_MASK, type, msg);
529 else if (color < 0) 500 else if (color < 0)
530 return; // client cannot handle this 501 return; // client cannot handle this
531 else 502 else
532 send_packet_printf ("drawinfo %d %s", color, msg); 503 send_packet_printf ("drawinfo %d %s", color & NDI_COLOR_MASK, msg);
533} 504}
534 505
535void 506void
536client::send_drawinfo (const char *msg, int flags) 507client::send_drawinfo (const char *msg, int flags)
537{ 508{

Diff Legend

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