Update Changelog with new Xscale platforms and vmsvga.

[qemu] / slirp / tcp_timer.c

diff --git a/slirp/tcp_timer.c b/slirp/tcp_timer.c
index 044c2b8..244bad6 100644 (file)
--- a/slirp/tcp_timer.c
+++ b/slirp/tcp_timer.c
@@ -36,14 +36,14 @@
 
 #include <slirp.h>
 
-int    tcp_keepidle = TCPTV_KEEP_IDLE;
-int    tcp_keepintvl = TCPTV_KEEPINTVL;
-int    tcp_maxidle;
-int    so_options = DO_KEEPALIVE;
-
+#ifdef LOG_ENABLED
 struct   tcpstat tcpstat;        /* tcp statistics */
+#endif
+
 u_int32_t        tcp_now;                /* for RFC 1323 timestamps */
 
+static struct tcpcb *tcp_timers(register struct tcpcb *tp, int timer);
+
 /*
  * Fast timeout routine for processing delayed acks
  */
@@ -62,7 +62,7 @@ tcp_fasttimo()
                    (tp->t_flags & TF_DELACK)) {
                        tp->t_flags &= ~TF_DELACK;
                        tp->t_flags |= TF_ACKNOW;
-                       tcpstat.tcps_delack++;
+                       STAT(tcpstat.tcps_delack++);
                        (void) tcp_output(tp);
                }
 }
@@ -81,7 +81,6 @@ tcp_slowtimo()
 
        DEBUG_CALL("tcp_slowtimo");
 
-       tcp_maxidle = TCPTV_KEEPCNT * tcp_keepintvl;
        /*
         * Search through tcb's and update active timers.
         */
@@ -127,16 +126,14 @@ tcp_canceltimers(tp)
                tp->t_timer[i] = 0;
 }
 
-int    tcp_backoff[TCP_MAXRXTSHIFT + 1] =
+const int tcp_backoff[TCP_MAXRXTSHIFT + 1] =
    { 1, 2, 4, 8, 16, 32, 64, 64, 64, 64, 64, 64, 64 };
 
 /*
  * TCP timer processing.
  */
-struct tcpcb *
-tcp_timers(tp, timer)
-       register struct tcpcb *tp;
-       int timer;
+static struct tcpcb *
+tcp_timers(register struct tcpcb *tp, int timer)
 {
        register int rexmt;
 
@@ -152,8 +149,8 @@ tcp_timers(tp, timer)
         */
        case TCPT_2MSL:
                if (tp->t_state != TCPS_TIME_WAIT &&
-                   tp->t_idle <= tcp_maxidle)
-                       tp->t_timer[TCPT_2MSL] = tcp_keepintvl;
+                   tp->t_idle <= TCP_MAXIDLE)
+                       tp->t_timer[TCPT_2MSL] = TCPTV_KEEPINTVL;
                else
                        tp = tcp_close(tp);
                break;
@@ -164,12 +161,12 @@ tcp_timers(tp, timer)
         * to a longer retransmit interval and retransmit one segment.
         */
        case TCPT_REXMT:
-       
+
                /*
                 * XXXXX If a packet has timed out, then remove all the queued
                 * packets for that session.
                 */
-       
+
                if (++tp->t_rxtshift > TCP_MAXRXTSHIFT) {
                        /*
                         * This is a hack to suit our terminal server here at the uni of canberra
@@ -185,26 +182,26 @@ tcp_timers(tp, timer)
                         *
                         * *sigh*
                         */
-               
+
                        tp->t_maxseg >>= 1;
                        if (tp->t_maxseg < 32) {
                                /*
                                 * We tried our best, now the connection must die!
                                 */
                                tp->t_rxtshift = TCP_MAXRXTSHIFT;
-                               tcpstat.tcps_timeoutdrop++;
+                               STAT(tcpstat.tcps_timeoutdrop++);
                                tp = tcp_drop(tp, tp->t_softerror);
                                /* tp->t_softerror : ETIMEDOUT); */ /* XXX */
                                return (tp); /* XXX */
                        }
-               
+
                        /*
                         * Set rxtshift to 6, which is still at the maximum
                         * backoff time
                         */
                        tp->t_rxtshift = 6;
                }
-               tcpstat.tcps_rexmttimeo++;
+               STAT(tcpstat.tcps_rexmttimeo++);
                rexmt = TCP_REXMTVAL(tp) * tcp_backoff[tp->t_rxtshift];
                TCPT_RANGESET(tp->t_rxtcur, rexmt,
                    (short)tp->t_rttmin, TCPTV_REXMTMAX); /* XXX */
@@ -267,7 +264,7 @@ tcp_timers(tp, timer)
         * Force a byte to be output, if possible.
         */
        case TCPT_PERSIST:
-               tcpstat.tcps_persisttimeo++;
+               STAT(tcpstat.tcps_persisttimeo++);
                tcp_setpersist(tp);
                tp->t_force = 1;
                (void) tcp_output(tp);
@@ -279,13 +276,13 @@ tcp_timers(tp, timer)
         * or drop connection if idle for too long.
         */
        case TCPT_KEEP:
-               tcpstat.tcps_keeptimeo++;
+               STAT(tcpstat.tcps_keeptimeo++);
                if (tp->t_state < TCPS_ESTABLISHED)
                        goto dropit;
 
 /*             if (tp->t_socket->so_options & SO_KEEPALIVE && */
-               if ((so_options) && tp->t_state <= TCPS_CLOSE_WAIT) {
-                       if (tp->t_idle >= tcp_keepidle + tcp_maxidle)
+               if ((SO_OPTIONS) && tp->t_state <= TCPS_CLOSE_WAIT) {
+                       if (tp->t_idle >= TCPTV_KEEP_IDLE + TCP_MAXIDLE)
                                goto dropit;
                        /*
                         * Send a packet designed to force a response
@@ -299,7 +296,7 @@ tcp_timers(tp, timer)
                         * by the protocol spec, this requires the
                         * correspondent TCP to respond.
                         */
-                       tcpstat.tcps_keepprobe++;
+                       STAT(tcpstat.tcps_keepprobe++);
 #ifdef TCP_COMPAT_42
                        /*
                         * The keepalive packet must have nonzero length
@@ -311,13 +308,13 @@ tcp_timers(tp, timer)
                        tcp_respond(tp, &tp->t_template, (struct mbuf *)NULL,
                            tp->rcv_nxt, tp->snd_una - 1, 0);
 #endif
-                       tp->t_timer[TCPT_KEEP] = tcp_keepintvl;
+                       tp->t_timer[TCPT_KEEP] = TCPTV_KEEPINTVL;
                } else
-                       tp->t_timer[TCPT_KEEP] = tcp_keepidle;
+                       tp->t_timer[TCPT_KEEP] = TCPTV_KEEP_IDLE;
                break;
 
        dropit:
-               tcpstat.tcps_keepdrops++;
+               STAT(tcpstat.tcps_keepdrops++);
                tp = tcp_drop(tp, 0); /* ETIMEDOUT); */
                break;
        }