mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

slirp: Explicitely mark host-forwarding sockets

Browse Source 
Mark sockets that describe host forwardings. This is required for their
(and only their) proper deletion and for pretty-printing.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Jan Kiszka 2009-06-24 14:42:29 +02:00 committed by Anthony Liguori
parent f932b6ce71
commit 6dd5ffb661
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slirp/slirp.c
View File

@ -793,11 +793,11 @@ int slirp_add_hostfwd(int is_udp, struct in_addr host_addr, int host_port,
} }
if (is_udp) { if (is_udp) {
if (!udp_listen(host_addr.s_addr, htons(host_port), guest_addr.s_addr, if (!udp_listen(host_addr.s_addr, htons(host_port), guest_addr.s_addr,
htons(guest_port), 0)) htons(guest_port), SS_HOSTFWD))
return -1; return -1;
} else { } else {
if (!tcp_listen(host_addr.s_addr, htons(host_port), guest_addr.s_addr, if (!tcp_listen(host_addr.s_addr, htons(host_port), guest_addr.s_addr,
htons(guest_port), 0)) htons(guest_port), SS_HOSTFWD))
return -1; return -1;
} }
return 0; return 0;

1
slirp/socket.h
View File

@ -72,6 +72,7 @@ struct socket {
#define SS_FACCEPTONCE 0x200 /* If set, the SS_FACCEPTCONN socket will die after one accept */ #define SS_FACCEPTONCE 0x200 /* If set, the SS_FACCEPTCONN socket will die after one accept */
#define SS_PERSISTENT_MASK 0xf000 /* Unremovable state bits */ #define SS_PERSISTENT_MASK 0xf000 /* Unremovable state bits */
#define SS_HOSTFWD 0x1000 /* Socket describes host->guest forwarding */
extern struct socket tcb; extern struct socket tcb;

2
slirp/udp.c
View File

@ -667,7 +667,7 @@ udp_listen(u_int32_t haddr, u_int hport, u_int32_t laddr, u_int lport,
so->so_expire = 0; so->so_expire = 0;
so->so_state &= SS_PERSISTENT_MASK; so->so_state &= SS_PERSISTENT_MASK;
so->so_state |= SS_ISFCONNECTED; so->so_state |= SS_ISFCONNECTED | flags;
return so; return so;
} }