Merge branch 'ppc-for-upstream' of git://github.com/agraf/qemu

[qemu.git] / slirp / tcp_timer.c

diff --git a/slirp/tcp_timer.c b/slirp/tcp_timer.c
index cd71572bbfae09c276ff2aaa3187f1708d397357..6c5bb11cc39aeebe057b80848f216ce7e6864319 100644 (file)
--- a/slirp/tcp_timer.c
+++ b/slirp/tcp_timer.c
@@ -32,24 +32,22 @@
 
 #include <slirp.h>
 
-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
  */
 void
-tcp_fasttimo(void)
+tcp_fasttimo(Slirp *slirp)
 {
        register struct socket *so;
        register struct tcpcb *tp;
 
        DEBUG_CALL("tcp_fasttimo");
 
-       so = tcb.so_next;
+       so = slirp->tcb.so_next;
        if (so)
-       for (; so != &tcb; so = so->so_next)
+       for (; so != &slirp->tcb; so = so->so_next)
                if ((tp = (struct tcpcb *)so->so_tcpcb) &&
                    (tp->t_flags & TF_DELACK)) {
                        tp->t_flags &= ~TF_DELACK;
@@ -64,7 +62,7 @@ tcp_fasttimo(void)
  * causes finite state machine actions if timers expire.
  */
 void
-tcp_slowtimo(void)
+tcp_slowtimo(Slirp *slirp)
 {
        register struct socket *ip, *ipnxt;
        register struct tcpcb *tp;
@@ -75,14 +73,16 @@ tcp_slowtimo(void)
        /*
         * Search through tcb's and update active timers.
         */
-       ip = tcb.so_next;
-       if (ip == 0)
-          return;
-       for (; ip != &tcb; ip = ipnxt) {
+       ip = slirp->tcb.so_next;
+        if (ip == NULL) {
+            return;
+        }
+       for (; ip != &slirp->tcb; ip = ipnxt) {
                ipnxt = ip->so_next;
                tp = sototcpcb(ip);
-               if (tp == 0)
-                       continue;
+                if (tp == NULL) {
+                        continue;
+                }
                for (i = 0; i < TCPT_NTIMERS; i++) {
                        if (tp->t_timer[i] && --tp->t_timer[i] == 0) {
                                tcp_timers(tp,i);
@@ -96,8 +96,8 @@ tcp_slowtimo(void)
 tpgone:
                ;
        }
-       tcp_iss += TCP_ISSINCR/PR_SLOWHZ;               /* increment iss */
-       tcp_now++;                                      /* for timestamps */
+       slirp->tcp_iss += TCP_ISSINCR/PR_SLOWHZ;        /* increment iss */
+       slirp->tcp_now++;                               /* for timestamps */
 }
 
 /*