From nobody Sat May 18 14:10:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1612388474; cv=none; d=zohomail.com; s=zohoarc; b=e4DEZ0juddgj6Cyd4jSq5chQ+B6vaPklYWRzTJy9dh2pObiN4KIVPq2c+BoH0IBx3mkcwA3EXAMmvfv0RtFmnvazRHmax/odOyHgADm0R/s9hKxw3S5zvrQyrIWAehoMiJ/ACadNg5O8gdaUZyyiYssrHiRfcSuSmKiyaNgwcT0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612388474; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=BhbO3SvLCkriwBiHJc9Cks1uZmwz8cYND/xQeX1C+kQ=; b=OPik6kj50PlYYgEcnrY0ClWr/32Wsj8hMGolTDAZE5kq/aE8e/6hl4y0c0tXPaCUBJzm5WBmh0zOUA7yIFXGyVgA46q6BD3HrXlNqhUhr9J5UI4DURbP+ot5lcxk5Y8lJfn+8piciKTWAPBPFtDrqkbLNtOcCDWhH+CKTda+mHs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1612388474710690.1302457412085; Wed, 3 Feb 2021 13:41:14 -0800 (PST) Received: from localhost ([::1]:50424 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l7Pth-0007YX-KG for importer@patchew.org; Wed, 03 Feb 2021 16:41:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47732) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <3oRcbYAMKCkQjpkmuumrk.iuswks0-jk1krtutmt0.uxm@flex--dje.bounces.google.com>) id 1l7PqK-0005B4-2u for qemu-devel@nongnu.org; Wed, 03 Feb 2021 16:37:44 -0500 Received: from mail-ua1-x949.google.com ([2607:f8b0:4864:20::949]:50444) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3oRcbYAMKCkQjpkmuumrk.iuswks0-jk1krtutmt0.uxm@flex--dje.bounces.google.com>) id 1l7PqI-0000k6-4L for qemu-devel@nongnu.org; Wed, 03 Feb 2021 16:37:43 -0500 Received: by mail-ua1-x949.google.com with SMTP id 9so336673uas.17 for ; Wed, 03 Feb 2021 13:37:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=BhbO3SvLCkriwBiHJc9Cks1uZmwz8cYND/xQeX1C+kQ=; b=ls0587oRfQ2IKl7p5Nc6dtCOgoWUVtkbWRAD1mP+NbP/tPfj2CdID6VkV0ZjuD2pRv X9dtcjK4MLfG2pKU0s+104YkaRT1POwzS+e+EEPX0VnHkYM827y7PblSGUvsdjwOgnY7 74cZXsyr0b2H/iz1V7sOIjAozAfa5e3n2tAVHde8J92XNBY/dp2v/A4V2JGOIklrANGw WqDhTDPtysxHIE9r7F2t8Fvn/QjTadcCiCV34yKmWDKeT0noF9x0ZbSuwlGooRnROpKV gjN8Eptg/Q4Q1IkLe/ut9B0+chA/b9fQUyz3xflTrKVJYBZeBsze4Ib+2bhlGtqMTzu3 +r1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=BhbO3SvLCkriwBiHJc9Cks1uZmwz8cYND/xQeX1C+kQ=; b=KH2qfJtJifWYgGNyyft2ZrqR4roODHFAXwtlwZHc0/F4yR+l/mFzxJD3yu7ID9aMlg TKR8Oe8cP1MBKmAfV/Kvew+Vw5IZ39NBoag+mee7D87yxmPZy1O9yRKA9xedALlqvZwA wF0rhzCPk3ec5L+oFT4cWEAJmkgd87HBRseIVSct2SVK1iEyHv3YEW6cFze1Px0bOmBt BRLT9j4p+33sig0dWMvezDuDh0lSznc59OB23Zx3FIrGclQIyo9cAcQAYRJg6BHHdn11 viBDgtAgK2coAmkM3Y109KJ1DlPrZ6IPG7L1Rn6mIgV+uksqGtFGBZ3oqH/yaghO0OYO VQYQ== X-Gm-Message-State: AOAM531MafghhIhIagvOAmI+XFv/kdwyr+pabevdk+v78sYstu5rS9sS /xm0BaJlNGZyZPNa8nwgN6eLIsjKw0Ib8bPxcljqy3tr05riqczeBy3PIhkmfG8waKUJpKDGCtQ d2qhv91WxwJ3tS5DL4VtydS+RGVFQvJ2JaBV08ASUG36E4B/Q4V8N X-Google-Smtp-Source: ABdhPJyBdleMJprC7owuIC2EP9jPrhs601sBSkweZR48PnwUw+F0g7TaffJEfJFVdIafqDtrACY4vYk= X-Received: from ruffy.mtv.corp.google.com ([2620:0:1000:1412:25d4:96ad:ca30:7913]) (user=dje job=sendgmr) by 2002:a1f:1489:: with SMTP id 131mr3347055vku.25.1612388257422; Wed, 03 Feb 2021 13:37:37 -0800 (PST) Date: Wed, 3 Feb 2021 13:37:28 -0800 In-Reply-To: <20210203213729.1940893-1-dje@google.com> Message-Id: <20210203213729.1940893-2-dje@google.com> Mime-Version: 1.0 References: <20210203213729.1940893-1-dje@google.com> X-Mailer: git-send-email 2.30.0.365.g02bc693789-goog Subject: [PATCH v2 1/2] net/slirp.c: Refactor address parsing To: qemu-devel@nongnu.org Cc: Samuel Thibault , Doug Evans Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::949; envelope-from=3oRcbYAMKCkQjpkmuumrk.iuswks0-jk1krtutmt0.uxm@flex--dje.bounces.google.com; helo=mail-ua1-x949.google.com X-Spam_score_int: -95 X-Spam_score: -9.6 X-Spam_bar: --------- X-Spam_report: (-9.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, USER_IN_DEF_DKIM_WL=-7.5 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Reply-to: Doug Evans From: dje--- via X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" ... in preparation for adding ipv6 host forwarding support. Reviewed-by: Samuel Thibault --- 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 c= har *id) } } =20 -void hmp_hostfwd_remove(Monitor *mon, const QDict *qdict) +/* + * Parse a protocol name of the form "name". + * 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 m= ust + * 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 =3D str; + + if (get_str_sep(buf, sizeof(buf), &p, sep) < 0) { + *errmsg =3D g_strdup("Missing protcol name separator"); + return NULL; + } + + if (!strcmp(buf, "tcp") || buf[0] =3D=3D '\0') { + *is_udp =3D 0; + } else if (!strcmp(buf, "udp")) { + *is_udp =3D 1; + } else { + *errmsg =3D g_strdup("Bad protcol name"); + return NULL; + } + + return p; +} + +/* + * Parse an ipv4 address/port of the form "addrport". + * "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 m= ust + * 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 =3D { .s_addr =3D INADDR_ANY }; - int host_port; char buf[256]; - const char *src_str, *p; + const char *p =3D str; + + if (get_str_sep(buf, sizeof(buf), &p, addr_sep) < 0) { + *errmsg =3D g_strdup_printf("Missing %s address separator", kind); + return NULL; + } + if (buf[0] =3D=3D '\0') { + addr->s_addr =3D INADDR_ANY; + } else if (!inet_aton(buf, addr)) { + *errmsg =3D g_strdup_printf("Bad %s address", kind); + return NULL; + } + + if (get_str_sep(buf, sizeof(buf), &p, port_sep) < 0) { + *errmsg =3D g_strdup_printf("Missing %s port separator", kind); + return NULL; + } + if (qemu_strtoi(buf, NULL, 10, port) < 0 || + *port < 0 || *port > 65535) { + *errmsg =3D 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 =3D 0; - int err; const char *arg1 =3D qdict_get_str(qdict, "arg1"); const char *arg2 =3D qdict_get_try_str(qdict, "arg2"); =20 @@ -654,38 +722,42 @@ void hmp_hostfwd_remove(Monitor *mon, const QDict *qd= ict) return; } =20 - p =3D src_str; - if (!p || get_str_sep(buf, sizeof(buf), &p, ':') < 0) { - goto fail_syntax; - } + int host_port; + int is_udp; + char *errmsg =3D NULL; + int err; =20 - if (!strcmp(buf, "tcp") || buf[0] =3D=3D '\0') { - is_udp =3D 0; - } else if (!strcmp(buf, "udp")) { - is_udp =3D 1; - } else { - goto fail_syntax; - } + g_assert(src_str !=3D NULL); + const char *p =3D src_str; =20 - if (get_str_sep(buf, sizeof(buf), &p, ':') < 0) { - goto fail_syntax; - } - if (buf[0] !=3D '\0' && !inet_aton(buf, &host_addr)) { + p =3D parse_protocol(p, ':', &is_udp, &errmsg); + if (p =3D=3D NULL) { goto fail_syntax; } =20 - if (qemu_strtoi(p, NULL, 10, &host_port)) { - goto fail_syntax; + if (family =3D=3D AF_INET) { + struct in_addr host_addr; + if (parse_in4_addr_port(p, "host", ':', '\0', &host_addr, &host_po= rt, + &errmsg) =3D=3D NULL) { + goto fail_syntax; + } + err =3D slirp_remove_hostfwd(s->slirp, is_udp, host_addr, host_por= t); + } else { + g_assert_not_reached(); } =20 - err =3D 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; =20 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); } =20 static int slirp_hostfwd(SlirpState *s, const char *redir_str, Error **err= p) @@ -694,56 +766,29 @@ static int slirp_hostfwd(SlirpState *s, const char *r= edir_str, Error **errp) struct in_addr guest_addr =3D { .s_addr =3D 0 }; int host_port, guest_port; const char *p; - char buf[256]; int is_udp; - char *end; - const char *fail_reason =3D "Unknown reason"; + char *errmsg =3D NULL; =20 + g_assert(redir_str !=3D NULL); p =3D redir_str; - if (!p || get_str_sep(buf, sizeof(buf), &p, ':') < 0) { - fail_reason =3D "No : separators"; - goto fail_syntax; - } - if (!strcmp(buf, "tcp") || buf[0] =3D=3D '\0') { - is_udp =3D 0; - } else if (!strcmp(buf, "udp")) { - is_udp =3D 1; - } else { - fail_reason =3D "Bad protocol name"; - goto fail_syntax; - } =20 - if (get_str_sep(buf, sizeof(buf), &p, ':') < 0) { - fail_reason =3D "Missing : separator"; - goto fail_syntax; - } - if (buf[0] !=3D '\0' && !inet_aton(buf, &host_addr)) { - fail_reason =3D "Bad host address"; + p =3D parse_protocol(p, ':', &is_udp, &errmsg); + if (p =3D=3D NULL) { goto fail_syntax; } =20 - if (get_str_sep(buf, sizeof(buf), &p, '-') < 0) { - fail_reason =3D "Bad host port separator"; - goto fail_syntax; - } - host_port =3D strtol(buf, &end, 0); - if (*end !=3D '\0' || host_port < 0 || host_port > 65535) { - fail_reason =3D "Bad host port"; + p =3D parse_in4_addr_port(p, "host", ':', '-', &host_addr, &host_port, + &errmsg); + if (p =3D=3D NULL) { goto fail_syntax; } =20 - if (get_str_sep(buf, sizeof(buf), &p, ':') < 0) { - fail_reason =3D "Missing guest address"; + if (parse_in4_addr_port(p, "guest", ':', '\0', &guest_addr, &guest_por= t, + &errmsg) =3D=3D NULL) { goto fail_syntax; } - if (buf[0] !=3D '\0' && !inet_aton(buf, &guest_addr)) { - fail_reason =3D "Bad guest address"; - goto fail_syntax; - } - - guest_port =3D strtol(p, &end, 0); - if (*end !=3D '\0' || guest_port < 1 || guest_port > 65535) { - fail_reason =3D "Bad guest port"; + if (guest_port =3D=3D 0) { + errmsg =3D g_strdup("Bad guest port"); goto fail_syntax; } =20 @@ -757,11 +802,12 @@ static int slirp_hostfwd(SlirpState *s, const char *r= edir_str, Error **errp) =20 fail_syntax: error_setg(errp, "Invalid host forwarding rule '%s' (%s)", redir_str, - fail_reason); + errmsg); + g_free(errmsg); return -1; } =20 -void hmp_hostfwd_add(Monitor *mon, const QDict *qdict) +static void hmp_hostfwd_add_worker(Monitor *mon, const QDict *qdict, int f= amily) { const char *redir_str; SlirpState *s; @@ -775,13 +821,25 @@ void hmp_hostfwd_add(Monitor *mon, const QDict *qdict) s =3D slirp_lookup(mon, NULL); redir_str =3D arg1; } - if (s) { - Error *err =3D NULL; - if (slirp_hostfwd(s, redir_str, &err) < 0) { - error_report_err(err); - } + if (!s) { + return; } =20 + Error *err =3D NULL; + int rc; + if (family =3D=3D AF_INET) { + rc =3D 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); } =20 #ifndef _WIN32 diff --git a/slirp b/slirp index 8f43a99191..358c0827d4 160000 --- a/slirp +++ b/slirp @@ -1 +1 @@ -Subproject commit 8f43a99191afb47ca3f3c6972f6306209f367ece +Subproject commit 358c0827d49778f016312bfb4167fe639900681f --=20 2.30.0.365.g02bc693789-goog From nobody Sat May 18 14:10:13 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1612388452; cv=none; d=zohomail.com; s=zohoarc; b=bB9EprEbt0GniQ3ztLpj+WB4jf01VbufCscYaGV4tVPQm7q0josJ1fRFRUXCClWyvctC6LiIF4zo0TStPFVSA5NO31sEwnxP1BCD/qPF7EfeSg34/4e7fny0o8hP1razt2blkJmZ5h5KWbNQ7eo4WubFC4Q9CLy9qis5DO7ebeA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612388452; h=Content-Type:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=gMY1AGVsTyBz/vBgDhOSk7z/6dwGaiiLgF/RMkw5Zyc=; b=X9MBLyHoUgdwc83QGgg1WEnL1sGMw4nFzZB6UUVKDcTLtuh8S4ya+GMSdk30mw5I0Am6JBKCs3vpEp7mCTMquuFkghWC7jlMmuytV6z/vpFuuhdMdzLbpkxalZ2deuh6LkhoDrsXqsl8j6jn/0VlcqTo4fWI4l4D6//kSYfsGoE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1612388452202885.4683743798181; Wed, 3 Feb 2021 13:40:52 -0800 (PST) Received: from localhost ([::1]:49014 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l7PtK-0006os-9w for importer@patchew.org; Wed, 03 Feb 2021 16:40:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47742) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <3oxcbYAMKCkYlrmowwotm.kwuymu2-lm3mtvwvov2.wzo@flex--dje.bounces.google.com>) id 1l7PqL-0005Bz-Ty for qemu-devel@nongnu.org; Wed, 03 Feb 2021 16:37:46 -0500 Received: from mail-pf1-x44a.google.com ([2607:f8b0:4864:20::44a]:37678) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3oxcbYAMKCkYlrmowwotm.kwuymu2-lm3mtvwvov2.wzo@flex--dje.bounces.google.com>) id 1l7PqJ-0000kV-7f for qemu-devel@nongnu.org; Wed, 03 Feb 2021 16:37:45 -0500 Received: by mail-pf1-x44a.google.com with SMTP id 137so720581pfw.4 for ; Wed, 03 Feb 2021 13:37:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=gMY1AGVsTyBz/vBgDhOSk7z/6dwGaiiLgF/RMkw5Zyc=; b=XMjYZyQqYtuF1gi4MOktPpRzAm6BKU7FabA2bvL0COWB1fd7IHg7qdaCW9lZIYzb9W AUIyCKhuUftEhCas13EZ/Q77eAw/wZlbrud+zJPkBRB2Fb4VImrF/03kpEZTO7rUL21a zFRkUvwB2Jvr/Z8or59Kge7l9ppt5xxJY8biVD/Kffs9w0o1DwqLFwgo8kXhw8Szpr5W dq6CLih4BqPNGhn4QhygVvZ3wxBIucQ87Ope4uV+OmGOiTOJNcmrEpm8LHJWTKF3J1MO OLseTgi/GyCYDVK9An0zWN+tQv0CzO6mhwu8vj4bjclVh6+h5PIq8MXPFtfS7N/6Z8d8 DZyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=gMY1AGVsTyBz/vBgDhOSk7z/6dwGaiiLgF/RMkw5Zyc=; b=Hnif/9Fj1PYSJHxw58M/1IkJCd6ODxGgZAd0Xye83MXCJjY8PwUpHoSPp+axe+NzMK yjHZ+vIcJ9SFHMyfri2sEywAawUVQ8S9uWA8nAvPMP0XcndRb/6oKrYXPngvl4ocy47q HrKqUs3H0aIFWKN/nyyL7hL63b8mvMCDKKBb3BuUpBdZb433/cXCB5Oda6650DlCjSXU hVM+JxDRF2z4Nwk/vppq3lPu0hp/pOXzQX7Wg8C5pVcjG6GzyWc/HtY1EI7v6h0r44m2 Hh3ZHZM/XhV9Wb3UfAtp0mQV6gVjauV0sx26yAwL0c+MMY9qRGQzRzzCjaknoU0QqYuH qlKQ== X-Gm-Message-State: AOAM530Cy9JA7YPSScYM2HqBoZKBfFiajxrplq56Umx32nekKDLqiU4m i3ldBnoKCiAZCsosqQZPyOwTCsXQhUp/rTD310VLmGTtTZJvm0ILEklphy8ubM6wMePWiTzUJHD VSHZnR3G8eQHMpJLPGYYUTE27SEd9ACCpLCYVmsFxm3/BhFHzLmAV X-Google-Smtp-Source: ABdhPJwrG1EawOvFThjztNBjTm2vNhpsJ0c389+r8Y1LvUc8xhMrdqTpfkL3/Z+TgB9zDdPEuu7mtnQ= X-Received: from ruffy.mtv.corp.google.com ([2620:0:1000:1412:25d4:96ad:ca30:7913]) (user=dje job=sendgmr) by 2002:a17:90a:ab07:: with SMTP id m7mr4912827pjq.74.1612388259653; Wed, 03 Feb 2021 13:37:39 -0800 (PST) Date: Wed, 3 Feb 2021 13:37:29 -0800 In-Reply-To: <20210203213729.1940893-1-dje@google.com> Message-Id: <20210203213729.1940893-3-dje@google.com> Mime-Version: 1.0 References: <20210203213729.1940893-1-dje@google.com> X-Mailer: git-send-email 2.30.0.365.g02bc693789-goog Subject: [PATCH v2 2/2] net: Add -ipv6-hostfwd option, ipv6_hostfwd_add/remove commands To: qemu-devel@nongnu.org Cc: Samuel Thibault , Doug Evans Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::44a; envelope-from=3oxcbYAMKCkYlrmowwotm.kwuymu2-lm3mtvwvov2.wzo@flex--dje.bounces.google.com; helo=mail-pf1-x44a.google.com X-Spam_score_int: -95 X-Spam_score: -9.6 X-Spam_bar: --------- X-Spam_report: (-9.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, USER_IN_DEF_DKIM_WL=-7.5 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Reply-to: Doug Evans From: dje--- via X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" These are identical to their ipv4 counterparts, but for ipv6. Signed-off-by: Doug Evans --- hmp-commands.hx | 28 ++++++++++ include/net/slirp.h | 2 + net/slirp.c | 129 +++++++++++++++++++++++++++++++++++++++++++- qapi/net.json | 4 ++ 4 files changed, 161 insertions(+), 2 deletions(-) diff --git a/hmp-commands.hx b/hmp-commands.hx index d4001f9c5d..bd51173472 100644 --- a/hmp-commands.hx +++ b/hmp-commands.hx @@ -1392,6 +1392,34 @@ SRST Remove host-to-guest TCP or UDP redirection. ERST =20 +#ifdef CONFIG_SLIRP + { + .name =3D "ipv6_hostfwd_add", + .args_type =3D "arg1:s,arg2:s?", + .params =3D "[netdev_id] [tcp|udp]:[hostaddr6]:hostport-[guest= addr6]:guestport", + .help =3D "redirect TCP6 or UDP6 connections from host to gu= est (requires -net user)", + .cmd =3D 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 =3D "ipv6_hostfwd_remove", + .args_type =3D "arg1:s,arg2:s?", + .params =3D "[netdev_id] [tcp|udp]:[hostaddr6]:hostport", + .help =3D "remove host-to-guest TCP6 or UDP6 redirection", + .cmd =3D hmp_ipv6_hostfwd_remove, + }, +#endif +SRST +``ipv6_hostfwd_remove`` + Remove host-to-guest TCP6 or UDP6 redirection. +ERST + { .name =3D "balloon", .args_type =3D "value:M", 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 @@ =20 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); =20 void hmp_info_usernet(Monitor *mon, const QDict *qdict); =20 diff --git a/net/slirp.c b/net/slirp.c index a21a313302..2482dbd36c 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -70,6 +70,7 @@ static int get_str_sep(char *buf, int buf_size, const cha= r **pp, int sep) /* slirp network adapter */ =20 #define SLIRP_CFG_HOSTFWD 1 +#define SLIRP_CFG_IPV6_HOSTFWD 2 =20 struct slirp_config_str { struct slirp_config_str *next; @@ -101,6 +102,8 @@ static QTAILQ_HEAD(, SlirpState) slirp_stacks =3D QTAILQ_HEAD_INITIALIZER(slirp_stacks); =20 static int slirp_hostfwd(SlirpState *s, const char *redir_str, Error **err= p); +static int slirp_ipv6_hostfwd(SlirpState *s, const char *redir_str, + Error **errp); static int slirp_guestfwd(SlirpState *s, const char *config_str, Error **e= rrp); =20 #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; @@ -703,6 +710,59 @@ static const char *parse_in4_addr_port(const char *str= , const char *kind, return p; } =20 +/* + * Parse an ipv6 address/port of the form "addrport". + * "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 m= ust + * 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 =3D str; + + if (*(p++) !=3D '[') { + *errmsg =3D 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 =3D g_strdup_printf("IPv6 %s address must be enclosed" + " in square brackets", kind); + return NULL; + } + if (buf[0] =3D=3D '\0') { + *addr =3D in6addr_any; + } else if (!inet_pton(AF_INET6, buf, addr)) { + *errmsg =3D 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 =3D g_strdup_printf("Missing %s address separator", kind); + return NULL; + } + + if (get_str_sep(buf, sizeof(buf), &p, port_sep) < 0) { + *errmsg =3D g_strdup_printf("Missing %s port separator", kind); + return NULL; + } + if (qemu_strtoi(buf, NULL, 10, port) < 0 || + *port < 0 || *port > 65535) { + *errmsg =3D g_strdup_printf("Bad %s port", kind); + return NULL; + } + + return p; +} + static void hmp_hostfwd_remove_worker(Monitor *mon, const QDict *qdict, int family) { @@ -743,7 +803,12 @@ static void hmp_hostfwd_remove_worker(Monitor *mon, co= nst QDict *qdict, } err =3D slirp_remove_hostfwd(s->slirp, is_udp, host_addr, host_por= t); } else { - g_assert_not_reached(); + struct in6_addr host_addr; + if (parse_in6_addr_port(p, "host", ':', '\0', &host_addr, &host_po= rt, + &errmsg) =3D=3D NULL) { + goto fail_syntax; + } + err =3D slirp_remove_ipv6_hostfwd(s->slirp, is_udp, host_addr, hos= t_port); } =20 monitor_printf(mon, "host forwarding rule for %s %s\n", src_str, @@ -760,6 +825,11 @@ void hmp_hostfwd_remove(Monitor *mon, const QDict *qdi= ct) hmp_hostfwd_remove_worker(mon, qdict, AF_INET); } =20 +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 **err= p) { struct in_addr host_addr =3D { .s_addr =3D INADDR_ANY }; @@ -807,6 +877,55 @@ static int slirp_hostfwd(SlirpState *s, const char *re= dir_str, Error **errp) return -1; } =20 +static int slirp_ipv6_hostfwd(SlirpState *s, const char *redir_str, + Error **errp) +{ + struct in6_addr host_addr =3D in6addr_any; + struct in6_addr guest_addr; + int host_port, guest_port; + const char *p; + int is_udp; + char *errmsg =3D NULL; + + memset(&guest_addr, 0, sizeof(guest_addr)); + g_assert(redir_str !=3D NULL); + p =3D redir_str; + + p =3D parse_protocol(p, ':', &is_udp, &errmsg); + if (p =3D=3D NULL) { + goto fail_syntax; + } + + p =3D parse_in6_addr_port(p, "host", ':', '-', &host_addr, &host_port, + &errmsg); + if (p =3D=3D NULL) { + goto fail_syntax; + } + + if (parse_in6_addr_port(p, "guest", ':', '\0', &guest_addr, &guest_por= t, + &errmsg) =3D=3D NULL) { + goto fail_syntax; + } + if (guest_port =3D=3D 0) { + errmsg =3D g_strdup("Bad guest port"); + goto fail_syntax; + } + + 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; + } + return 0; + + fail_syntax: + error_setg(errp, "Invalid host forwarding rule '%s' (%s)", redir_str, + errmsg); + g_free(errmsg); + return -1; +} + static void hmp_hostfwd_add_worker(Monitor *mon, const QDict *qdict, int f= amily) { const char *redir_str; @@ -830,7 +949,7 @@ static void hmp_hostfwd_add_worker(Monitor *mon, const = QDict *qdict, int family) if (family =3D=3D AF_INET) { rc =3D slirp_hostfwd(s, redir_str, &err); } else { - g_assert_not_reached(); + rc =3D slirp_ipv6_hostfwd(s, redir_str, &err); } if (rc < 0) { error_report_err(err); @@ -842,6 +961,11 @@ void hmp_hostfwd_add(Monitor *mon, const QDict *qdict) hmp_hostfwd_add_worker(mon, qdict, AF_INET); } =20 +void hmp_ipv6_hostfwd_add(Monitor *mon, const QDict *qdict) +{ + hmp_hostfwd_add_worker(mon, qdict, AF_INET6); +} + #ifndef _WIN32 =20 /* automatic user mode samba server configuration */ @@ -1148,6 +1272,7 @@ int net_init_slirp(const Netdev *netdev, const char *= name, /* all optional fields are initialized to "all bits zero" */ =20 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); =20 ret =3D net_slirp_init(peer, "user", name, user->q_restrict, diff --git a/qapi/net.json b/qapi/net.json index c31748c87f..443473107a 100644 --- a/qapi/net.json +++ b/qapi/net.json @@ -161,6 +161,9 @@ # @hostfwd: redirect incoming TCP or UDP host connections to guest # endpoints # +# @ipv6-hostfwd: redirect incoming IPV6 TCP or UDP host connections to +# guest endpoints (since 6.0) +# # @guestfwd: forward guest TCP connections # # @tftp-server-name: RFC2132 "TFTP server name" string (Since 3.1) @@ -189,6 +192,7 @@ '*smb': 'str', '*smbserver': 'str', '*hostfwd': ['String'], + '*ipv6-hostfwd': ['String'], '*guestfwd': ['String'], '*tftp-server-name': 'str' } } =20 --=20 2.30.0.365.g02bc693789-goog