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/misc.c | |
| parent | slirp: Drop link_up checks from if_output and slirp_socket_can_recv (diff) | |
| download | qemu-kvm-460fec67ee3807bb2eb189587ffe803a48f317e5.tar.gz qemu-kvm-460fec67ee3807bb2eb189587ffe803a48f317e5.tar.bz2 qemu-kvm-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/misc.c')
| -rw-r--r-- | slirp/misc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/slirp/misc.c b/slirp/misc.c index ee14db5e3..c2b66fd96 100644 --- a/slirp/misc.c +++ b/slirp/misc.c @@ -385,6 +385,7 @@ void slirp_connection_info(Monitor *mon) [TCPS_FIN_WAIT_2] = "FIN_WAIT_2", [TCPS_TIME_WAIT] = "TIME_WAIT", }; + Slirp *slirp = &slirp_instance; struct in_addr dst_addr; struct sockaddr_in src; socklen_t src_len; @@ -397,7 +398,7 @@ void slirp_connection_info(Monitor *mon) monitor_printf(mon, " Protocol[State] FD Source Address Port " "Dest. Address Port RecvQ SendQ\n"); - for (so = tcb.so_next; so != &tcb; so = so->so_next) { + for (so = slirp->tcb.so_next; so != &slirp->tcb; so = so->so_next) { if (so->so_state & SS_HOSTFWD) { state = "HOST_FORWARD"; } else if (so->so_tcpcb) { @@ -427,7 +428,7 @@ void slirp_connection_info(Monitor *mon) so->so_rcv.sb_cc, so->so_snd.sb_cc); } - for (so = udb.so_next; so != &udb; so = so->so_next) { + for (so = slirp->udb.so_next; so != &slirp->udb; so = so->so_next) { if (so->so_state & SS_HOSTFWD) { n = snprintf(buf, sizeof(buf), " UDP[HOST_FORWARD]"); src_len = sizeof(src); |