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=1768880274; cv=none; d=zohomail.com; s=zohoarc; b=BKwElvQJd0Tmp7T/UW1v+jmIw2YmRFeFSXXUUOgZJizB2xvscKUZ9EMQm0cRVX45EYsol3oUbqSP/GEPSYPhDJort6dh4SBU3UBsPJhZ9Sdu8ORRc/8S5oTk6Ymqy1qYzzNZfBDKA54mfvUFy9CEhcdjDkvOG9M+aBMaOmYJsrI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768880274; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To; bh=J4m/E5mdDyKmk6znNv1c9ye/Og2q0uBomTTV01fED6M=; b=fXHA5FbLHQ+qJ5XNhdfqUOV7WmKUdx7i5eVlkPtOfd0oKzkDlQXZTBFw6L2fIvN0YkzUkSFSoAEeZ2ZrMKf6I1/C1fghQk1oG0qF8PnpBPzNalJdfFK0Z9pTmXC+GUDtM8dfNA9gfJP20LMYwcltM1WHS0JcbAmkEl79/z5un9g= 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 1768880274193106.30139413674635; Mon, 19 Jan 2026 19:37:54 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 1231441A6C; Mon, 19 Jan 2026 22:37:53 -0500 (EST) Received: from [172.19.199.3] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 1F9C941BE0; Mon, 19 Jan 2026 22:37:16 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id A40E941A20; Mon, 19 Jan 2026 22:37:13 -0500 (EST) Received: from mail-dy1-f179.google.com (mail-dy1-f179.google.com [74.125.82.179]) (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 1BC093FCA8 for ; Mon, 19 Jan 2026 22:37:13 -0500 (EST) Received: by mail-dy1-f179.google.com with SMTP id 5a478bee46e88-2b6bf6adc65so4851992eec.0 for ; Mon, 19 Jan 2026 19:37:13 -0800 (PST) Received: from fedora ([2804:14c:3b83:91fd::4615]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2b6b361f5c9sm15596745eec.22.2026.01.19.19.37.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Jan 2026 19:37:10 -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=1768880232; x=1769485032; darn=lists.libvirt.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=J4m/E5mdDyKmk6znNv1c9ye/Og2q0uBomTTV01fED6M=; b=NkQxYJ2S6b2FgUEHg08PM9fan1N6OO/Mx6DVvSAXUBfwTqdZkmtupHjkHT+DhgS5NN CkKe7Ji1C5sg+jC6pR/2SwJwKSk+WCMExrnDYH2Ywx4LcMr15MOklG8dG86ycXvwH4jY Fr4CabFAoXdgrOmRTfFw8x2CHdsWdmu5Ym+kQ1fLzvGtSpZ4/VB1U5tgu46/070cmPWb mlbhARmuQod45uKZEo1JKLSfebzFy3Mdi1ePnVLT9ishGY8MpZhPDrVqUHzFQywa7X6+ Ein9+v5wf1pQKgGYcWAoCUQNsWQnHlic4lj7W3RczEYz4cBpd//Ap5HVmX+HdxbOnezA Kp8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768880232; x=1769485032; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=J4m/E5mdDyKmk6znNv1c9ye/Og2q0uBomTTV01fED6M=; b=M6xADJWxktL58x75jTac2vXaA7mYs7eJYsuxWl9wgD2pUFCrTvin16TLInGD8Fq0pI f62ObTGCPsXlRFRIR8d+5mumAHm65CO3VQ/matkFkG88PKZ30M7xXRwss9PO9KFtHAyv Y9w2c3wW6FQObE0XOyksEcySg2N8bPYSE/NnxC5duHHzG7LsyW456M6pDEjFmJLituk9 20qW/DhCTBUTZPGO5a1gy7yx9hvewKEJvTYzB8ZkjM2mdfAHCz0DeVo3HgP46RSv7jIx Ck1erbxYDqz+YlGLRwo7L/Z3jn0kNX0hy6pph2iV5xr9z5Z0/G4MVngzWfCWZJEfVP9+ 1cKA== X-Gm-Message-State: AOJu0YxYJXp5UAK63eH/uPxP2c0whlcBckpquSxJQIaZwNYHMra5ReLv jcwo+ql5bkHKWa6ezrbNo4Kte3tyqMrmNY6u1m3/x/cqjvjNRiC2VEoIV1K9xg== X-Gm-Gg: AZuq6aJd02wgQtvMoQvJ5H794Ev0uBGZLVtg8T/hd8zMQo1mpmrvrZ5iPaljaiVnTRA MIUIgN5y3DNqLY04RvMqWNSSJap5N6Y7hUbF8Idhgy7/2dR1mFw1xoCxQYdr68Ylnch2ECkYAfP tq9NHyb6VZYBGcSmvRIil/7gLmxOQmHzzkVrIhtLTtuZzpfgoI/om5e3jru40nbmBGxis1CEfNb QgvgUwkbzjxn0IxbNfuNLLRzLGVx/bf6sJMJWWIBeWBUGda/6DgYD1/0C/3kx+o2jbYD0NQrlwu b7jXqh1AAuTncV3M2SnOF2e+/hD+KSE4i113wxLW567sNieXCG8XmFAy36kMX0wUsUlyLzcEM0M D1Q38et3nMNWeHGQ8g3iuD5gcDA5Vd/CUX0/lnQfEZewNqAHlCD1a1R19lqm7VYdv X-Received: by 2002:a05:7300:4309:b0:2b0:6a03:e6aa with SMTP id 5a478bee46e88-2b6b4e64b35mr8304859eec.23.1768880231598; Mon, 19 Jan 2026 19:37:11 -0800 (PST) From: Julio Faracco To: devel@lists.libvirt.org Subject: [PATCH] Standardize socket family checks with proper macro Date: Tue, 20 Jan 2026 00:36:35 -0300 Message-ID: <20260120033659.58202-1-jcfaracco@gmail.com> X-Mailer: git-send-email 2.52.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: EUSMK5BOZLZHXRC6EHHNSN53DJVPFYCN X-Message-ID-Hash: EUSMK5BOZLZHXRC6EHHNSN53DJVPFYCN 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: 1768880277033158500 Content-Type: text/plain; charset="utf-8" There is a macro called VIR_SOCKET_ADDR_IS_FAMILY that checks the socket family. There are several occurrences of raw checks in libvirt code. This commit just standardizes the socket family checks by using its macro. Signed-off-by: Julio Faracco --- src/rpc/virnetsocket.c | 20 ++++++++++---------- src/util/virsocketaddr.c | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index e8fc2d5f7d..22b0aa6ead 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -276,8 +276,8 @@ virNetSocketNew(virSocketAddr *localAddr, sock->unlinkUNIX =3D unlinkUNIX; =20 /* Disable nagle for TCP sockets */ - if (sock->localAddr.data.sa.sa_family =3D=3D AF_INET || - sock->localAddr.data.sa.sa_family =3D=3D AF_INET6) { + if (VIR_SOCKET_ADDR_IS_FAMILY(&sock->localAddr, AF_INET) || + VIR_SOCKET_ADDR_IS_FAMILY(&sock->localAddr, AF_INET6)) { if (setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, &no_slow_start, sizeof(no_slow_start)) < 0) { @@ -405,9 +405,9 @@ int virNetSocketNewListenTCP(const char *nodename, * other IP protocol */ if (port !=3D 0 && service =3D=3D NULL) { - if (addr.data.sa.sa_family =3D=3D AF_INET) { + if (VIR_SOCKET_ADDR_IS_FAMILY(&addr, AF_INET)) { addr.data.inet4.sin_port =3D port; - } else if (addr.data.sa.sa_family =3D=3D AF_INET6) { + } else if (VIR_SOCKET_ADDR_IS_FAMILY(&addr, AF_INET6)) { addr.data.inet6.sin6_port =3D port; } VIR_DEBUG("Used saved port %d", port); @@ -432,9 +432,9 @@ int virNetSocketNewListenTCP(const char *nodename, } =20 if (port =3D=3D 0 && service =3D=3D NULL) { - if (addr.data.sa.sa_family =3D=3D AF_INET) + if (VIR_SOCKET_ADDR_IS_FAMILY(&addr, AF_INET)) port =3D addr.data.inet4.sin_port; - else if (addr.data.sa.sa_family =3D=3D AF_INET6) + else if (VIR_SOCKET_ADDR_IS_FAMILY(&addr, AF_INET6)) port =3D addr.data.inet6.sin6_port; VIR_DEBUG("Saved port %d", port); } @@ -1293,7 +1293,7 @@ void virNetSocketDispose(void *obj) #ifndef WIN32 /* If a server socket, then unlink UNIX path */ if (sock->unlinkUNIX && - sock->localAddr.data.sa.sa_family =3D=3D AF_UNIX && + VIR_SOCKET_ADDR_IS_FAMILY(&sock->localAddr, AF_UNIX) && sock->localAddr.data.un.sun_path[0] !=3D '\0') unlink(sock->localAddr.data.un.sun_path); #endif @@ -1370,7 +1370,7 @@ bool virNetSocketIsLocal(virNetSocket *sock) { bool isLocal =3D false; virObjectLock(sock); - if (sock->localAddr.data.sa.sa_family =3D=3D AF_UNIX) + if (VIR_SOCKET_ADDR_IS_FAMILY(&sock->localAddr, AF_UNIX)) isLocal =3D true; virObjectUnlock(sock); return isLocal; @@ -1381,7 +1381,7 @@ bool virNetSocketHasPassFD(virNetSocket *sock) { bool hasPassFD =3D false; virObjectLock(sock); - if (sock->localAddr.data.sa.sa_family =3D=3D AF_UNIX) + if (VIR_SOCKET_ADDR_IS_FAMILY(&sock->localAddr, AF_UNIX)) hasPassFD =3D true; virObjectUnlock(sock); return hasPassFD; @@ -2223,7 +2223,7 @@ void virNetSocketClose(virNetSocket *sock) #ifndef WIN32 /* If a server socket, then unlink UNIX path */ if (sock->unlinkUNIX && - sock->localAddr.data.sa.sa_family =3D=3D AF_UNIX && + VIR_SOCKET_ADDR_IS_FAMILY(&sock->localAddr, AF_UNIX) && sock->localAddr.data.un.sun_path[0] !=3D '\0') { if (unlink(sock->localAddr.data.un.sun_path) =3D=3D 0) sock->localAddr.data.un.sun_path[0] =3D '\0'; diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 4d4a6b2a0f..e8e691ce8f 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -481,7 +481,7 @@ virSocketAddrFormatFull(const virSocketAddr *addr, =20 /* Short-circuit since getnameinfo doesn't work * nicely for UNIX sockets */ - if (addr->data.sa.sa_family =3D=3D AF_UNIX) { + if (VIR_SOCKET_ADDR_IS_FAMILY(addr, AF_UNIX)) { if (withService) { addrstr =3D g_strdup_printf(VIR_LOOPBACK_IPV4_ADDR "%s0", separator ? separator : ":"); @@ -636,7 +636,7 @@ virSocketAddrGetPath(virSocketAddr *addr G_GNUC_UNUSED) return NULL; } =20 - if (addr->data.sa.sa_family !=3D AF_UNIX) { + if (!VIR_SOCKET_ADDR_IS_FAMILY(addr, AF_UNIX)) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("UNIX socket address is required")); return NULL; --=20 2.52.0