diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2009-06-24 14:42:28 +0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-06-29 08:52:44 -0500 |
| commit | e15f4a992cd8c6fcec42bc00c85c2641a2fbcb14 (patch) | |
| tree | 0029aef7dbe3c3cc1d9cf7d688b285013726eec4 /slirp | |
| parent | b35725c544eca03f09783f03a677c9faa5658e2e (diff) | |
Revert "User networking: Show active connections"
This reverts commit 1c6ed9f3379faac83da0ed3e95cbd49003ac0dd1.
It's redundant to slirp statistics, which are going to be split up /
reworked later on.
Conflicts:
monitor.c
net.c
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'slirp')
| -rw-r--r-- | slirp/libslirp.h | 4 | ||||
| -rw-r--r-- | slirp/slirp.c | 24 |
2 files changed, 0 insertions, 28 deletions
diff --git a/slirp/libslirp.h b/slirp/libslirp.h index d0df24b2af..c04f3a2720 100644 --- a/slirp/libslirp.h +++ b/slirp/libslirp.h @@ -18,10 +18,6 @@ void slirp_input(const uint8_t *pkt, int pkt_len); int slirp_can_output(void); void slirp_output(const uint8_t *pkt, int pkt_len); -void slirp_redir_loop(void (*func)(void *opaque, int is_udp, - struct in_addr *laddr, u_int lport, - struct in_addr *faddr, u_int fport), - void *opaque); int slirp_redir_rm(int is_udp, int host_port); int slirp_redir(int is_udp, int host_port, struct in_addr guest_addr, int guest_port); diff --git a/slirp/slirp.c b/slirp/slirp.c index 30d4ee2d26..b3db74223a 100644 --- a/slirp/slirp.c +++ b/slirp/slirp.c @@ -734,30 +734,6 @@ void if_encap(const uint8_t *ip_data, int ip_data_len) } } -static void _slirp_redir_loop(void (*func)(void *opaque, int is_udp, - struct in_addr *laddr, u_int lport, - struct in_addr *faddr, u_int fport), - void *opaque, int is_udp) -{ - struct socket *head = (is_udp ? &udb : &tcb); - struct socket *so; - - for (so = head->so_next; so != head; so = so->so_next) { - func(opaque, is_udp, - &so->so_laddr, ntohs(so->so_lport), - &so->so_faddr, ntohs(so->so_fport)); - } -} - -void slirp_redir_loop(void (*func)(void *opaque, int is_udp, - struct in_addr *laddr, u_int lport, - struct in_addr *faddr, u_int fport), - void *opaque) -{ - _slirp_redir_loop(func, opaque, 0); - _slirp_redir_loop(func, opaque, 1); -} - /* Unlistens a redirection * * Return value: number of redirs removed */ |