From nobody Mon Feb 9 11:28:51 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=reject dis=none) header.from=google.com ARC-Seal: i=1; a=rsa-sha256; t=1618458136; cv=none; d=zohomail.com; s=zohoarc; b=Pjs5cTc8jfOMx/bz7+qluGiIc1tNVS4TD1fXTlYQFZRp8nhcrSR/Q93VsBtfbgmapGZy2zWaERrHoIwX5JldxQRD9v6rRg5n/voeZqn01IrdGGQGBuiPrLuTKcEpt8yiMd8KB+N+0n/7kc+1u3MwR28iTamhP5dY0lOZA6l/xis= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618458136; 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:References:Sender:Subject:To; bh=BF27c8tCK2QEDJ0jFvx+k383ni9FkfA0jQaGoYxDeIY=; b=kWcVsYLZ2C4eg0VCaMDCs3j8Uruzfp8+K7nTf6E6koMGa4r1YpE3pVxe8Q1BGkr1xIyXRSrLCds1FoHn8uocbzG2N8MQgUcj32BLK0htLn9pXY6H8CGvmQnkQECMhw0Q2QDvSCgp56NiTmRdXp6SaF0f8Gauc7wbXA2odJnw3VM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=reject 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 1618458136495277.1577853506378; Wed, 14 Apr 2021 20:42:16 -0700 (PDT) Received: from localhost ([::1]:53284 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWstT-0001l8-GJ for importer@patchew.org; Wed, 14 Apr 2021 23:42:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51180) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <3j7V3YAMKCuIHNIKSSKPI.GSQUIQY-HIZIPRSRKRY.SVK@flex--dje.bounces.google.com>) id 1lWsrL-0000LI-IA for qemu-devel@nongnu.org; Wed, 14 Apr 2021 23:40:03 -0400 Received: from mail-pf1-x449.google.com ([2607:f8b0:4864:20::449]:35341) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3j7V3YAMKCuIHNIKSSKPI.GSQUIQY-HIZIPRSRKRY.SVK@flex--dje.bounces.google.com>) id 1lWsrJ-0004lD-LX for qemu-devel@nongnu.org; Wed, 14 Apr 2021 23:40:03 -0400 Received: by mail-pf1-x449.google.com with SMTP id t17-20020a056a001391b02902472d81c024so2040767pfg.2 for ; Wed, 14 Apr 2021 20:40:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=BF27c8tCK2QEDJ0jFvx+k383ni9FkfA0jQaGoYxDeIY=; b=clFPWOHNKhujnFRdU/t+88+NgMso048nAD1SlNs0WfA7HJCvWKjZu97tbXwf/UvL2G wc7K8HxM9meW2D4aF5qEFKQBowSkTrTv+IIh2W6sZhtsVQlCeK6NXNLf9DEoObdqffdc DaPXziTJyG6upTP22bjvVMCC+BL8+i7aeW1Ui+yFq/E1qbwkmOsBels3BeDVQoA8hXgE QJ+k2b5MO5FFXLCeDl2N4mFnGH6yqIogfWl29VxTyyStz06fki1OVKvGObFk6uf7ttx1 F5qRGSp8qPfrw+OVoLmxK4MUW7jdM1bydrf+fLnrdsl7XUEhsJX1z/Cy9z3A4+azVQlP CC+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=BF27c8tCK2QEDJ0jFvx+k383ni9FkfA0jQaGoYxDeIY=; b=J948d5Bn5Ky4Khu0mjLfSBVTZaQ+Kn74mZ8MY5CRAQuW/RRITWPO09c7po7aFu+wkl ZmdMEgAqdCW1RyVhlBCyzy/VNR5IH4kiuDsbqG9M4Vr+dga8lFu4nmC9h0AZn57c6SNx h6dtORc5T3iPoPir3s9cN6hi7HC7VAjXLxMshIs7vVqHxdBrErEEcLUMU9rLc2MO1SiG 4yXMgshfaMWHWeSJxNjHikjZ5X6dlFc1xUGbLSW2Hqx4N+xs6B/ws+Hl4RPIw+6lCl/g qe8Pu+VYSj8ykcZhkDreXxXz/0Gdx+N09eHuw3dZ8Q6ZkLFhTpXId5lZ5YOkxKvcvndQ qHLA== X-Gm-Message-State: AOAM533vCR5lkt3WijaeuCGhPXsZOABzqjOycwoi6UNav1x5Ro7Aj+og uH2QwyjmGLZDolhp4lC2J3+xvUbS7/hhV9dPyaolvGPjqyZqXGYtLA0pAnf9JlKyyvdE+AKG0U8 AxJUaquX9OGrgqULXI5lGdmQyuJksNu7uaMb/MYczVidXOx05/FI4 X-Google-Smtp-Source: ABdhPJyWiKzY49vGSFhN7KgtC9KEkqD9stqrp38G/uFr5LyejhAI+MucLs1OLQih9+dPiepoeZ7FKmk= X-Received: from ruffy.mtv.corp.google.com ([2620:0:1000:1412:83d5:e012:e680:1449]) (user=dje job=sendgmr) by 2002:a63:5807:: with SMTP id m7mr1535438pgb.73.1618457999316; Wed, 14 Apr 2021 20:39:59 -0700 (PDT) Date: Wed, 14 Apr 2021 20:39:23 -0700 In-Reply-To: <20210415033925.1290401-1-dje@google.com> Message-Id: <20210415033925.1290401-3-dje@google.com> Mime-Version: 1.0 References: <20210415033925.1290401-1-dje@google.com> X-Mailer: git-send-email 2.31.1.295.g9ea45b61b8-goog Subject: [PATCH v6 2/4] util/qemu-sockets.c: Split host:port parsing out of inet_parse From: Doug Evans To: qemu-devel@nongnu.org Cc: Samuel Thibault , "=?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?=" , 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::449; envelope-from=3j7V3YAMKCuIHNIKSSKPI.GSQUIQY-HIZIPRSRKRY.SVK@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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @google.com) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The parsing is moved into new function inet_parse_host_port. Also split out is ipv4=3Dflag, ipv6=3Dflag processing into inet_parse_ipv46. This is done in preparation for using these functions in net/slirp.c. Signed-off-by: Doug Evans Reviewed-by: Marc-Andr=C3=A9 Lureau --- Changes from v5: Also split out parsing of ipv4=3Don|off, ipv6=3Don|off include/qemu/sockets.h | 3 ++ util/qemu-sockets.c | 65 +++++++++++++++++++++++++++++------------- 2 files changed, 48 insertions(+), 20 deletions(-) diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h index 7d1f813576..94f4e8de83 100644 --- a/include/qemu/sockets.h +++ b/include/qemu/sockets.h @@ -31,6 +31,9 @@ int socket_set_fast_reuse(int fd); =20 int inet_ai_family_from_address(InetSocketAddress *addr, Error **errp); +const char *inet_parse_host_port(InetSocketAddress *addr, + const char *str, Error **errp); +int inet_parse_ipv46(InetSocketAddress *addr, const char *optstr, 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..c0069f2565 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -615,14 +615,12 @@ static int inet_parse_flag(const char *flagname, cons= t char *optstr, bool *val, return 0; } =20 -int inet_parse(InetSocketAddress *addr, const char *str, Error **errp) +const char *inet_parse_host_port(InetSocketAddress *addr, const char *str, + Error **errp) { - const char *optstr, *h; char host[65]; char port[33]; - int to; int pos; - char *begin; =20 memset(addr, 0, sizeof(*addr)); =20 @@ -632,38 +630,32 @@ int inet_parse(InetSocketAddress *addr, const char *s= tr, Error **errp) host[0] =3D '\0'; if (sscanf(str, ":%32[^,]%n", port, &pos) !=3D 1) { error_setg(errp, "error parsing port in address '%s'", str); - return -1; + return NULL; } } else if (str[0] =3D=3D '[') { /* IPv6 addr */ if (sscanf(str, "[%64[^]]]:%32[^,]%n", host, port, &pos) !=3D 2) { error_setg(errp, "error parsing IPv6 address '%s'", str); - return -1; + return NULL; } } else { /* hostname or IPv4 addr */ if (sscanf(str, "%64[^:]:%32[^,]%n", host, port, &pos) !=3D 2) { error_setg(errp, "error parsing address '%s'", str); - return -1; + return NULL; } } =20 addr->host =3D g_strdup(host); addr->port =3D g_strdup(port); =20 - /* parse options */ - optstr =3D str + pos; - h =3D strstr(optstr, ",to=3D"); - if (h) { - h +=3D 4; - if (sscanf(h, "%d%n", &to, &pos) !=3D 1 || - (h[pos] !=3D '\0' && h[pos] !=3D ',')) { - error_setg(errp, "error parsing to=3D argument"); - return -1; - } - addr->has_to =3D true; - addr->to =3D to; - } + return str + pos; +} + +int inet_parse_ipv46(InetSocketAddress *addr, const char *optstr, Error **= errp) +{ + char *begin; + begin =3D strstr(optstr, ",ipv4"); if (begin) { if (inet_parse_flag("ipv4", begin + 5, &addr->ipv4, errp) < 0) { @@ -678,6 +670,39 @@ int inet_parse(InetSocketAddress *addr, const char *st= r, Error **errp) } addr->has_ipv6 =3D true; } + + return 0; +} + +int inet_parse(InetSocketAddress *addr, const char *str, Error **errp) +{ + const char *optstr, *h; + int to; + int pos; + char *begin; + + optstr =3D inet_parse_host_port(addr, str, errp); + if (optstr =3D=3D NULL) { + return -1; + } + + /* parse options */ + + if (inet_parse_ipv46(addr, optstr, errp) < 0) { + return -1; + } + + h =3D strstr(optstr, ",to=3D"); + if (h) { + h +=3D 4; + if (sscanf(h, "%d%n", &to, &pos) !=3D 1 || + (h[pos] !=3D '\0' && h[pos] !=3D ',')) { + error_setg(errp, "error parsing to=3D argument"); + return -1; + } + addr->has_to =3D true; + addr->to =3D to; + } begin =3D strstr(optstr, ",keep-alive"); if (begin) { if (inet_parse_flag("keep-alive", begin + strlen(",keep-alive"), --=20 2.31.1.295.g9ea45b61b8-goog