[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 4/4] net: Extend host forwarding to support IPv6
|
From: |
Doug Evans |
|
Subject: |
[PATCH v4 4/4] net: Extend host forwarding to support IPv6 |
|
Date: |
Thu, 18 Feb 2021 12:15:38 -0800 |
Net option "-hostfwd" now supports IPv6 addresses.
Commands hostfwd_add, hostfwd_remove now support IPv6 addresses.
Signed-off-by: Doug Evans <dje@google.com>
---
Differences from v3:
- this patch renamed from 3/3 to 4/4
- ipv6 support added to existing hostfwd option, commands
- instead of creating new ipv6 option, commands
- added tests to tests/acceptance/hostfwd.py
Differences from v2:
- clarify spelling of ipv6 addresses in docs
- tighten parsing of ipv6 addresses
Differences from v1:
- parsing refactor split out into separate patch (2/3)
hmp-commands.hx | 15 +++++++
net/slirp.c | 78 ++++++++++++++++++++++++++-----------
tests/acceptance/hostfwd.py | 66 +++++++++++++++++++++++++++++++
3 files changed, 136 insertions(+), 23 deletions(-)
diff --git a/hmp-commands.hx b/hmp-commands.hx
index d4001f9c5d..4de4e4979d 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -1375,6 +1375,16 @@ ERST
SRST
``hostfwd_add``
Redirect TCP or UDP connections from host to guest (requires -net user).
+ IPV6 addresses are wrapped in square brackes, IPV4 addresses are not.
+
+ Examples:
+ hostfwd_add net0 tcp:127.0.0.1:10022-:22
+ hostfwd_add net0 tcp:[::1]:10022-[fe80::1:2:3:4]:22
+
+ Note that Libslirp currently only provides a "stateless" DHCPv6 server, a
+ consequence of which is that it cannot do the "addr-any" translation to the
+ guest address that is done for IPv4. In other words, the following is
+ currently not supported: hostfwd_add net0 tcp:[::1]:10022-:22
ERST
#ifdef CONFIG_SLIRP
@@ -1390,6 +1400,11 @@ ERST
SRST
``hostfwd_remove``
Remove host-to-guest TCP or UDP redirection.
+ IPV6 addresses are wrapped in square brackes, IPV4 addresses are not.
+
+ Examples:
+ hostfwd_remove net0 tcp:127.0.0.1:10022
+ hostfwd_remove net0 tcp:[::1]:10022
ERST
{
diff --git a/net/slirp.c b/net/slirp.c
index ee39014a71..d8c675a2e8 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -96,6 +96,11 @@ typedef struct SlirpState {
GSList *fwd;
} SlirpState;
+union in4or6_addr {
+ struct in_addr addr4;
+ struct in6_addr addr6;
+};
+
static struct slirp_config_str *slirp_configs;
static QTAILQ_HEAD(, SlirpState) slirp_stacks =
QTAILQ_HEAD_INITIALIZER(slirp_stacks);
@@ -663,31 +668,38 @@ static const char *parse_protocol(const char *str, int
sep, bool *is_udp,
/*
* Parse an ip address/port of the form "address:port<terminator>".
- * An empty address means INADDR_ANY.
- * Returns a pointer to the end of the parsed string on success, and stores
- * the results in *addr, *port.
+ * An empty address means INADDR_ANY/in6addr_any.
+ * Returns a pointer to after the terminator, unless it was '\0', and stores
+ * the results in *addr, *port, *is_v6.
* Otherwise returns NULL and stores the error in *errp.
*/
static const char *parse_ip_addr_and_port(const char *str, int terminator,
- struct in_addr *addr, int *port,
- Error **errp)
+ union in4or6_addr *addr, int *port,
+ bool *is_v6, Error **errp)
{
g_autofree char *addr_str = NULL;
g_autofree char *port_str = NULL;
- bool is_v6;
const char *p = inet_parse_host_and_port(str, terminator, &addr_str,
- &port_str, &is_v6, errp);
+ &port_str, is_v6, errp);
if (p == NULL) {
return NULL;
}
- /* Ignore is_v6 for the moment, if inet_aton fails let it. */
- if (addr_str[0] == '\0') {
- addr->s_addr = INADDR_ANY;
- } else if (!inet_aton(addr_str, addr)) {
- error_setg(errp, "Bad address");
- return NULL;
+ if (*is_v6) {
+ if (addr_str[0] == '\0') {
+ addr->addr6 = in6addr_any;
+ } else if (!inet_pton(AF_INET6, addr_str, &addr->addr6)) {
+ error_setg(errp, "Bad address");
+ return NULL;
+ }
+ } else {
+ if (addr_str[0] == '\0') {
+ addr->addr4.s_addr = INADDR_ANY;
+ } else if (!inet_pton(AF_INET, addr_str, &addr->addr4)) {
+ error_setg(errp, "Bad address");
+ return NULL;
+ }
}
if (qemu_strtoi(port_str, NULL, 10, port) < 0 ||
@@ -708,11 +720,11 @@ static const char *parse_ip_addr_and_port(const char
*str, int terminator,
void hmp_hostfwd_remove(Monitor *mon, const QDict *qdict)
{
- struct in_addr host_addr;
+ union in4or6_addr host_addr;
int host_port;
const char *src_str, *p;
SlirpState *s;
- bool is_udp;
+ bool is_udp, is_v6;
int err;
Error *error = NULL;
const char *arg1 = qdict_get_str(qdict, "arg1");
@@ -737,11 +749,18 @@ void hmp_hostfwd_remove(Monitor *mon, const QDict *qdict)
goto fail_syntax;
}
- if (parse_ip_addr_and_port(p, '\0', &host_addr, &host_port,
+ if (parse_ip_addr_and_port(p, '\0', &host_addr, &host_port, &is_v6,
&error) == NULL) {
goto fail_syntax;
}
- err = slirp_remove_hostfwd(s->slirp, is_udp, host_addr, host_port);
+
+ if (is_v6) {
+ err = slirp_remove_ipv6_hostfwd(s->slirp, is_udp, host_addr.addr6,
+ host_port);
+ } else {
+ err = slirp_remove_hostfwd(s->slirp, is_udp, host_addr.addr4,
+ host_port);
+ }
monitor_printf(mon, "host forwarding rule for %s %s\n", src_str,
err ? "not found" : "removed");
@@ -754,11 +773,12 @@ void hmp_hostfwd_remove(Monitor *mon, const QDict *qdict)
static int slirp_hostfwd(SlirpState *s, const char *redir_str, Error **errp)
{
- struct in_addr host_addr, guest_addr;
+ union in4or6_addr host_addr, guest_addr;
int host_port, guest_port;
const char *p;
- bool is_udp;
+ bool is_udp, host_is_v6, guest_is_v6;
Error *error = NULL;
+ int err;
g_assert(redir_str != NULL);
p = redir_str;
@@ -768,24 +788,36 @@ static int slirp_hostfwd(SlirpState *s, const char
*redir_str, Error **errp)
goto fail_syntax;
}
- p = parse_ip_addr_and_port(p, '-', &host_addr, &host_port, &error);
+ p = parse_ip_addr_and_port(p, '-', &host_addr, &host_port, &host_is_v6,
+ &error);
if (p == NULL) {
error_prepend(&error, "For host address: ");
goto fail_syntax;
}
- if (parse_ip_addr_and_port(p, '\0', &guest_addr, &guest_port,
+ if (parse_ip_addr_and_port(p, '\0', &guest_addr, &guest_port, &guest_is_v6,
&error) == NULL) {
error_prepend(&error, "For guest address: ");
goto fail_syntax;
}
+ if (host_is_v6 != guest_is_v6) {
+ /* TODO: Can libslirp support this? */
+ error_setg(&error, "Both host,guest must be one of ipv4 or ipv6");
+ goto fail_syntax;
+ }
if (guest_port == 0) {
error_setg(&error, "For guest address: Bad port");
goto fail_syntax;
}
- if (slirp_add_hostfwd(s->slirp, is_udp, host_addr, host_port, guest_addr,
- guest_port) < 0) {
+ if (host_is_v6) {
+ err = slirp_add_ipv6_hostfwd(s->slirp, is_udp, host_addr.addr6,
+ host_port, guest_addr.addr6, guest_port);
+ } else {
+ err = slirp_add_hostfwd(s->slirp, is_udp, host_addr.addr4, host_port,
+ guest_addr.addr4, guest_port);
+ }
+ if (err < 0) {
error_setg(errp, "Could not set up host forwarding rule '%s'",
redir_str);
return -1;
diff --git a/tests/acceptance/hostfwd.py b/tests/acceptance/hostfwd.py
index 1eaa0371ba..4368d557c9 100644
--- a/tests/acceptance/hostfwd.py
+++ b/tests/acceptance/hostfwd.py
@@ -82,3 +82,69 @@ def test_qmp_hostfwd_ipv4_parsing_errors(self):
"Invalid host forwarding rule '::66-:-1' (For guest
address: Bad port)\r\n")
self.assertEquals(self.hmc('hostfwd_add ::66-:0'),
"Invalid host forwarding rule '::66-:0' (For guest
address: Bad port)\r\n")
+
+ def test_qmp_hostfwd_ipv6(self):
+ self.vm.add_args('-nodefaults',
+ '-netdev', 'user,id=vnet',
+ '-device', 'virtio-net,netdev=vnet')
+ self.vm.launch()
+ self.assertEquals(self.hmc('hostfwd_add vnet
tcp:[::1]:65022-[fe80::1]:22'),
+ '')
+ self.assertEquals(self.hmc('hostfwd_remove vnet tcp:[::1]:65022'),
+ 'host forwarding rule for tcp:[::1]:65022
removed\r\n')
+ self.assertEquals(self.hmc('hostfwd_add tcp:[]:65042-[fe80::1]:42'),
+ '')
+ self.assertEquals(self.hmc('hostfwd_remove tcp:[]:65042'),
+ 'host forwarding rule for tcp:[]:65042 removed\r\n')
+ self.assertEquals(self.hmc('hostfwd_add udp:[::1]:65042-[fe80::1]:42'),
+ '')
+ self.assertEquals(self.hmc('hostfwd_remove udp:[::1]:65042'),
+ 'host forwarding rule for udp:[::1]:65042
removed\r\n')
+
+ def test_qmp_hostfwd_ipv6_functional_errors(self):
+ """Verify handling of various kinds of errors given valid addresses."""
+ self.vm.add_args('-nodefaults',
+ '-netdev', 'user,id=vnet',
+ '-device', 'virtio-net,netdev=vnet')
+ self.vm.launch()
+ self.assertEquals(self.hmc('hostfwd_remove :[::1]:65022'),
+ 'host forwarding rule for :[::1]:65022 not
found\r\n')
+ self.assertEquals(self.hmc('hostfwd_add udp:[::1]:65042-[fe80::1]:42'),
+ '')
+ self.assertEquals(self.hmc('hostfwd_add udp:[::1]:65042-[fe80::1]:42'),
+ "Could not set up host forwarding rule
'udp:[::1]:65042-[fe80::1]:42'\r\n")
+ self.assertEquals(self.hmc('hostfwd_remove :[::1]:65042'),
+ 'host forwarding rule for :[::1]:65042 not
found\r\n')
+ self.assertEquals(self.hmc('hostfwd_remove udp:[::1]:65042'),
+ 'host forwarding rule for udp:[::1]:65042
removed\r\n')
+ self.assertEquals(self.hmc('hostfwd_remove udp:[::1]:65042'),
+ 'host forwarding rule for udp:[::1]:65042 not
found\r\n')
+
+ def test_qmp_hostfwd_ipv6_errors(self):
+ """Verify handling of various kinds of errors."""
+ self.vm.add_args('-nodefaults',
+ '-netdev', 'user,id=vnet',
+ '-device', 'virtio-net,netdev=vnet')
+ self.vm.launch()
+ self.assertEquals(self.hmc('hostfwd_add :[::1-'),
+ "Invalid host forwarding rule ':[::1-' (For host
address: error parsing IPv6 host:port '[::1')\r\n")
+ self.assertEquals(self.hmc('hostfwd_add :[::1]:66-[fe80::1'),
+ "Invalid host forwarding rule ':[::1]:66-[fe80::1'
(For guest address: error parsing IPv6 host:port '[fe80::1')\r\n")
+ self.assertEquals(self.hmc('hostfwd_add :[:::]:66-foo'),
+ "Invalid host forwarding rule ':[:::]:66-foo' (For
host address: Bad address)\r\n")
+ self.assertEquals(self.hmc('hostfwd_add :[::1]-foo'),
+ "Invalid host forwarding rule ':[::1]-foo' (For host
address: error parsing IPv6 host:port '[::1]')\r\n")
+ self.assertEquals(self.hmc('hostfwd_add :[::1]:66-[foo]'),
+ "Invalid host forwarding rule ':[::1]:66-[foo]' (For
guest address: error parsing IPv6 host:port '[foo]')\r\n")
+ self.assertEquals(self.hmc('hostfwd_add :[::1]:66666-foo'),
+ "Invalid host forwarding rule ':[::1]:66666-foo'
(For host address: Bad port)\r\n")
+ self.assertEquals(self.hmc('hostfwd_add :[::1]:66-[fe80::1]:-1'),
+ "Invalid host forwarding rule
':[::1]:66-[fe80::1]:-1' (For guest address: Bad port)\r\n")
+ self.assertEquals(self.hmc('hostfwd_add :[::1]:66-[fe80::1]:66666'),
+ "Invalid host forwarding rule
':[::1]:66-[fe80::1]:66666' (For guest address: Bad port)\r\n")
+ self.assertEquals(self.hmc('hostfwd_add :[::1]:66-[fe80::1]:0'),
+ "Invalid host forwarding rule
':[::1]:66-[fe80::1]:0' (For guest address: Bad port)\r\n")
+ self.assertEquals(self.hmc('hostfwd_add :[::1]:66-1.2.3.4:66'),
+ "Invalid host forwarding rule ':[::1]:66-1.2.3.4:66'
(Both host,guest must be one of ipv4 or ipv6)\r\n")
+ self.assertEquals(self.hmc('hostfwd_add :1.2.3.4:66-[fe80::1]:66'),
+ "Invalid host forwarding rule
':1.2.3.4:66-[fe80::1]:66' (Both host,guest must be one of ipv4 or ipv6)\r\n")
--
2.30.0.617.g56c4b15f3c-goog
- [PATCH v4 0/4] Add support for ipv6 host forwarding, Doug Evans, 2021/02/18
- [PATCH v4 1/4] slirp: Advance libslirp submodule to add ipv6 host-forward support, Doug Evans, 2021/02/18
- [PATCH v4 3/4] net/slirp.c: Refactor address parsing, Doug Evans, 2021/02/18
- [PATCH v4 4/4] net: Extend host forwarding to support IPv6,
Doug Evans <=
- [PATCH v4 2/4] util/qemu-sockets.c: Split host:port parsing out of inet_parse, Doug Evans, 2021/02/18
- Re: [PATCH v4 2/4] util/qemu-sockets.c: Split host:port parsing out of inet_parse, Daniel P . Berrangé, 2021/02/19
- Re: [PATCH v4 2/4] util/qemu-sockets.c: Split host:port parsing out of inet_parse, Doug Evans, 2021/02/19
- Re: [PATCH v4 2/4] util/qemu-sockets.c: Split host:port parsing out of inet_parse, Daniel P . Berrangé, 2021/02/22
- Re: [PATCH v4 2/4] util/qemu-sockets.c: Split host:port parsing out of inet_parse, Doug Evans, 2021/02/23
- Re: [PATCH v4 2/4] util/qemu-sockets.c: Split host:port parsing out of inet_parse, Samuel Thibault, 2021/02/28
- Re: [PATCH v4 2/4] util/qemu-sockets.c: Split host:port parsing out of inet_parse, Samuel Thibault, 2021/02/28
Re: [PATCH v4 0/4] Add support for ipv6 host forwarding, no-reply, 2021/02/18