[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/41] slirp: Explicitely mark host-forwarding socke
From: |
Jan Kiszka |
Subject: |
[Qemu-devel] [PATCH 12/41] slirp: Explicitely mark host-forwarding sockets |
Date: |
Wed, 24 Jun 2009 14:42:29 +0200 |
User-agent: |
StGIT/0.14.3 |
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 <address@hidden>
---
slirp/slirp.c | 4 ++--
slirp/socket.h | 1 +
slirp/udp.c | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/slirp/slirp.c b/slirp/slirp.c
index 08c10f2..ad35c1f 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -793,11 +793,11 @@ int slirp_add_hostfwd(int is_udp, struct in_addr
host_addr, int host_port,
}
if (is_udp) {
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;
} else {
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 0;
diff --git a/slirp/socket.h b/slirp/socket.h
index 2cf476c..979b191 100644
--- a/slirp/socket.h
+++ b/slirp/socket.h
@@ -72,6 +72,7 @@ struct socket {
#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_HOSTFWD 0x1000 /* Socket describes host->guest
forwarding */
extern struct socket tcb;
diff --git a/slirp/udp.c b/slirp/udp.c
index 3722845..60fe754 100644
--- a/slirp/udp.c
+++ b/slirp/udp.c
@@ -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_state &= SS_PERSISTENT_MASK;
- so->so_state |= SS_ISFCONNECTED;
+ so->so_state |= SS_ISFCONNECTED | flags;
return so;
}
- [Qemu-devel] [PATCH 00/41] Slirp Fixes and Enhancements - Reloaded, Jan Kiszka, 2009/06/24
- [Qemu-devel] [PATCH 01/41] slirp: Drop redundant lines from udp_input, Jan Kiszka, 2009/06/24
- [Qemu-devel] [PATCH 02/41] slirp: Refactor tcp_ctl, Jan Kiszka, 2009/06/24
- [Qemu-devel] [PATCH 03/41] Revert "User networking: Show active connections", Jan Kiszka, 2009/06/24
- [Qemu-devel] [PATCH 08/41] slirp: Fix port comparision in slirp_remove_hostfwd, Jan Kiszka, 2009/06/24
- [Qemu-devel] [PATCH 09/41] slirp: Rework monitor commands for host forwarding, Jan Kiszka, 2009/06/24
- [Qemu-devel] [PATCH 11/41] slirp: Prepare for persistent socket state flags, Jan Kiszka, 2009/06/24
- [Qemu-devel] [PATCH 07/41] slirp: Rework external configuration interface, Jan Kiszka, 2009/06/24
- [Qemu-devel] [PATCH 10/41] slirp: Bind support for host forwarding rules, Jan Kiszka, 2009/06/24
- [Qemu-devel] [PATCH 12/41] slirp: Explicitely mark host-forwarding sockets,
Jan Kiszka <=
- [Qemu-devel] [PATCH 13/41] slirp: Do not allow to remove non-hostfwd sockets, Jan Kiszka, 2009/06/24
- [Qemu-devel] [PATCH 15/41] slirp: Add info usernet for dumping connection states, Jan Kiszka, 2009/06/24
- [Qemu-devel] [PATCH 17/41] slirp: Drop statistic code, Jan Kiszka, 2009/06/24
- [Qemu-devel] [PATCH 23/41] slirp: tftp: Rework filename handling, Jan Kiszka, 2009/06/24
- [Qemu-devel] [PATCH 24/41] slirp: Factor out one-time initialization, Jan Kiszka, 2009/06/24
- [Qemu-devel] [PATCH 19/41] slirp: Drop unused icmp_var.h, Jan Kiszka, 2009/06/24
- [Qemu-devel] [PATCH 20/41] slirp: tftp: Cleanup tftp_prefix check, Jan Kiszka, 2009/06/24
- [Qemu-devel] [PATCH 21/41] slirp: tftp: Clean up tftp_send_error, Jan Kiszka, 2009/06/24
- [Qemu-devel] [PATCH 29/41] slirp: Clean up timeout handling around slirp_select_fill/poll, Jan Kiszka, 2009/06/24
- [Qemu-devel] [PATCH 26/41] slirp: Clean up updtime, Jan Kiszka, 2009/06/24