--- deliantra/server/socket/lowlevel.C 2007/07/28 12:02:58 1.53 +++ deliantra/server/socket/lowlevel.C 2007/07/29 02:24:34 1.54 @@ -47,30 +47,36 @@ return; #if HAVE_TCP_INFO - // check about once per second, spread evenly over all clients - // do this only when player is active - if (!((pticks + fd) & 7) && pl && pl->active) - { - // check time of last ack, and, if too old, kill connection - socklen_t len = sizeof (tcpi); + // check time of last ack, and, if too old, kill connection + socklen_t len = sizeof (tcpi); - if (!getsockopt (fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi)) - { - if (tcpi.tcpi_snd_mss) - mss = tcpi.tcpi_snd_mss; + if (!getsockopt (fd, IPPROTO_TCP, TCP_INFO, &tcpi, &len) && len == sizeof (tcpi)) + { + if (tcpi.tcpi_snd_mss) + mss = tcpi.tcpi_snd_mss; - //fprintf (stderr, "uack %d sst %d cwnd %d mss %d pmtu %d\n", - // tcpi.tcpi_unacked, tcpi.tcpi_snd_ssthresh, tcpi.tcpi_snd_cwnd, tcpi.tcpi_advmss, tcpi.tcpi_pmtu); +#if 0 + fprintf (stderr, "uack %d ack %d lost %d ret %d fack %d sst %d cwnd %d mss %d pmtu %d advmss %d EXC %d\n", + tcpi.tcpi_unacked, + tcpi.tcpi_sacked, + tcpi.tcpi_lost, + tcpi.tcpi_retrans, + tcpi.tcpi_fackets, + tcpi.tcpi_snd_ssthresh, tcpi.tcpi_snd_cwnd, tcpi.tcpi_advmss, tcpi.tcpi_pmtu, tcpi.tcpi_advmss, + + tcpi.tcpi_snd_cwnd - (tcpi.tcpi_unacked - tcpi.tcpi_sacked)); +#endif - if (tcpi.tcpi_last_ack_recv > int (SOCKET_TIMEOUT * 1000)) - { - send_msg (NDI_RED | NDI_REPLY, "connection-timeout", "safety disconnect due to tcp/ip timeout (no packets received)"); - write_outputbuffer (); + // do this only when player is active + if (pl && pl->active + && tcpi.tcpi_last_ack_recv > int (SOCKET_TIMEOUT * 1000)) + { + send_msg (NDI_RED | NDI_REPLY, "connection-timeout", "safety disconnect due to tcp/ip timeout (no packets received)"); + write_outputbuffer (); - LOG (llevDebug, "connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd, - (unsigned)tcpi.tcpi_last_ack_recv, (unsigned)tcpi.tcpi_last_data_sent, (unsigned)tcpi.tcpi_unacked); - destroy (); - } + LOG (llevDebug, "connection on fd %d closed due to ack timeout (%u/%u/%u)\n", fd, + (unsigned)tcpi.tcpi_last_ack_recv, (unsigned)tcpi.tcpi_last_data_sent, (unsigned)tcpi.tcpi_unacked); + destroy (); } } #endif