From patchwork Thu Feb 18 20:15:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Evans X-Patchwork-Id: 12094247 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 516ADC433E0 for ; Thu, 18 Feb 2021 20:25:23 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9F0A764EDB for ; Thu, 18 Feb 2021 20:25:22 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9F0A764EDB Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=nongnu.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:34210 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lCprU-00055Y-Ge for qemu-devel@archiver.kernel.org; Thu, 18 Feb 2021 15:25:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46398) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <388ouYAMKCkwrxsu22uzs.q204s08-rs9sz121u18.25u@flex--dje.bounces.google.com>) id 1lCpiY-0005T3-TI for qemu-devel@nongnu.org; Thu, 18 Feb 2021 15:16:06 -0500 Received: from mail-pl1-x64a.google.com ([2607:f8b0:4864:20::64a]:45487) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <388ouYAMKCkwrxsu22uzs.q204s08-rs9sz121u18.25u@flex--dje.bounces.google.com>) id 1lCpiW-0000Ko-Gp for qemu-devel@nongnu.org; Thu, 18 Feb 2021 15:16:06 -0500 Received: by mail-pl1-x64a.google.com with SMTP id t13so1755068plg.12 for ; Thu, 18 Feb 2021 12:15:49 -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=ZC9jUXpTzNcPCsu2PJOcHXoJlOzyNZtWM8mHExz9c4E=; b=KuxbzKX9quFXaCNhA8q1az/7Dfu0T0u0kMRcgs5W9U/5AEIx2+XB7D6TNrzY6pdV9L QOyE4V00DWHdOKWIZBIAYTMLZXL+tuwEd6TtwJIzFA8ae7eYrm4hyw4jgF4E3JN97Lub +2HEraO9Okhr7048L9iN02gUo7Vgo3qx7QLVgTlNfgDD19p42Klx17Y6xVbHfwswyWn/ ggQTIpkuc8p5xZE7HABUpeeNEJndke+FRBPCIn5mFvXQjKXjDtGNSNei0uxZ7wumLk3N JPjbqRoRf3MLnrq03DTkJelwDqq4U97eyu/CWPzNqjXTDaOKKlMcveZiSQ89Xn8BJKNo xPvg== 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=ZC9jUXpTzNcPCsu2PJOcHXoJlOzyNZtWM8mHExz9c4E=; b=oAOzsi/KK/CCgOsZ+gaH2EQ+r0V0TjGkUhxTmla3wQ1UDkd8LINr7R4zlWHY4BSP9T LkTgqCcj5eexHF86QOKslgrOgwmsTmUzWcw0e5BAf81rNtSX2FtHDKlTzB69qDGYvj72 kTQ7CtZE5E+fuAV7jSrOjMgNUbrglrMbHEdnyo1/Ptr805rG5g+GeKAhlB30SfxwlX9D V/Gdo+uzeatcEXbyt6RM0fxx+HuyHtUrKTR2dq1rEEzptiRvJskH1mKKTq9iji0kDcxm 5+o5yy52MNFnbB5R8is0ph566+hFO530V3Dh6IsoIBdwe3wTm0on/eKduyzJ6MQPB0xu pqeA== X-Gm-Message-State: AOAM532B0+XEdcS49C7t4JlB3kOPZ6zGqbj3sFdSBJBHFQ4ElpqusfkN 4jZp8XyGHPtPBAcbjMcwo4IEgx42K2ndGGOU9NUApX5TpE4dXqLNEpZpDmVYbTWi5Xcac6pY15a 4JkPhv9gpuKz1a1E2F42TMZAJQHbGhxP+dR8uJ5r/6RAb3FwNKWVh X-Google-Smtp-Source: ABdhPJxTwebcom6EEkBNTtXDYj4RtVQvfoBAZQOixcxXQX3oGTI4P5nPmVT7dgXuxHyqQjMply2y8nc= X-Received: from ruffy.mtv.corp.google.com ([2620:0:1000:1412:4cc1:c5e:b49d:b16f]) (user=dje job=sendgmr) by 2002:a17:90a:8e83:: with SMTP id f3mr5854886pjo.70.1613679347871; Thu, 18 Feb 2021 12:15:47 -0800 (PST) Date: Thu, 18 Feb 2021 12:15:35 -0800 In-Reply-To: <20210218201538.701509-1-dje@google.com> Message-Id: <20210218201538.701509-2-dje@google.com> Mime-Version: 1.0 References: <20210218201538.701509-1-dje@google.com> X-Mailer: git-send-email 2.30.0.617.g56c4b15f3c-goog Subject: [PATCH v4 1/4] slirp: Advance libslirp submodule to add ipv6 host-forward support To: qemu-devel@nongnu.org Cc: Samuel Thibault , " =?utf-8?q?Daniel_P_?= =?utf-8?q?=2E_Berrang=C3=A9?= " , Doug Evans Received-SPF: pass client-ip=2607:f8b0:4864:20::64a; envelope-from=388ouYAMKCkwrxsu22uzs.q204s08-rs9sz121u18.25u@flex--dje.bounces.google.com; helo=mail-pl1-x64a.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: Doug Evans X-Patchwork-Original-From: Doug Evans via From: Doug Evans Signed-off-by: Doug Evans --- Changes from v3: - pick up latest libslirp patch to reject ipv6 addr-any for guest address - libslirp currently only provides a stateless DHCPv6 server, which means it can't know in advance what the guest's IP address is, and thus cannot do the "addr-any -> guest ip address" translation that is done for ipv4 Changes from v2: - this patch is new in v3, split out from v2 slirp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slirp b/slirp index 8f43a99191..26ae658a83 160000 --- a/slirp +++ b/slirp @@ -1 +1 @@ -Subproject commit 8f43a99191afb47ca3f3c6972f6306209f367ece +Subproject commit 26ae658a83eeca16780cf5615c8247cbb151c3fa From patchwork Thu Feb 18 20:15:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Evans X-Patchwork-Id: 12094239 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC699C433DB for ; Thu, 18 Feb 2021 20:22:08 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E29B264ECE for ; Thu, 18 Feb 2021 20:22:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E29B264ECE Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=nongnu.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:53886 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lCpoM-0001YP-Iy for qemu-devel@archiver.kernel.org; Thu, 18 Feb 2021 15:22:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46394) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <39souYAMKCk8u0vx55x2v.t537v3B-uvCv2454x4B.58x@flex--dje.bounces.google.com>) id 1lCpiY-0005Sd-N4 for qemu-devel@nongnu.org; Thu, 18 Feb 2021 15:16:06 -0500 Received: from mail-pl1-x64a.google.com ([2607:f8b0:4864:20::64a]:37103) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <39souYAMKCk8u0vx55x2v.t537v3B-uvCv2454x4B.58x@flex--dje.bounces.google.com>) id 1lCpiW-0000LO-Gn for qemu-devel@nongnu.org; Thu, 18 Feb 2021 15:16:06 -0500 Received: by mail-pl1-x64a.google.com with SMTP id z13so1757081plo.4 for ; Thu, 18 Feb 2021 12:15:51 -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=Wax/a3VaZb54CLBLZw5wXNlH+RrfzxckLggQU0wtnXE=; b=GpfbYNFgFpteZx7RTikcpDDNJSvveUHI7kIEws76/9EbtVXFPyGS87b4gEUPVKBVCl +YsLxxVXIAS6towDaYfwZPo+SWOCYcfk2/Yf9vpDzGaaDFSM+IMg3/ySzT3BE+QuBZkM M9eucOutbhnd66ZBwMNJ4MTO9kTI3EOiLFcn8wdCCD1OIANCcHIeiqjmKSa5/YGMHP5c s0RPyJp5KiUTCossjV6ft0Pve87BlHGJKYOZGcLdq5NyKBa9aPxJwWFjCS5Lj37/ZGBL r+iTxlXyGXxSN5QaGPq8QZuU6pNiWAqvN1cobcak7QIV5P+HsoHdkfjqMUQRFEBxKIQV Tuug== 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=Wax/a3VaZb54CLBLZw5wXNlH+RrfzxckLggQU0wtnXE=; b=HAdYpgkJdYbFNXSCkFPHoRxJRv5djHIXMQoSS63WszdcTV24xddKjRrPEWsAC8bWCv gzpHRsBs7MvLK+1+MtS4V/KNYrDmgkVnzyUePFyUc+2cQCMYT2FA1x2vTzKIS42qknSP 93UgtoYZ+7T2PLOy1W+60WnR39DR85hYbLQz1Lc3D8tCmVAkE3olXb0GIQo7OSUUTM1W ZNq63Wv9pdwqRg58Sxid0WizUMgZHeyhVq2tlNT1W1eyj+h2GxYnqRzCoW7Nvey8rXIU 3HXZjJitxBu49bJ4RE4zCSRYYd5TGfeZmfclUslTJciiFJHZ8TsrEx1h+tO45n9cTnBU CX7g== X-Gm-Message-State: AOAM530lXfBq86PlNThvFUeswLLLKjmuDVL46SLA5j23GbH8k5a1QHym iHjtGD/PwS+0N0kw0H+NdTtKHzPu7F4iKN1lG3VCpvmYrfV3jShugFSuOudI6z1Fs9qkvLcXnXp COxD8oSKTBVJ8igjuscL9N10Pql+ZRpfK3NwWy19RPR1JgVW7/KJb X-Google-Smtp-Source: ABdhPJz85xWvqeL2yHFaak4y+nJ/xEVkUlLvlLAoAdtoHAOEELzn1QIgkgrscr98M/mnEpIprJyJKkM= X-Received: from ruffy.mtv.corp.google.com ([2620:0:1000:1412:4cc1:c5e:b49d:b16f]) (user=dje job=sendgmr) by 2002:a63:504e:: with SMTP id q14mr5389608pgl.306.1613679350404; Thu, 18 Feb 2021 12:15:50 -0800 (PST) Date: Thu, 18 Feb 2021 12:15:36 -0800 In-Reply-To: <20210218201538.701509-1-dje@google.com> Message-Id: <20210218201538.701509-3-dje@google.com> Mime-Version: 1.0 References: <20210218201538.701509-1-dje@google.com> X-Mailer: git-send-email 2.30.0.617.g56c4b15f3c-goog Subject: [PATCH v4 2/4] util/qemu-sockets.c: Split host:port parsing out of inet_parse To: qemu-devel@nongnu.org Cc: Samuel Thibault , " =?utf-8?q?Daniel_P_?= =?utf-8?q?=2E_Berrang=C3=A9?= " , Doug Evans Received-SPF: pass client-ip=2607:f8b0:4864:20::64a; envelope-from=39souYAMKCk8u0vx55x2v.t537v3B-uvCv2454x4B.58x@flex--dje.bounces.google.com; helo=mail-pl1-x64a.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: Doug Evans X-Patchwork-Original-From: Doug Evans via From: Doug Evans The parsing is moved into new function inet_parse_host_and_port. This is done in preparation for using the function in net/slirp.c. Signed-off-by: Doug Evans --- Changes from v3: - this patch is new in v4 - provides new utility: inet_parse_host_and_port, updates inet_parse to use it include/qemu/sockets.h | 3 ++ util/qemu-sockets.c | 94 +++++++++++++++++++++++++++++++----------- 2 files changed, 72 insertions(+), 25 deletions(-) diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h index 7d1f813576..f720378a6b 100644 --- a/include/qemu/sockets.h +++ b/include/qemu/sockets.h @@ -31,6 +31,9 @@ int socket_set_fast_reuse(int fd); int inet_ai_family_from_address(InetSocketAddress *addr, Error **errp); +const char* inet_parse_host_and_port(const char* str, int terminator, + char **addr, char **port, bool *is_v6, + Error **errp); int inet_parse(InetSocketAddress *addr, const char *str, Error **errp); int inet_connect(const char *str, Error **errp); int inet_connect_saddr(InetSocketAddress *saddr, Error **errp); diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index 8af0278f15..9fca7d9212 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -615,44 +615,88 @@ static int inet_parse_flag(const char *flagname, const char *optstr, bool *val, return 0; } -int inet_parse(InetSocketAddress *addr, const char *str, Error **errp) +/* + * Parse an inet host and port as "host:port". + * Terminator may be '\0'. + * The syntax for ipv4 addresses is: address:port. + * The syntax for ipv6 addresses is: [address]:port. + * On success, returns a pointer to the terminator. Space for the address and + * port is malloced and stored in *host, *port, the caller must free. + * *is_v6 indicates whether the address is ipv4 or ipv6. If ipv6 then the + * surrounding [] brackets are removed. + * On failure NULL is returned with the error stored in *errp. + */ +const char* inet_parse_host_and_port(const char* str, int terminator, + char **hostp, char **portp, bool *is_v6, + Error **errp) { - const char *optstr, *h; + const char *terminator_ptr = strchr(str, terminator); + g_autofree char *buf = NULL; char host[65]; char port[33]; - int to; - int pos; - char *begin; - memset(addr, 0, sizeof(*addr)); + if (terminator_ptr == NULL) { + /* If the terminator isn't found then use the entire string. */ + terminator_ptr = str + strlen(str); + } + buf = g_strndup(str, terminator_ptr - str); - /* parse address */ - if (str[0] == ':') { - /* no host given */ - host[0] = '\0'; - if (sscanf(str, ":%32[^,]%n", port, &pos) != 1) { - error_setg(errp, "error parsing port in address '%s'", str); - return -1; - } - } else if (str[0] == '[') { + if (buf[0] == '[') { /* IPv6 addr */ - if (sscanf(str, "[%64[^]]]:%32[^,]%n", host, port, &pos) != 2) { - error_setg(errp, "error parsing IPv6 address '%s'", str); - return -1; + if (buf[1] == ']') { + /* sscanf %[ doesn't recognize empty contents. */ + host[0] = '\0'; + if (sscanf(buf, "[]:%32s", port) != 1) { + error_setg(errp, "error parsing IPv6 host:port '%s'", buf); + return NULL; + } + } else { + if (sscanf(buf, "[%64[^]]]:%32s", host, port) != 2) { + error_setg(errp, "error parsing IPv6 host:port '%s'", buf); + return NULL; + } } } else { - /* hostname or IPv4 addr */ - if (sscanf(str, "%64[^:]:%32[^,]%n", host, port, &pos) != 2) { - error_setg(errp, "error parsing address '%s'", str); - return -1; + if (buf[0] == ':') { + /* no host given */ + host[0] = '\0'; + if (sscanf(buf, ":%32s", port) != 1) { + error_setg(errp, "error parsing host:port '%s'", buf); + return NULL; + } + } else { + /* hostname or IPv4 addr */ + if (sscanf(buf, "%64[^:]:%32s", host, port) != 2) { + error_setg(errp, "error parsing host:port '%s'", buf); + return NULL; + } } } - addr->host = g_strdup(host); - addr->port = g_strdup(port); + *hostp = g_strdup(host); + *portp = g_strdup(port); + *is_v6 = buf[0] == '['; + + return terminator_ptr; +} + +int inet_parse(InetSocketAddress *addr, const char *str, Error **errp) +{ + const char *optstr, *h; + bool is_v6; + int to; + int pos; + char *begin; + + memset(addr, 0, sizeof(*addr)); + + optstr = inet_parse_host_and_port(str, ',', &addr->host, &addr->port, + &is_v6, errp); + if (optstr == NULL) { + return -1; + } /* parse options */ - optstr = str + pos; h = strstr(optstr, ",to="); if (h) { h += 4; From patchwork Thu Feb 18 20:15:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Evans X-Patchwork-Id: 12094245 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 82C32C433E0 for ; Thu, 18 Feb 2021 20:24:29 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9401B64EE0 for ; Thu, 18 Feb 2021 20:24:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9401B64EE0 Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=nongnu.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:60492 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lCpqd-0004HZ-BF for qemu-devel@archiver.kernel.org; Thu, 18 Feb 2021 15:24:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46400) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <3-MouYAMKClEw2xz77z4x.v759x5D-wxEx4676z6D.7Az@flex--dje.bounces.google.com>) id 1lCpiZ-0005Ug-Mb for qemu-devel@nongnu.org; Thu, 18 Feb 2021 15:16:07 -0500 Received: from mail-pf1-x449.google.com ([2607:f8b0:4864:20::449]:44806) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3-MouYAMKClEw2xz77z4x.v759x5D-wxEx4676z6D.7Az@flex--dje.bounces.google.com>) id 1lCpiW-0000M9-Gw for qemu-devel@nongnu.org; Thu, 18 Feb 2021 15:16:07 -0500 Received: by mail-pf1-x449.google.com with SMTP id t12so2109576pfe.11 for ; Thu, 18 Feb 2021 12:15:53 -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=cAcSP5+KaHc3yh0fURwQVuIRV7eBfkGSw7YhlJH46iE=; b=tiEPxq9sO05LwUBfXKjlFoKt7mOzPS4CQCRXxWTlJgbOeu7k27DUzc5kZTuCjJMk+E A6YMiIXKjNs/SOevdaZ5tbWpuaQt387xuyLOwhhljDrw6XAPTqry+oqfpmqNQ4fKHBIM E5IdVGdnjk6zqkUoNDA5uNN8TVcxCV7ZaqsUGNsM78G/EyMkNK66pSkgsGKi49EbEi7X 2/XGywdyVwxFusA+LtH9LI0c4j97JYLyuBzPzqeQSUaQ9spQQ51dBy86VelNkDaU4jHM A0ytqNk/PoVv/AfcSI3LvHkADs/gErpjqqNt3yEkw8oqcd5ayj2Nnt3zOmhSW5Lq3jip +yWw== 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=cAcSP5+KaHc3yh0fURwQVuIRV7eBfkGSw7YhlJH46iE=; b=C67wDHtz7PLe86QkTB/UVzL7xkEiWo8pwKdvxVZSYvBzHze/RUD0tadeixZQF+ieQA N0ytDZMDDgg42NgnQfpPOXClB1AsUeDSCbE3CBJGtJhPA/I3VufVuCVHwUpRyLhYh3wE ez5SPnMKYtAOtd37veyIZ1asPu3X8r93wR4pjtAoc3PnzaV6HqTSZ8kWmgVzL3r2RTCl n8CjrUxgDC57C4+a4gm3d8C1tJEI+XGc7qp5njXrXLdDZYtSSUGykuCjNaWXNFdxrq/d m23ZJfdlOBsHCqVvaJBW5T8TACatAJFLyqKKIyT251dcOQjmVXVcKNzCbNWufeV1LXCu 0e3Q== X-Gm-Message-State: AOAM531debtMseUvKR9LleFPk0Q+DTcNWJOZH+Ny9g4MozGAwY+tn5Zh +Baj1eJ/XJMxke4CA+xrkExeUU3Mfp7Ccqlded1rUllA60nmTpR8WkhFbmsib6vxCjw5uUpwpvH eIi3YFcsL0TIhDupPUuGW5KZfgSpeo935EpGZiwJgTA9syrqPKdG9 X-Google-Smtp-Source: ABdhPJz27KkiijdMqd1xfEBk1MotqLjrQ6nmtbCgke21ImNCfFAIDGOcO/vxBq2Vn12rodMBatEvD8M= X-Received: from ruffy.mtv.corp.google.com ([2620:0:1000:1412:4cc1:c5e:b49d:b16f]) (user=dje job=sendgmr) by 2002:a17:90a:1a16:: with SMTP id 22mr5742051pjk.34.1613679352835; Thu, 18 Feb 2021 12:15:52 -0800 (PST) Date: Thu, 18 Feb 2021 12:15:37 -0800 In-Reply-To: <20210218201538.701509-1-dje@google.com> Message-Id: <20210218201538.701509-4-dje@google.com> Mime-Version: 1.0 References: <20210218201538.701509-1-dje@google.com> X-Mailer: git-send-email 2.30.0.617.g56c4b15f3c-goog Subject: [PATCH v4 3/4] net/slirp.c: Refactor address parsing To: qemu-devel@nongnu.org Cc: Samuel Thibault , " =?utf-8?q?Daniel_P_?= =?utf-8?q?=2E_Berrang=C3=A9?= " , Doug Evans Received-SPF: pass client-ip=2607:f8b0:4864:20::449; envelope-from=3-MouYAMKClEw2xz77z4x.v759x5D-wxEx4676z6D.7Az@flex--dje.bounces.google.com; helo=mail-pf1-x449.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: Doug Evans X-Patchwork-Original-From: Doug Evans via From: Doug Evans ... in preparation for adding ipv6 host forwarding support. New test: avocado run tests/acceptance/hostfwd.py Signed-off-by: Doug Evans --- Changes from v3: - this patch renamed from 2/3 to 3/4 - call inet_parse_host_and_port from util/qemu-sockets.c - added tests/acceptance/hostfwd.py Changes from v2: - nothing of consequence Changes from v1: - this patch is new in v2 - address parsing refactor split out, ipv4 changes here - libslirp part is now upstream in libslirp repo net/slirp.c | 164 ++++++++++++++++++++++-------------- tests/acceptance/hostfwd.py | 84 ++++++++++++++++++ 2 files changed, 185 insertions(+), 63 deletions(-) create mode 100644 tests/acceptance/hostfwd.py diff --git a/net/slirp.c b/net/slirp.c index be914c0be0..ee39014a71 100644 --- a/net/slirp.c +++ b/net/slirp.c @@ -631,15 +631,90 @@ static SlirpState *slirp_lookup(Monitor *mon, const char *id) } } +/* + * 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 in *errp. + */ +static const char *parse_protocol(const char *str, int sep, bool *is_udp, + Error **errp) +{ + char buf[10]; + const char *p = str; + + if (get_str_sep(buf, sizeof(buf), &p, sep) < 0) { + error_setg(errp, "Missing protocol name separator"); + return NULL; + } + + if (!strcmp(buf, "tcp") || buf[0] == '\0') { + *is_udp = false; + } else if (!strcmp(buf, "udp")) { + *is_udp = true; + } else { + error_setg(errp, "Bad protocol name"); + return NULL; + } + + return p; +} + +/* + * Parse an ip address/port of the form "address:port". + * 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 in *errp. + */ +static const char *parse_ip_addr_and_port(const char *str, int terminator, + struct in_addr *addr, int *port, + 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); + + 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 (qemu_strtoi(port_str, NULL, 10, port) < 0 || + *port < 0 || *port > 65535) { + error_setg(errp, "Bad port"); + return NULL; + } + + /* + * At this point "p" points to the terminator or trailing NUL if the + * terminator is not present. + */ + if (*p) { + ++p; + } + return p; +} + void hmp_hostfwd_remove(Monitor *mon, const QDict *qdict) { - struct in_addr host_addr = { .s_addr = INADDR_ANY }; + struct in_addr host_addr; int host_port; - char buf[256]; const char *src_str, *p; SlirpState *s; - int is_udp = 0; + bool is_udp; int err; + Error *error = NULL; const char *arg1 = qdict_get_str(qdict, "arg1"); const char *arg2 = qdict_get_try_str(qdict, "arg2"); @@ -654,30 +729,18 @@ void hmp_hostfwd_remove(Monitor *mon, const QDict *qdict) return; } + g_assert(src_str != NULL); p = src_str; - if (!p || get_str_sep(buf, sizeof(buf), &p, ':') < 0) { - goto fail_syntax; - } - - if (!strcmp(buf, "tcp") || buf[0] == '\0') { - is_udp = 0; - } else if (!strcmp(buf, "udp")) { - is_udp = 1; - } else { - goto fail_syntax; - } - 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, &error); + if (p == NULL) { goto fail_syntax; } - if (qemu_strtoi(p, NULL, 10, &host_port)) { + if (parse_ip_addr_and_port(p, '\0', &host_addr, &host_port, + &error) == NULL) { goto fail_syntax; } - err = slirp_remove_hostfwd(s->slirp, is_udp, host_addr, host_port); monitor_printf(mon, "host forwarding rule for %s %s\n", src_str, @@ -685,65 +748,39 @@ void hmp_hostfwd_remove(Monitor *mon, const QDict *qdict) return; fail_syntax: - monitor_printf(mon, "invalid format\n"); + monitor_printf(mon, "Invalid format: %s\n", error_get_pretty(error)); + error_free(error); } static int slirp_hostfwd(SlirpState *s, const char *redir_str, Error **errp) { - struct in_addr host_addr = { .s_addr = INADDR_ANY }; - struct in_addr guest_addr = { .s_addr = 0 }; + struct in_addr host_addr, guest_addr; int host_port, guest_port; const char *p; - char buf[256]; - int is_udp; - char *end; - const char *fail_reason = "Unknown reason"; + bool is_udp; + Error *error = 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, &error); + 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_ip_addr_and_port(p, '-', &host_addr, &host_port, &error); + if (p == NULL) { + error_prepend(&error, "For host address: "); goto fail_syntax; } - if (get_str_sep(buf, sizeof(buf), &p, ':') < 0) { - fail_reason = "Missing guest address"; + if (parse_ip_addr_and_port(p, '\0', &guest_addr, &guest_port, + &error) == NULL) { + error_prepend(&error, "For guest address: "); 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) { + error_setg(&error, "For guest address: Bad port"); goto fail_syntax; } @@ -757,7 +794,8 @@ 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); + error_get_pretty(error)); + error_free(error); return -1; } diff --git a/tests/acceptance/hostfwd.py b/tests/acceptance/hostfwd.py new file mode 100644 index 0000000000..1eaa0371ba --- /dev/null +++ b/tests/acceptance/hostfwd.py @@ -0,0 +1,84 @@ +# Hostfwd command tests +# +# Copyright 2021 Google LLC +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. + + +from avocado_qemu import Test + + +class Hostfwd(Test): + """ + :avocado: tags=hostfwd + """ + def hmc(self, cmd): + return self.vm.command('human-monitor-command', command_line=cmd) + + def test_qmp_hostfwd_ipv4(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::65022-:22'), '') + self.assertEquals(self.hmc('hostfwd_remove vnet tcp::65022'), + 'host forwarding rule for tcp::65022 removed\r\n') + self.assertEquals(self.hmc('hostfwd_add tcp::65022-:22'), '') + self.assertEquals(self.hmc('hostfwd_remove tcp::65022'), + 'host forwarding rule for tcp::65022 removed\r\n') + self.assertEquals(self.hmc('hostfwd_add udp::65042-:42'), '') + self.assertEquals(self.hmc('hostfwd_remove udp::65042'), + 'host forwarding rule for udp::65042 removed\r\n') + + def test_qmp_hostfwd_ipv4_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 ::65022'), + 'host forwarding rule for ::65022 not found\r\n') + self.assertEquals(self.hmc('hostfwd_add udp::65042-:42'), '') + self.assertEquals(self.hmc('hostfwd_add udp::65042-:42'), + "Could not set up host forwarding rule 'udp::65042-:42'\r\n") + self.assertEquals(self.hmc('hostfwd_remove ::65042'), + 'host forwarding rule for ::65042 not found\r\n') + self.assertEquals(self.hmc('hostfwd_remove udp::65042'), + 'host forwarding rule for udp::65042 removed\r\n') + self.assertEquals(self.hmc('hostfwd_remove udp::65042'), + 'host forwarding rule for udp::65042 not found\r\n') + + def test_qmp_hostfwd_ipv4_parsing_errors(self): + """Verify handling of various kinds of parsing errors.""" + self.vm.add_args('-nodefaults', + '-netdev', 'user,id=vnet', + '-device', 'virtio-net,netdev=vnet') + self.vm.launch() + self.assertEquals(self.hmc('hostfwd_remove abc::42'), + 'Invalid format: Bad protocol name\r\n') + self.assertEquals(self.hmc('hostfwd_add abc::65022-:22'), + "Invalid host forwarding rule 'abc::65022-:22' (Bad protocol name)\r\n") + self.assertEquals(self.hmc('hostfwd_add :a.b.c.d:66-:66'), + "Invalid host forwarding rule ':a.b.c.d:66-:66' (For host address: Bad address)\r\n") + self.assertEquals(self.hmc('hostfwd_add ::66-a.b.c.d:66'), + "Invalid host forwarding rule '::66-a.b.c.d:66' (For guest address: Bad address)\r\n") + self.assertEquals(self.hmc('hostfwd_add ::66666-:66666'), + "Invalid host forwarding rule '::66666-:66666' (For host address: Bad port)\r\n") + self.assertEquals(self.hmc('hostfwd_add ::-1-foo'), + "Invalid host forwarding rule '::-1-foo' (For host address: error parsing host:port ':')\r\n") + self.assertEquals(self.hmc('hostfwd_add ::66-foo'), + "Invalid host forwarding rule '::66-foo' (For guest address: error parsing host:port 'foo')\r\n") + self.assertEquals(self.hmc('hostfwd_add ::66-:66666'), + "Invalid host forwarding rule '::66-:66666' (For guest address: Bad port)\r\n") + self.assertEquals(self.hmc('hostfwd_add ::66-:-1'), + "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") From patchwork Thu Feb 18 20:15:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Evans X-Patchwork-Id: 12094253 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 369DAC433E0 for ; Thu, 18 Feb 2021 20:30:55 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5CF5A64E4B for ; Thu, 18 Feb 2021 20:30:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5CF5A64E4B Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=nongnu.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:46662 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lCpwr-0002Wi-4Q for qemu-devel@archiver.kernel.org; Thu, 18 Feb 2021 15:30:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46402) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <3-8ouYAMKClQz502AA270.yA8C08G-z0H079A929G.AD2@flex--dje.bounces.google.com>) id 1lCpia-0005Wu-Pz for qemu-devel@nongnu.org; Thu, 18 Feb 2021 15:16:08 -0500 Received: from mail-pg1-x549.google.com ([2607:f8b0:4864:20::549]:56840) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3-8ouYAMKClQz502AA270.yA8C08G-z0H079A929G.AD2@flex--dje.bounces.google.com>) id 1lCpiW-0000MH-Fk for qemu-devel@nongnu.org; Thu, 18 Feb 2021 15:16:08 -0500 Received: by mail-pg1-x549.google.com with SMTP id v16so1887481pgl.23 for ; Thu, 18 Feb 2021 12:15:56 -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=SNmCVV9YeJbGR714hAl1IWGl9Ws3fdkgHjDDepNCxLo=; b=s+zWs6jOjrQG83C0Ek3AWFJEJhL/TuVBKsoW0i8wLdambbgZWksPqNHnukZEFcLB2c Rw534787flMhbyvhDBWJa4xKNvjfo5PEE/FHrQnqfo1fHInISnEF3gFmAC/djDaa1KTC 80W+HlBw2d+Ahsm0+nugbibxPt898ABc15Yc1Q+9mZpEJ9uKdzXtrdKQhFM4QHhmkG2S irFS4QTq1Vj7HTkTG+FW06ly4Yrhy6OeGKkuRODAxJN7dx+y1coLo1NmYYms3azct27+ LYGZjV/I2UeUF6LQ/SomH9WSMHqJjTFOfzXnUDhPKIRQCToFFHxQorO8TQ425M2BxmFE peLQ== 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=SNmCVV9YeJbGR714hAl1IWGl9Ws3fdkgHjDDepNCxLo=; b=YUOFJtRKCQUAKzGTpBUs5eF46VwKWa8PISZUfNx6aNragebi7hycUAtVIBbnzsr0HT lhwy9EIRtBZr/FtTFlUHdbNxQ3Zu8UgD/LHplCpNtuoiihEQ7XfU/jEdfe3AEuh4awdV IgZRs3twdNQ5N0hq0enu5MqPav2BOwbQ6mCGCRJzYmpPQx08WenIrMcMP52cD8bfbQX5 kO6Zg25cUBfxP7iu2xQ4ynUXm0hJdKtXBxmnVR3jXStHl+CuC2yP9D6uHRGFS8lErF/k JTMiyq56379IQ3QlXNyu+eSMOOMezaodnXam5aMgPrMUdqKOheqlKK6GM8F3d/DObfU8 +vaw== X-Gm-Message-State: AOAM533s0ZNdpKEShEFRjUNBIPJIIZlMMNJ2XmtAX+8P2E4ewioUwJ12 4Jqx3LHa9jrnM+lMFmwWDqgeLp57vYTEtttqX9m7LlTyXE0cqkKo4pWbigehkrL5FossHEEw99+ YD5SBy2rsttm3pW0CCfHhUwDOmMEU9d2UB16SYg8gVM4myUbbmV0C X-Google-Smtp-Source: ABdhPJyJOkM9FDmcN5hUr/O68oMS0OMPEjaBaHIhSBz2ugVV9nBqPmL6h9uQ6vGyTfGToZ+wM2vNwBk= X-Received: from ruffy.mtv.corp.google.com ([2620:0:1000:1412:4cc1:c5e:b49d:b16f]) (user=dje job=sendgmr) by 2002:a17:90a:5303:: with SMTP id x3mr5642354pjh.54.1613679355186; Thu, 18 Feb 2021 12:15:55 -0800 (PST) Date: Thu, 18 Feb 2021 12:15:38 -0800 In-Reply-To: <20210218201538.701509-1-dje@google.com> Message-Id: <20210218201538.701509-5-dje@google.com> Mime-Version: 1.0 References: <20210218201538.701509-1-dje@google.com> X-Mailer: git-send-email 2.30.0.617.g56c4b15f3c-goog Subject: [PATCH v4 4/4] net: Extend host forwarding to support IPv6 To: qemu-devel@nongnu.org Cc: Samuel Thibault , " =?utf-8?q?Daniel_P_?= =?utf-8?q?=2E_Berrang=C3=A9?= " , Doug Evans Received-SPF: pass client-ip=2607:f8b0:4864:20::549; envelope-from=3-8ouYAMKClQz502AA270.yA8C08G-z0H079A929G.AD2@flex--dje.bounces.google.com; helo=mail-pg1-x549.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: Doug Evans X-Patchwork-Original-From: Doug Evans via From: Doug Evans Net option "-hostfwd" now supports IPv6 addresses. Commands hostfwd_add, hostfwd_remove now support IPv6 addresses. Signed-off-by: Doug Evans --- 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". - * 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")