... in preparation for adding ipv6 host forwarding support.
---
net/slirp.c | 200 +++++++++++++++++++++++++++++++++-------------------
slirp | 2 +-
2 files changed, 130 insertions(+), 72 deletions(-)
diff --git a/net/slirp.c b/net/slirp.c
index be914c0be0..a21a313302 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -631,15 +631,83 @@ 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;
+}
+
+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 +722,42 @@ 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 {
+ g_assert_not_reached();
}
- 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);
}
static int slirp_hostfwd(SlirpState *s, const char *redir_str, Error **errp)
@@ -694,56 +766,29 @@ 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";
- 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";
- goto fail_syntax;
- }
- if (get_str_sep(buf, sizeof(buf), &p, ':') < 0) {
- fail_reason = "Missing : separator";
- goto fail_syntax;
- }
- if (buf[0] != '\0' && !inet_aton(buf, &host_addr)) {
- fail_reason = "Bad host address";
+ p = parse_protocol(p, ':', &is_udp, &errmsg);
+ if (p == NULL) {
goto fail_syntax;
}
- if (get_str_sep(buf, sizeof(buf), &p, '-') < 0) {
- fail_reason = "Bad host port separator";
- goto fail_syntax;
- }
- host_port = strtol(buf, &end, 0);
- if (*end != '\0' || host_port < 0 || host_port > 65535) {
- fail_reason = "Bad host port";
+ 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 guest address";
+ if (parse_in4_addr_port(p, "guest", ':', '\0', &guest_addr, &guest_port,
+ &errmsg) == NULL) {
goto fail_syntax;
}
- if (buf[0] != '\0' && !inet_aton(buf, &guest_addr)) {
- fail_reason = "Bad guest address";
- 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;
}
@@ -757,11 +802,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 +821,25 @@ 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 {
+ g_assert_not_reached();
+ }
+ if (rc < 0) {
+ error_report_err(err);
+ }
+}
+
+void hmp_hostfwd_add(Monitor *mon, const QDict *qdict)
+{
+ hmp_hostfwd_add_worker(mon, qdict, AF_INET);
}
#ifndef _WIN32
diff --git a/slirp b/slirp
index 8f43a99191..358c0827d4 160000
--- a/slirp
+++ b/slirp
@@ -1 +1 @@
-Subproject commit 8f43a99191afb47ca3f3c6972f6306209f367ece
+Subproject commit 358c0827d49778f016312bfb4167fe639900681f
--
2.30.0.365.g02bc693789-goog
