diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2009-06-24 14:42:31 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-06-29 08:52:49 -0500 |
| commit | 460fec67ee3807bb2eb189587ffe803a48f317e5 (patch) | |
| tree | 398605fd3595389ac29b7af0e0151a19edf25ff5 /slirp/tcp_timer.c | |
| parent | b5302e1a9d8a47bd29a3e1876fba34be111728a2 (diff) | |
| download | focaccia-qemu-460fec67ee3807bb2eb189587ffe803a48f317e5.tar.gz focaccia-qemu-460fec67ee3807bb2eb189587ffe803a48f317e5.zip | |
slirp: Factor out internal state structure
The essence of this patch is to stuff (almost) all global variables of the slirp stack into the structure Slirp. In this step, we still keep the structure as global variable, directly accessible by the whole stack. Changes to the external interface of slirp will be applied in the following patches. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'slirp/tcp_timer.c')
| -rw-r--r-- | slirp/tcp_timer.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/slirp/tcp_timer.c b/slirp/tcp_timer.c index cd71572bbf..556e32eadd 100644 --- 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,10 +73,10 @@ tcp_slowtimo(void) /* * Search through tcb's and update active timers. */ - ip = tcb.so_next; + ip = slirp->tcb.so_next; if (ip == 0) return; - for (; ip != &tcb; ip = ipnxt) { + for (; ip != &slirp->tcb; ip = ipnxt) { ipnxt = ip->so_next; tp = sototcpcb(ip); if (tp == 0) @@ -96,8 +94,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 */ } /* |