From nobody Mon Feb 2 05:56:48 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1768876315; cv=none; d=zohomail.com; s=zohoarc; b=lp54TjYhQKCCaZLjZQJLjpg34oMBB44ON/w76e9neFCk0Yk55lUPgbPFqm0Ze6HfWY2EM02lokh6y2CUt8I06X+Z13EzUlnhd3OSKysqZ7FAZehbCkriDTgoYVCVz7r5sEqjZUNgayrBr4A3/NIaYf59jNUMqPkhSutwWdKPSHM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768876315; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=JWgQSRWQuJeqyOm6c0jQX96Xy7ZNMEnpixGSkwhFvLo=; b=NFMUisDzKco91RSvD+Nkz84+h4yEFRbXfOYRUM1Mgk/flhVxiHnKWBDVJJ7o17L8BdL45hLaBU5UXV1Q+SE7XKq3gBA7rK+q3GmIrQWxq/NRrRYI3KE6BZNdWcOww5Y5myw5x92mMhWHe8bbhL3CVyLWFT3PlJVUihOFOGTZpgE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 17688763151899.9803825163292; Mon, 19 Jan 2026 18:31:55 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 40B3B3F35B; Mon, 19 Jan 2026 21:31:54 -0500 (EST) Received: from [172.19.199.3] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 472B741AE5; Mon, 19 Jan 2026 21:30:24 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 8B02741AA9; Mon, 19 Jan 2026 21:30:18 -0500 (EST) Received: from mail-dy1-f177.google.com (mail-dy1-f177.google.com [74.125.82.177]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 5D66D41B28 for ; Mon, 19 Jan 2026 21:29:46 -0500 (EST) Received: by mail-dy1-f177.google.com with SMTP id 5a478bee46e88-2ad70765db9so5245071eec.1 for ; Mon, 19 Jan 2026 18:29:46 -0800 (PST) Received: from fedora ([2804:14c:3b83:91fd::4615]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2b6b365564csm15479313eec.27.2026.01.19.18.29.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jan 2026 18:29:44 -0800 (PST) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768876185; x=1769480985; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JWgQSRWQuJeqyOm6c0jQX96Xy7ZNMEnpixGSkwhFvLo=; b=Re1kKTAbdblmXeydwurt18O5MfqPA2p8MeI+R24fY9yz4JH4saaXY1fkP5ZbdWjTGl b0exRU2FMbYFG+WGZDQh8Y3tw/5fmQoxeux9rIi0UMTgRpGr1i8YtrupvXy2h12/ph0/ 4Azej+LZpnc2osNMzoXRY4p11tSVi/ZHgGy/vmyMlUGlgn/fpaNhvcAZQD5ysPimiJfs y0JVcbz9tMQPhn1WnVz5x7zSDB+f/KwWFoDbmZyy5coMnEMgbRbEsuowjgSTlrZaqh9h EtYv62M9LzLR+/lDvQHWsBfuszVsmEcM6cU+wT72emuXrsNm6A7+w0jVnMAl6bgV/Js+ EHkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768876185; x=1769480985; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=JWgQSRWQuJeqyOm6c0jQX96Xy7ZNMEnpixGSkwhFvLo=; b=XWUeO1o7fz3fZVn5T5X8slzyRKrd09V32L145yyku64AEfqxGLHkG1cvxzbU9dXdtL 7zyHVOVVWC8pUjq7RamNMVNy2g7VNtwh2YufTGzcE3d10ucgr8AsCtVJtn4RgLGJEkhD mW4adFQwV+aSE9Yy9qMLhvpGKHUi12DK934e6VIG/s1NQViDvPog8yN24XpHb8Wu3T8U yZKK+yRRdbFxLlhX4U2ICzu4VAc0unczEUxIF7Xz3yuUjE9tf/LUf10b9Lhd/A92isWz tXIUkvCEoF3emTFyFzKN5wHgbisrhWSXAEzd3oLnZqZFzGayraVf4RqIMLcvwFLwukjq 9H/Q== X-Gm-Message-State: AOJu0YwTrJl8gVo3lIOQab6iTpcyRvs+K8NwL2syLaEdEbi2wnX4a1/o vMonklvME1L21rdg6iMtHnBTrXXb6Nf/UiBhGP0Vt9f9NFsF/ZVj9/eJOjTP3Q== X-Gm-Gg: AZuq6aI92K9HicC6AqhOzo0AlpF48DAsdQNtq0T2cZKQCGZ6I6bdMyQCl+6cebQH/wr aWSXhkHab9/j/YYlThOv5QK39e+16fckWy52y8SoLXTCDsAwczIB0jwle5+2Z1qakPgCzBO+Pmv kp+eoQ2vVpdfPYEpnp7zqoNg4ZIAjIstcoZQjPaNFxv0TteJmSr4q7w6O2A847Lqs/8I4HpAR1z zr5WjiqhyeIOsAZ8Sqa3JxcXPUOBHEqY/T6mHJTfe4Gu6QCg6unxB7qR1byojBZS1Iq+eQrHes9 kywr5Gvpx7qy1u6poTPW4b8y986xhiaGoB4GMrrE+KYl9qIXkuGFzTvqWjTxH71jNAq40TpbPbG 0fPqcpcTEZWcCjMDoEUsm5g8WoQhnHlO0hUEIZ9rDKX47UFr7J2eLAVGSryBy1sv4 X-Received: by 2002:a05:7300:511:b0:2a4:3594:d54e with SMTP id 5a478bee46e88-2b6b50022bfmr10124676eec.27.1768876184802; Mon, 19 Jan 2026 18:29:44 -0800 (PST) From: Julio Faracco To: devel@lists.libvirt.org Subject: [PATCH v2 1/2] util: Remove @masked argument from virSocketAddrFormatWithPrefix Date: Mon, 19 Jan 2026 23:29:11 -0300 Message-ID: <20260120022920.42397-2-jcfaracco@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260120022920.42397-1-jcfaracco@gmail.com> References: <20260120022920.42397-1-jcfaracco@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: XK7O32QU4LP2DQ75NTAL6DKSNHAGVKJ6 X-Message-ID-Hash: XK7O32QU4LP2DQ75NTAL6DKSNHAGVKJ6 X-MailFrom: jcfaracco@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: jtomko@redhat.com X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1768876316081158500 Content-Type: text/plain; charset="utf-8" The function virSocketAddrFormatWithPrefix is being used only in network_nftables.c and network_iptables.c. In both cases, the masked argument is always true. There is no place where this function is being called with masked=3Dfalse since its introduction in commit 426afc00. In other words, to the current state of libvirt code, we can remove this argument. Signed-off-by: Julio Faracco Reviewed-by: J=C3=A1n Tomko --- src/network/network_iptables.c | 10 +++++----- src/network/network_nftables.c | 10 +++++----- src/util/virsocketaddr.c | 14 ++++++-------- src/util/virsocketaddr.h | 3 +-- 4 files changed, 17 insertions(+), 20 deletions(-) diff --git a/src/network/network_iptables.c b/src/network/network_iptables.c index d21ce59b70..6002d120b0 100644 --- a/src/network/network_iptables.c +++ b/src/network/network_iptables.c @@ -384,7 +384,7 @@ iptablesForwardAllowOut(virFirewall *fw, virFirewallLayer layer =3D VIR_SOCKET_ADDR_FAMILY(netaddr) =3D=3D AF_I= NET ? VIR_FIREWALL_LAYER_IPV4 : VIR_FIREWALL_LAYER_IPV6; =20 - if (!(networkstr =3D virSocketAddrFormatWithPrefix(netaddr, prefix, tr= ue))) + if (!(networkstr =3D virSocketAddrFormatWithPrefix(netaddr, prefix))) return -1; =20 if (physdev && physdev[0]) @@ -474,7 +474,7 @@ iptablesForwardAllowRelatedIn(virFirewall *fw, VIR_FIREWALL_LAYER_IPV4 : VIR_FIREWALL_LAYER_IPV6; g_autofree char *networkstr =3D NULL; =20 - if (!(networkstr =3D virSocketAddrFormatWithPrefix(netaddr, prefix, tr= ue))) + if (!(networkstr =3D virSocketAddrFormatWithPrefix(netaddr, prefix))) return -1; =20 if (physdev && physdev[0]) @@ -566,7 +566,7 @@ iptablesForwardAllowIn(virFirewall *fw, VIR_FIREWALL_LAYER_IPV4 : VIR_FIREWALL_LAYER_IPV6; g_autofree char *networkstr =3D NULL; =20 - if (!(networkstr =3D virSocketAddrFormatWithPrefix(netaddr, prefix, tr= ue))) + if (!(networkstr =3D virSocketAddrFormatWithPrefix(netaddr, prefix))) return -1; =20 if (physdev && physdev[0]) @@ -820,7 +820,7 @@ iptablesForwardMasquerade(virFirewall *fw, virFirewallLayer layer =3D af =3D=3D AF_INET ? VIR_FIREWALL_LAYER_IPV4 : VIR_FIREWALL_LAYER_IPV6; =20 - if (!(networkstr =3D virSocketAddrFormatWithPrefix(netaddr, prefix, tr= ue))) + if (!(networkstr =3D virSocketAddrFormatWithPrefix(netaddr, prefix))) return -1; =20 if (VIR_SOCKET_ADDR_IS_FAMILY(&addr->start, af)) { @@ -965,7 +965,7 @@ iptablesForwardDontMasquerade(virFirewall *fw, virFirewallLayer layer =3D VIR_SOCKET_ADDR_FAMILY(netaddr) =3D=3D AF_I= NET ? VIR_FIREWALL_LAYER_IPV4 : VIR_FIREWALL_LAYER_IPV6; =20 - if (!(networkstr =3D virSocketAddrFormatWithPrefix(netaddr, prefix, tr= ue))) + if (!(networkstr =3D virSocketAddrFormatWithPrefix(netaddr, prefix))) return -1; =20 if (physdev && physdev[0]) diff --git a/src/network/network_nftables.c b/src/network/network_nftables.c index 5d716264bf..cffe8072f5 100644 --- a/src/network/network_nftables.c +++ b/src/network/network_nftables.c @@ -354,7 +354,7 @@ nftablesAddForwardAllowOut(virFirewall *fw, const char *layerStr =3D nftablesLayerTypeToString(layer); virFirewallCmd *fwCmd; =20 - if (!(networkstr =3D virSocketAddrFormatWithPrefix(netaddr, prefix, tr= ue))) + if (!(networkstr =3D virSocketAddrFormatWithPrefix(netaddr, prefix))) return -1; =20 fwCmd =3D virFirewallAddCmd(fw, layer, "insert", "rule", @@ -392,7 +392,7 @@ nftablesAddForwardAllowRelatedIn(virFirewall *fw, g_autofree char *networkstr =3D NULL; virFirewallCmd *fwCmd; =20 - if (!(networkstr =3D virSocketAddrFormatWithPrefix(netaddr, prefix, tr= ue))) + if (!(networkstr =3D virSocketAddrFormatWithPrefix(netaddr, prefix))) return -1; =20 fwCmd =3D virFirewallAddCmd(fw, layer, "insert", "rule", @@ -430,7 +430,7 @@ nftablesAddForwardAllowIn(virFirewall *fw, g_autofree char *networkstr =3D NULL; virFirewallCmd *fwCmd; =20 - if (!(networkstr =3D virSocketAddrFormatWithPrefix(netaddr, prefix, tr= ue))) + if (!(networkstr =3D virSocketAddrFormatWithPrefix(netaddr, prefix))) return -1; =20 fwCmd =3D virFirewallAddCmd(fw, layer, "insert", "rule", @@ -544,7 +544,7 @@ nftablesAddForwardMasquerade(virFirewall *fw, VIR_FIREWALL_LAYER_IPV4 : VIR_FIREWALL_LAYER_IPV6; const char *layerStr =3D nftablesLayerTypeToString(layer); =20 - if (!(networkstr =3D virSocketAddrFormatWithPrefix(netaddr, prefix, tr= ue))) + if (!(networkstr =3D virSocketAddrFormatWithPrefix(netaddr, prefix))) return -1; =20 if (VIR_SOCKET_ADDR_IS_FAMILY(&addr->start, af)) { @@ -628,7 +628,7 @@ nftablesAddDontMasquerade(virFirewall *fw, const char *layerStr =3D nftablesLayerTypeToString(layer); virFirewallCmd *fwCmd; =20 - if (!(networkstr =3D virSocketAddrFormatWithPrefix(netaddr, prefix, tr= ue))) + if (!(networkstr =3D virSocketAddrFormatWithPrefix(netaddr, prefix))) return -1; =20 fwCmd =3D virFirewallAddCmd(fw, layer, "insert", "rule", diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 4d4a6b2a0f..1f203fb50d 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -529,17 +529,15 @@ virSocketAddrFormatFull(const virSocketAddr *addr, * @masked: true to mask off the host bits of the address * * Returns a string representation of the IP network described by - * @netaddr/@prefix. If @masked is true, the address is masked to - * remove the host bits according to prefix. So, for example, sending - * f(1.2.3.4, 24, true) would return "1.2.3.0/24", but f(1.2.3.4, 24, - * false) would return "1.2.3.4/24". + * @addr/@prefix. The address is masked to remove the host bits + * according to prefix. So, for example, sending + * f(1.2.3.4, 24) would return "1.2.3.0/24". * - * returns false on failure (and logs an error message) + * Returns NULL on failure (and logs an error message) */ char * virSocketAddrFormatWithPrefix(virSocketAddr *addr, - unsigned int prefix, - bool masked) + unsigned int prefix) { virSocketAddr network; g_autofree char *netstr =3D NULL; @@ -551,7 +549,7 @@ virSocketAddrFormatWithPrefix(virSocketAddr *addr, return NULL; } =20 - if (masked && virSocketAddrMaskByPrefix(addr, prefix, &network) < 0) { + if (virSocketAddrMaskByPrefix(addr, prefix, &network) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Failure to mask address")); return NULL; diff --git a/src/util/virsocketaddr.h b/src/util/virsocketaddr.h index 47b8effa85..c7ad3250e0 100644 --- a/src/util/virsocketaddr.h +++ b/src/util/virsocketaddr.h @@ -89,8 +89,7 @@ char *virSocketAddrFormatFull(const virSocketAddr *addr, bool withService, const char *separator); char *virSocketAddrFormatWithPrefix(virSocketAddr *addr, - unsigned int prefix, - bool masked); + unsigned int prefix); =20 char *virSocketAddrGetPath(virSocketAddr *addr); =20 --=20 2.52.0 From nobody Mon Feb 2 05:56:48 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1768876267; cv=none; d=zohomail.com; s=zohoarc; b=GZq9Aj0T29pwM4KgeCCHo7i7WndcMvR0mj9X9xov8bwpl6Orc1F+o8DRND94novwsBP00j1oNOEm15tW19Yx2IuPGNZA4NyvBHax14dohZXmWCwVcTuMgeXc1JpeGMGuQJsfvf3Pn+orpLalaIhVfjmlKMjNUBzFOApl085J55Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768876267; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=Fm7xSSCyi8iCcrOJm26ERKOGHRabHfVhjMOYbPQghfM=; b=S1vXuDNPDkgFK7aeTzmnOdu5y3+z8ZNaaM467c5XwIKr9GLBRQl7PUcArrejONpRtuv8fege5yJOgqUXJnEQv17I7LxyZOyBPNnmdLg3N8nUbfrQ5AaK7rc3AqY91v5i5cLnb/Ko2kHsT8LfxJrY+UtE9NEgZon9PcbcyfO0/Mk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1768876267359174.8414819984938; Mon, 19 Jan 2026 18:31:07 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 3E81141BBA; Mon, 19 Jan 2026 21:31:06 -0500 (EST) Received: from [172.19.199.3] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 42CBC43DE8; Mon, 19 Jan 2026 21:30:23 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 8018741AA9; Mon, 19 Jan 2026 21:30:18 -0500 (EST) Received: from mail-dl1-f47.google.com (mail-dl1-f47.google.com [74.125.82.47]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 474AE41C09 for ; Mon, 19 Jan 2026 21:29:51 -0500 (EST) Received: by mail-dl1-f47.google.com with SMTP id a92af1059eb24-1233bc1117fso3047601c88.0 for ; Mon, 19 Jan 2026 18:29:51 -0800 (PST) Received: from fedora ([2804:14c:3b83:91fd::4615]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2b6b365564csm15479313eec.27.2026.01.19.18.29.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jan 2026 18:29:49 -0800 (PST) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768876190; x=1769480990; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Fm7xSSCyi8iCcrOJm26ERKOGHRabHfVhjMOYbPQghfM=; b=BAMnFVKNISjeJEvFGVekzW9TgQELwcqdjhz4i2xtbmb5NZTrWLcxnfMAMwsfPRBhiS rGLTfm5oVy8NjJnZCmUTAICZXR1qHYg+rB2vcjb2CFySgmfZhcqT9RtWI8YNCP0O1FVT AfvYNDpzziAzuAb6h0I6eFy6E13x7QaXEP2CmYzhMMXYUtODn8F6CEQxRh6yO7UAsSCa 7KbOHjM8OgGa+/L35r207Vw0j1AQng43hrL2AQHda+1cPrA3ugi6GEqGk3jT45o0nYGb q62KbVKRFCgOK70Wa0qHKlkg2pNLr0gj4gk7F0mzfvzmU6iHECZclSO+rXAJOJvAhEB2 zs2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768876190; x=1769480990; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Fm7xSSCyi8iCcrOJm26ERKOGHRabHfVhjMOYbPQghfM=; b=sTsKcG/emaiNqsjlD23KaSgIaQI4ctflDb7aP94LcUqJJaKGcQfNG5SHWfR+W73ai+ fojD3oWB7sGEWXqOMp7XjFqkLiHpAJGEkjFQ2GJcHXBzAKYBNN4pNhSD06ZaSZj1i+11 vBzYcSRIrRIoVVD/+N7xTvwyNHceMpB79ZreCkGYFgWsG1tyE5xk8HFSQse5qyhRChVy 6Xmcbsgjhjk5Nxe2imJky5A1T3uXr3seDMBvor5Jqcf2nq//sUZ6QHfdG2RrOW2yc+yw B0LJMr7OKWo+rJhu+PpPOmni7B7qnIMBrEzKdntQdcA1D3xYhNQeXJZI+92Apywspe/6 MSjA== X-Gm-Message-State: AOJu0YzEIFvQiEhSrJkKUcXBPbqGBE9q7+ke+Y7O8e3IVneHtiBoW7Nr hzmuL7yYYtIqxLbgVJ8sJMy/Pkh5nrOfcPuBb0Dy1zSCxfmCG/zJFuwYv58I7g== X-Gm-Gg: AY/fxX73YgSKgMAs+N1YcMaVGxnfkDf/45v56nKP4pJpEmhDul/dqE4yVNgqZQJ5vMt gim9VhCRzyqhOwB+776qLSLOK7gWy2IcvPX8uE9aI2BdQUTFrnSNlIbXhH6JfbWT6b840bgm1Oj tDAublVcHb05V08luOUL1OGbrG43LZqiqOWbjSgbgY230AuBmBNKbCFafPXsm7SRHDqSSXEJ05n wnqmIOvPVLfD6nrGCrBrjv+DiROeT0cHAm6JmmJNFMA7pEJOBKAKHQ5DPdxcEQJWXyOf8MqJ4u/ QSMAqjGvpmRZZtQQQqGUq1yUNx45btmbQ3FgPmVA6IGHztOFP4C+9ExuBoI5BNswYrd6qxfzkXo phd/eGEnEB6r4UNKz7Wfsj1dWBPnIc070BFFzBOWJgbh7gE9dGmnUGMgJTP9bfLFH X-Received: by 2002:a05:7022:6b99:b0:11b:ca88:c4f1 with SMTP id a92af1059eb24-1244ae9ee20mr11055736c88.20.1768876189474; Mon, 19 Jan 2026 18:29:49 -0800 (PST) From: Julio Faracco To: devel@lists.libvirt.org Subject: [PATCH v2 2/2] tests: Add tests for virSocketAddrFormatWithPrefix Date: Mon, 19 Jan 2026 23:29:12 -0300 Message-ID: <20260120022920.42397-3-jcfaracco@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260120022920.42397-1-jcfaracco@gmail.com> References: <20260120022920.42397-1-jcfaracco@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: 5NTGMS2HF2IJQPZIHGNRB2GYUTYM4KMI X-Message-ID-Hash: 5NTGMS2HF2IJQPZIHGNRB2GYUTYM4KMI X-MailFrom: jcfaracco@gmail.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: jtomko@redhat.com X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1768876268771158500 Content-Type: text/plain; charset="utf-8" Add comprehensive test coverage for virSocketAddrFormatWithPrefix() to verify its behavior by adding macros DO_TEST_PARSE_AND_FORMAT_WITH_PREFIX and DO_TEST_PARSE_AND_CHECK_FORMAT_WITH_PREFIX and the respective testing function testFormatWithPrefixHelper. This commit also adds some error handling for the unsupported AF_UNIX family. Signed-off-by: Julio Faracco --- tests/sockettest.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/tests/sockettest.c b/tests/sockettest.c index 5cb8a9fb72..9e185cc234 100644 --- a/tests/sockettest.c +++ b/tests/sockettest.c @@ -55,6 +55,22 @@ static int testFormat(virSocketAddr *addr, const char *a= ddrstr, bool pass) } } =20 +static int testFormatWithPrefix(virSocketAddr *addr, const char *addrstr, + unsigned int prefix, bool pass) +{ + g_autofree char *newaddrstr =3D NULL; + + newaddrstr =3D virSocketAddrFormatWithPrefix(addr, prefix); + if (!newaddrstr) + return pass ? -1 : 0; + + if (virTestCompareToString(newaddrstr, addrstr) < 0) { + return pass ? -1 : 0; + } else { + return pass ? 0 : -1; + } +} + struct testParseData { virSocketAddr *addr; const char *addrstr; @@ -78,6 +94,19 @@ static int testFormatHelper(const void *opaque) return testFormat(data->addr, data->addrstr, data->pass); } =20 +struct testFormatWithPrefixData { + virSocketAddr *addr; + const char *addrstr; + unsigned int prefix; + bool pass; +}; +static int testFormatWithPrefixHelper(const void *opaque) +{ + const struct testFormatWithPrefixData *data =3D opaque; + return testFormatWithPrefix(data->addr, data->addrstr, data->prefix, + data->pass); +} + =20 static int testRange(const char *saddrstr, const char *eaddrstr, @@ -293,6 +322,32 @@ mymain(void) ret =3D -1; \ } while (0) =20 +#define DO_TEST_PARSE_AND_FORMAT_WITH_PREFIX(addrstr, family, prefix, pass= ) \ + do { \ + virSocketAddr addr =3D { 0 }; \ + struct testParseData data =3D { &addr, addrstr, family, pass }; \ + struct testFormatWithPrefixData data2 =3D { &addr, addrstr, prefix= , pass }; \ + if (virTestRun("Test parse " addrstr " family " #family, \ + testParseHelper, &data) < 0) \ + ret =3D -1; \ + if (virTestRun("Test format " addrstr " family " #family " with pr= efix /" #prefix, \ + testFormatWithPrefixHelper, &data2) < 0) \ + ret =3D -1; \ + } while (0) + +#define DO_TEST_PARSE_AND_CHECK_FORMAT_WITH_PREFIX(addrstr, addrformated, = family, prefix, pass) \ + do { \ + virSocketAddr addr =3D { 0 }; \ + struct testParseData data =3D { &addr, addrstr, family, pass }; \ + struct testFormatWithPrefixData data2 =3D { &addr, addrformated, p= refix, pass }; \ + if (virTestRun("Test parse " addrstr " family " #family, \ + testParseHelper, &data) < 0) \ + ret =3D -1; \ + if (virTestRun("Test format " addrstr " family " #family " with pr= efix /" #prefix, \ + testFormatWithPrefixHelper, &data2) < 0) \ + ret =3D -1; \ + } while (0) + #define DO_TEST_RANGE(saddr, eaddr, netaddr, prefix, size, pass) \ do { \ struct testRangeData data \ @@ -376,6 +431,14 @@ mymain(void) DO_TEST_PARSE_AND_FORMAT("::fffe:0:0", AF_UNSPEC, true); DO_TEST_PARSE_AND_FORMAT("::ffff:10.1.2.3", AF_UNSPEC, true); =20 + DO_TEST_PARSE_AND_CHECK_FORMAT_WITH_PREFIX("1.2.3.4", "1.2.3.0/24", AF= _INET, 24, true); + DO_TEST_PARSE_AND_CHECK_FORMAT_WITH_PREFIX("10.1.1.12", "10.0.0.0/8", = AF_INET, 8, true); + DO_TEST_PARSE_AND_CHECK_FORMAT_WITH_PREFIX("192.168.1.124", "192.168.0= .0/16", AF_INET, 16, true); + DO_TEST_PARSE_AND_CHECK_FORMAT_WITH_PREFIX("2001:db8:dead:beef:1::", "= 2001:db8:dead:beef::/64", AF_INET6, 64, true); + + DO_TEST_PARSE_AND_FORMAT_WITH_PREFIX("1.2.3.4", AF_UNIX, 24, false); + DO_TEST_PARSE_AND_FORMAT_WITH_PREFIX("2001:db8:dead:beef:1::", AF_UNIX= , 64, false); + /* tests that specify a network that should contain the range */ DO_TEST_RANGE("192.168.122.1", "192.168.122.1", "192.168.122.1", 24, 1= , true); DO_TEST_RANGE("192.168.122.1", "192.168.122.20", "192.168.122.22", 24,= 20, true); --=20 2.52.0