Re: [Qemu-devel] [PATCH RFC 3/4] slirp: add helpers for ipv6 hostfwd manipulation

2018-10-27 Thread Samuel Thibault
Hello,

Maxim Samoylov, le ven. 26 oct. 2018 03:03:42 +0300, a ecrit:
> +int slirp_remove_ipv6_hostfwd(Slirp *slirp, int is_udp,
> +  struct in6_addr host_addr, int host_port)

Similarly, we'd rather share the code than duplicate it :)

Better put the existing slirp_remove_hostfwd code into a

slirp_remove_x_hostfwd(Slirp *slirp, int is_udp, struct sockaddr *addr)

by replacing the explicit ipv4 comparison with a call to a helper
which compares two struct sockaddr (starting with the so_family field,
then testing fields depending the family, and you can put it in
slirp/socket.h)

and then slirp_remove_hostfwd can be rewritten as putting its
parameters into a sockaddr_in and colling slirp_remove_x_hostfwd, and
slirp_remove_ipv6_hostfwd implemented similarly for ipv6.

> +int slirp_add_ipv6_hostfwd(Slirp *slirp, int is_udp,
> +  struct in6_addr host_addr, int host_port,
> +  struct in6_addr guest_addr, int guest_port)
> +{
> +if (is_udp) {
> +if (!udp6_listen(slirp, host_addr, htons(host_port),
> + guest_addr, htons(guest_port), SS_HOSTFWD))
> +return -1;
> +} else {
> +if (!tcp6_listen(slirp, host_addr, htons(host_port),
> + guest_addr, htons(guest_port), SS_HOSTFWD))
> +return -1;
> +}
> +
> +return 0;
> +}

That one can remains so :)

Samuel



[Qemu-devel] [PATCH RFC 3/4] slirp: add helpers for ipv6 hostfwd manipulation

2018-10-25 Thread Maxim Samoylov
Signed-off-by: Maxim Samoylov 
---
 slirp/libslirp.h |  6 ++
 slirp/slirp.c| 43 +++
 2 files changed, 49 insertions(+)

diff --git a/slirp/libslirp.h b/slirp/libslirp.h
index 42e42e9..3710650 100644
--- a/slirp/libslirp.h
+++ b/slirp/libslirp.h
@@ -34,6 +34,12 @@ int slirp_add_hostfwd(Slirp *slirp, int is_udp,
   struct in_addr guest_addr, int guest_port);
 int slirp_remove_hostfwd(Slirp *slirp, int is_udp,
  struct in_addr host_addr, int host_port);
+int slirp_add_ipv6_hostfwd(Slirp *slirp, int is_udp,
+   struct in6_addr host_addr, int host_port,
+   struct in6_addr guest_addr, int guest_port);
+int slirp_remove_ipv6_hostfwd(Slirp *slirp, int is_udp,
+  struct in6_addr host_addr, int host_port);
+
 int slirp_add_exec(Slirp *slirp, int do_pty, const void *args,
struct in_addr *guest_addr, int guest_port);
 
diff --git a/slirp/slirp.c b/slirp/slirp.c
index 51de41f..143ddea 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -1065,6 +1065,49 @@ int slirp_add_hostfwd(Slirp *slirp, int is_udp, struct 
in_addr host_addr,
 return 0;
 }
 
+int slirp_remove_ipv6_hostfwd(Slirp *slirp, int is_udp,
+  struct in6_addr host_addr, int host_port)
+{
+struct socket *so;
+struct socket *head = (is_udp ? >udb : >tcb);
+struct sockaddr_in6 addr;
+int port = htons(host_port);
+socklen_t addr_len;
+
+for (so = head->so_next; so != head; so = so->so_next) {
+addr_len = sizeof(addr);
+if ((so->so_state & SS_HOSTFWD) &&
+getsockname(so->s, (struct sockaddr *), _len) == 0 &&
+addr_len == sizeof(host_addr) &&
+!memcmp(_addr, , addr_len) &&
+addr.sin6_port == port) {
+
+close(so->s);
+sofree(so);
+return 0;
+}
+}
+
+return -1;
+}
+
+int slirp_add_ipv6_hostfwd(Slirp *slirp, int is_udp,
+  struct in6_addr host_addr, int host_port,
+  struct in6_addr guest_addr, int guest_port)
+{
+if (is_udp) {
+if (!udp6_listen(slirp, host_addr, htons(host_port),
+ guest_addr, htons(guest_port), SS_HOSTFWD))
+return -1;
+} else {
+if (!tcp6_listen(slirp, host_addr, htons(host_port),
+ guest_addr, htons(guest_port), SS_HOSTFWD))
+return -1;
+}
+
+return 0;
+}
+
 int slirp_add_exec(Slirp *slirp, int do_pty, const void *args,
struct in_addr *guest_addr, int guest_port)
 {
-- 
2.7.4