[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/2] net: Add ipv6_hostfwd option
|
From: |
Doug Evans |
|
Subject: |
[PATCH 2/2] net: Add ipv6_hostfwd option |
|
Date: |
Thu, 21 Jan 2021 00:23:14 -0800 |
Signed-off-by: Doug Evans <dje@google.com>
---
hmp-commands.hx | 29 ++++-
include/net/slirp.h | 2 +
net/slirp.c | 311 +++++++++++++++++++++++++++++++++++---------
qapi/net.json | 1 +
slirp | 2 +-
5 files changed, 279 insertions(+), 66 deletions(-)
diff --git a/hmp-commands.hx b/hmp-commands.hx
index 73e0832ea1..fa404123b7 100644
--- a/hmp-commands.hx
+++ b/hmp-commands.hx
@@ -1398,6 +1398,34 @@ SRST
Remove host-to-guest TCP or UDP redirection.
ERST
+#ifdef CONFIG_SLIRP
+ {
+ .name = "ipv6_hostfwd_add",
+ .args_type = "arg1:s,arg2:s?",
+ .params = "[netdev_id]
[tcp|udp]:[hostaddr6]:hostport-[guestaddr6]:guestport",
+ .help = "redirect TCP6 or UDP6 connections from host to guest
(requires -net user)",
+ .cmd = hmp_ipv6_hostfwd_add,
+ },
+#endif
+SRST
+``ipv6_hostfwd_add``
+ Redirect TCP6 or UDP6 connections from host to guest (requires -net user).
+ERST
+
+#ifdef CONFIG_SLIRP
+ {
+ .name = "ipv6_hostfwd_remove",
+ .args_type = "arg1:s,arg2:s?",
+ .params = "[netdev_id] [tcp|udp]:[hostaddr6]:hostport",
+ .help = "remove host-to-guest TCP6 or UDP6 redirection",
+ .cmd = hmp_ipv6_hostfwd_remove,
+ },
+#endif
+SRST
+``ipv6_hostfwd_remove``
+ Remove host-to-guest TCP6 or UDP6 redirection.
+ERST
+
{
.name = "balloon",
.args_type = "value:M",
@@ -1866,4 +1894,3 @@ ERST
.sub_table = hmp_info_cmds,
.flags = "p",
},
-
diff --git a/include/net/slirp.h b/include/net/slirp.h
index bad3e1e241..4796a5cd39 100644
--- a/include/net/slirp.h
+++ b/include/net/slirp.h
@@ -29,6 +29,8 @@
void hmp_hostfwd_add(Monitor *mon, const QDict *qdict);
void hmp_hostfwd_remove(Monitor *mon, const QDict *qdict);
+void hmp_ipv6_hostfwd_add(Monitor *mon, const QDict *qdict);
+void hmp_ipv6_hostfwd_remove(Monitor *mon, const QDict *qdict);
void hmp_info_usernet(Monitor *mon, const QDict *qdict);
diff --git a/net/slirp.c b/net/slirp.c
index 8350c6d45f..5870a3284a 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -70,6 +70,7 @@ static int get_str_sep(char *buf, int buf_size, const char
**pp, int sep)
/* slirp network adapter */
#define SLIRP_CFG_HOSTFWD 1
+#define SLIRP_CFG_IPV6_HOSTFWD 2
struct slirp_config_str {
struct slirp_config_str *next;
@@ -101,6 +102,8 @@ static QTAILQ_HEAD(, SlirpState) slirp_stacks =
QTAILQ_HEAD_INITIALIZER(slirp_stacks);
static int slirp_hostfwd(SlirpState *s, const char *redir_str, Error **errp);
+static int slirp_ipv6_hostfwd(SlirpState *s, const char *redir_str,
+ Error **errp);
static int slirp_guestfwd(SlirpState *s, const char *config_str, Error **errp);
#ifndef _WIN32
@@ -586,6 +589,10 @@ static int net_slirp_init(NetClientState *peer, const char
*model,
if (slirp_hostfwd(s, config->str, errp) < 0) {
goto error;
}
+ } else if (config->flags & SLIRP_CFG_IPV6_HOSTFWD) {
+ if (slirp_ipv6_hostfwd(s, config->str, errp) < 0) {
+ goto error;
+ }
} else {
if (slirp_guestfwd(s, config->str, errp) < 0) {
goto error;
@@ -631,15 +638,136 @@ static SlirpState *slirp_lookup(Monitor *mon, const char
*id)
}
}
-void hmp_hostfwd_remove(Monitor *mon, const QDict *qdict)
+/*
+ * Parse a protocol name of the form "name<sep>".
+ * Valid protocols are "tcp" and "udp". An empty string means "tcp".
+ * Returns a pointer to the end of the parsed string on success, and stores
+ * the result in *is_udp.
+ * Otherwise returns NULL and stores the error message in *errmsg, which must
+ * be freed by the caller.
+ */
+static const char *parse_protocol(const char *str, int sep, int *is_udp,
+ char **errmsg)
+{
+ char buf[10];
+ const char *p = str;
+
+ if (get_str_sep(buf, sizeof(buf), &p, sep) < 0) {
+ *errmsg = g_strdup("Missing protcol name separator");
+ return NULL;
+ }
+
+ if (!strcmp(buf, "tcp") || buf[0] == '\0') {
+ *is_udp = 0;
+ } else if (!strcmp(buf, "udp")) {
+ *is_udp = 1;
+ } else {
+ *errmsg = g_strdup("Bad protcol name");
+ return NULL;
+ }
+
+ return p;
+}
+
+/*
+ * Parse an ipv4 address/port of the form "addr<addr_sep>port<port_sep>".
+ * "kind" is either "host" or "guest" and is included in error messages.
+ * 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.
+ * Otherwise returns NULL and stores the error message in *errmsg, which must
+ * be freed by the caller.
+ */
+static const char *parse_in4_addr_port(const char *str, const char *kind,
+ int addr_sep, int port_sep,
+ struct in_addr *addr, int *port,
+ char **errmsg)
{
- struct in_addr host_addr = { .s_addr = INADDR_ANY };
- int host_port;
char buf[256];
- const char *src_str, *p;
+ const char *p = str;
+
+ if (get_str_sep(buf, sizeof(buf), &p, addr_sep) < 0) {
+ *errmsg = g_strdup_printf("Missing %s address separator", kind);
+ return NULL;
+ }
+ if (buf[0] == '\0') {
+ addr->s_addr = INADDR_ANY;
+ } else if (!inet_aton(buf, addr)) {
+ *errmsg = g_strdup_printf("Bad %s address", kind);
+ return NULL;
+ }
+
+ if (get_str_sep(buf, sizeof(buf), &p, port_sep) < 0) {
+ *errmsg = g_strdup_printf("Missing %s port separator", kind);
+ return NULL;
+ }
+ if (qemu_strtoi(buf, NULL, 10, port) < 0 ||
+ *port < 0 || *port > 65535) {
+ *errmsg = g_strdup_printf("Bad %s port", kind);
+ return NULL;
+ }
+
+ return p;
+}
+
+/*
+ * Parse an ipv6 address/port of the form "addr<addr_sep>port<port_sep>".
+ * "kind" is either "host" or "guest" and is included in error messages.
+ * An empty address means in6addr_any.
+ * Returns a pointer to the end of the parsed string on success, and stores
+ * the results in *addr, *port.
+ * Otherwise returns NULL and stores the error message in *errmsg, which must
+ * be freed by the caller.
+ */
+static const char *parse_in6_addr_port(const char *str, const char *kind,
+ int addr_sep, int port_sep,
+ struct in6_addr *addr, int *port,
+ char **errmsg)
+{
+ char buf[256];
+ const char *p = str;
+
+ if (*(p++) != '[') {
+ *errmsg = g_strdup_printf("IPv6 %s address must be enclosed"
+ " in square brackets", kind);
+ return NULL;
+ }
+ if (get_str_sep(buf, sizeof(buf), &p, ']') < 0) {
+ *errmsg = g_strdup_printf("IPv6 %s address must be enclosed"
+ " in square brackets", kind);
+ return NULL;
+ }
+ if (buf[0] == '\0') {
+ *addr = in6addr_any;
+ } else if (!inet_pton(AF_INET6, buf, addr)) {
+ *errmsg = g_strdup_printf("Bad %s address", kind);
+ return NULL;
+ }
+
+ /* Ignore the part between the ']' and addr_sep. */
+ if (get_str_sep(buf, sizeof(buf), &p, addr_sep) < 0) {
+ *errmsg = g_strdup_printf("Missing %s address separator", kind);
+ return NULL;
+ }
+
+ if (get_str_sep(buf, sizeof(buf), &p, port_sep) < 0) {
+ *errmsg = g_strdup_printf("Missing %s port separator", kind);
+ return NULL;
+ }
+ if (qemu_strtoi(buf, NULL, 10, port) < 0 ||
+ *port < 0 || *port > 65535) {
+ *errmsg = g_strdup_printf("Bad %s port", kind);
+ return NULL;
+ }
+
+ return p;
+}
+
+static void hmp_hostfwd_remove_worker(Monitor *mon, const QDict *qdict,
+ int family)
+{
+ const char *src_str;
SlirpState *s;
- int is_udp = 0;
- int err;
const char *arg1 = qdict_get_str(qdict, "arg1");
const char *arg2 = qdict_get_try_str(qdict, "arg2");
@@ -654,38 +782,52 @@ void hmp_hostfwd_remove(Monitor *mon, const QDict *qdict)
return;
}
- p = src_str;
- if (!p || get_str_sep(buf, sizeof(buf), &p, ':') < 0) {
- goto fail_syntax;
- }
+ int host_port;
+ int is_udp;
+ char *errmsg = NULL;
+ int err;
- if (!strcmp(buf, "tcp") || buf[0] == '\0') {
- is_udp = 0;
- } else if (!strcmp(buf, "udp")) {
- is_udp = 1;
- } else {
- goto fail_syntax;
- }
+ g_assert(src_str != NULL);
+ const char *p = src_str;
- if (get_str_sep(buf, sizeof(buf), &p, ':') < 0) {
- goto fail_syntax;
- }
- if (buf[0] != '\0' && !inet_aton(buf, &host_addr)) {
+ p = parse_protocol(p, ':', &is_udp, &errmsg);
+ if (p == NULL) {
goto fail_syntax;
}
- if (qemu_strtoi(p, NULL, 10, &host_port)) {
- goto fail_syntax;
+ if (family == AF_INET) {
+ struct in_addr host_addr;
+ if (parse_in4_addr_port(p, "host", ':', '\0', &host_addr, &host_port,
+ &errmsg) == NULL) {
+ goto fail_syntax;
+ }
+ err = slirp_remove_hostfwd(s->slirp, is_udp, host_addr, host_port);
+ } else {
+ struct in6_addr host_addr;
+ if (parse_in6_addr_port(p, "host", ':', '\0', &host_addr, &host_port,
+ &errmsg) == NULL) {
+ goto fail_syntax;
+ }
+ err = slirp_remove_ipv6_hostfwd(s->slirp, is_udp, host_addr,
host_port);
}
- err = slirp_remove_hostfwd(s->slirp, is_udp, host_addr, host_port);
-
monitor_printf(mon, "host forwarding rule for %s %s\n", src_str,
err ? "not found" : "removed");
return;
fail_syntax:
- monitor_printf(mon, "invalid format\n");
+ monitor_printf(mon, "Invalid format: %s\n", errmsg);
+ g_free(errmsg);
+}
+
+void hmp_hostfwd_remove(Monitor *mon, const QDict *qdict)
+{
+ hmp_hostfwd_remove_worker(mon, qdict, AF_INET);
+}
+
+void hmp_ipv6_hostfwd_remove(Monitor *mon, const QDict *qdict)
+{
+ hmp_hostfwd_remove_worker(mon, qdict, AF_INET6);
}
static int slirp_hostfwd(SlirpState *s, const char *redir_str, Error **errp)
@@ -694,61 +836,83 @@ static int slirp_hostfwd(SlirpState *s, const char
*redir_str, Error **errp)
struct in_addr guest_addr = { .s_addr = 0 };
int host_port, guest_port;
const char *p;
- char buf[256];
int is_udp;
- char *end;
- const char *fail_reason = "Unknown reason";
+ char *errmsg = NULL;
+ g_assert(redir_str != NULL);
p = redir_str;
- if (!p || get_str_sep(buf, sizeof(buf), &p, ':') < 0) {
- fail_reason = "No : separators";
+
+ p = parse_protocol(p, ':', &is_udp, &errmsg);
+ if (p == NULL) {
goto fail_syntax;
}
- if (!strcmp(buf, "tcp") || buf[0] == '\0') {
- is_udp = 0;
- } else if (!strcmp(buf, "udp")) {
- is_udp = 1;
- } else {
- fail_reason = "Bad protocol name";
+
+ p = parse_in4_addr_port(p, "host", ':', '-', &host_addr, &host_port,
+ &errmsg);
+ if (p == NULL) {
goto fail_syntax;
}
- if (get_str_sep(buf, sizeof(buf), &p, ':') < 0) {
- fail_reason = "Missing : separator";
+ if (parse_in4_addr_port(p, "guest", ':', '\0', &guest_addr, &guest_port,
+ &errmsg) == NULL) {
goto fail_syntax;
}
- if (buf[0] != '\0' && !inet_aton(buf, &host_addr)) {
- fail_reason = "Bad host address";
+ if (guest_port == 0) {
+ errmsg = g_strdup("Bad guest port");
goto fail_syntax;
}
- if (get_str_sep(buf, sizeof(buf), &p, '-') < 0) {
- fail_reason = "Bad host port separator";
- goto fail_syntax;
+ if (slirp_add_hostfwd(s->slirp, is_udp, host_addr, host_port, guest_addr,
+ guest_port) < 0) {
+ error_setg(errp, "Could not set up host forwarding rule '%s'",
+ redir_str);
+ return -1;
}
- host_port = strtol(buf, &end, 0);
- if (*end != '\0' || host_port < 0 || host_port > 65535) {
- fail_reason = "Bad host port";
+ return 0;
+
+ fail_syntax:
+ error_setg(errp, "Invalid host forwarding rule '%s' (%s)", redir_str,
+ errmsg);
+ g_free(errmsg);
+ return -1;
+}
+
+static int slirp_ipv6_hostfwd(SlirpState *s, const char *redir_str,
+ Error **errp)
+{
+ struct in6_addr host_addr = in6addr_any;
+ struct in6_addr guest_addr;
+ int host_port, guest_port;
+ const char *p;
+ int is_udp;
+ char *errmsg = NULL;
+
+ memset(&guest_addr, 0, sizeof(guest_addr));
+ g_assert(redir_str != NULL);
+ p = redir_str;
+
+ p = parse_protocol(p, ':', &is_udp, &errmsg);
+ if (p == NULL) {
goto fail_syntax;
}
- if (get_str_sep(buf, sizeof(buf), &p, ':') < 0) {
- fail_reason = "Missing guest address";
+ p = parse_in6_addr_port(p, "host", ':', '-', &host_addr, &host_port,
+ &errmsg);
+ if (p == NULL) {
goto fail_syntax;
}
- if (buf[0] != '\0' && !inet_aton(buf, &guest_addr)) {
- fail_reason = "Bad guest address";
+
+ if (parse_in6_addr_port(p, "guest", ':', '\0', &guest_addr, &guest_port,
+ &errmsg) == NULL) {
goto fail_syntax;
}
-
- guest_port = strtol(p, &end, 0);
- if (*end != '\0' || guest_port < 1 || guest_port > 65535) {
- fail_reason = "Bad guest port";
+ if (guest_port == 0) {
+ errmsg = g_strdup("Bad guest port");
goto fail_syntax;
}
- if (slirp_add_hostfwd(s->slirp, is_udp, host_addr, host_port, guest_addr,
- guest_port) < 0) {
+ if (slirp_add_ipv6_hostfwd(s->slirp, is_udp, host_addr, host_port,
+ guest_addr, guest_port) < 0) {
error_setg(errp, "Could not set up host forwarding rule '%s'",
redir_str);
return -1;
@@ -757,11 +921,12 @@ static int slirp_hostfwd(SlirpState *s, const char
*redir_str, Error **errp)
fail_syntax:
error_setg(errp, "Invalid host forwarding rule '%s' (%s)", redir_str,
- fail_reason);
+ errmsg);
+ g_free(errmsg);
return -1;
}
-void hmp_hostfwd_add(Monitor *mon, const QDict *qdict)
+static void hmp_hostfwd_add_worker(Monitor *mon, const QDict *qdict, int
family)
{
const char *redir_str;
SlirpState *s;
@@ -775,13 +940,30 @@ void hmp_hostfwd_add(Monitor *mon, const QDict *qdict)
s = slirp_lookup(mon, NULL);
redir_str = arg1;
}
- if (s) {
- Error *err = NULL;
- if (slirp_hostfwd(s, redir_str, &err) < 0) {
- error_report_err(err);
- }
+ if (!s) {
+ return;
+ }
+
+ Error *err = NULL;
+ int rc;
+ if (family == AF_INET) {
+ rc = slirp_hostfwd(s, redir_str, &err);
+ } else {
+ rc = slirp_ipv6_hostfwd(s, redir_str, &err);
+ }
+ if (rc < 0) {
+ error_report_err(err);
}
+}
+
+void hmp_hostfwd_add(Monitor *mon, const QDict *qdict)
+{
+ hmp_hostfwd_add_worker(mon, qdict, AF_INET);
+}
+void hmp_ipv6_hostfwd_add(Monitor *mon, const QDict *qdict)
+{
+ hmp_hostfwd_add_worker(mon, qdict, AF_INET6);
}
#ifndef _WIN32
@@ -1090,6 +1272,7 @@ int net_init_slirp(const Netdev *netdev, const char *name,
/* all optional fields are initialized to "all bits zero" */
net_init_slirp_configs(user->hostfwd, SLIRP_CFG_HOSTFWD);
+ net_init_slirp_configs(user->ipv6_hostfwd, SLIRP_CFG_IPV6_HOSTFWD);
net_init_slirp_configs(user->guestfwd, 0);
ret = net_slirp_init(peer, "user", name, user->q_restrict,
diff --git a/qapi/net.json b/qapi/net.json
index c31748c87f..34ea92277c 100644
--- a/qapi/net.json
+++ b/qapi/net.json
@@ -189,6 +189,7 @@
'*smb': 'str',
'*smbserver': 'str',
'*hostfwd': ['String'],
+ '*ipv6-hostfwd': ['String'],
'*guestfwd': ['String'],
'*tftp-server-name': 'str' } }
diff --git a/slirp b/slirp
index 8f43a99191..6c0db866ef 160000
--- a/slirp
+++ b/slirp
@@ -1 +1 @@
-Subproject commit 8f43a99191afb47ca3f3c6972f6306209f367ece
+Subproject commit 6c0db866ef5e11a3b87640e57769fbf9b0a1e3b8
--
2.30.0.296.g2bfb1c46d8-goog