From nobody Mon Feb 2 05:57:11 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; 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=1769181274; cv=none; d=zohomail.com; s=zohoarc; b=M6qy7CLnY7V0y8xKrgkgiP12QRFfdD4lP+4yNz9qvDnYGI26QL+LeLsGiUyn8xaYmOJR38H+UtDUf3k3NbEWb4kUwenAa31s+warIO0Z42P4tM+iRSCWnMm1KbPxdTAwojQDyLmUDjneuX+KGsrPIKAm6mSWNuAkmmJVbefdfVM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769181274; 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=zvNgt0dSig6B7Nu6PvLNGlL7gGFTL3+8VUE7QsCnJn0=; b=lZ1sCzHQMD01+jDs0Uml9fqFqrOe6X3FE8LBPETxg7jl5cqdVFEFK8/tphspZXo5uAhBDBEofrgWAnuBWku2o/mqbM2SOY/omdM+4lYLbfvhPmJlqmnh/QkOW1Rh29oRQMNFQ7mvniizXbWnYm1pQho5YLs/dbjvtiFzDSGZGoo= 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 1769181274175804.6075595236164; Fri, 23 Jan 2026 07:14:34 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id 306B24191B; Fri, 23 Jan 2026 10:14:33 -0500 (EST) Received: from [172.19.199.3] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id 8383841AFC; Fri, 23 Jan 2026 10:13:54 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 92A983FCFD; Fri, 23 Jan 2026 10:13:50 -0500 (EST) Received: from mail-dy1-f180.google.com (mail-dy1-f180.google.com [74.125.82.180]) (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 EF9C4418F2 for ; Fri, 23 Jan 2026 10:13:49 -0500 (EST) Received: by mail-dy1-f180.google.com with SMTP id 5a478bee46e88-2b6fd5bec41so5577281eec.1 for ; Fri, 23 Jan 2026 07:13:49 -0800 (PST) Received: from fedora ([2804:14c:3b83:91fd::5b41]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2b73a6c4a68sm3866992eec.12.2026.01.23.07.13.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jan 2026 07:13:48 -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=-5.3 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_MED, 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=1769181229; x=1769786029; 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=zvNgt0dSig6B7Nu6PvLNGlL7gGFTL3+8VUE7QsCnJn0=; b=HdZPsL66NUNUb4Qno+9AQ9+jLMVGtSW9eK1Ot0yYoL2pGOrdUgJDgK55OVUgMjPfm7 eAo/5caZK3fNlRgEcf4pF/KMOktG+C1MnMhQdSZL6i1AN77s8BrySMlz++PHSelXxmKN /N97CM3xScxlEvqN2G7IlZD8ylXJMK646P62rbMz9BWLpdgvTR0YHZD6xww1lSUkYmwl hcLxKdQYW33XvFd/TKx/iol+0c6lC1zMzOhSoNFkNuDY74fjs0ET810m2nqHwFU8Jpxn 7JNuPvSlL7IBVMxyYlV6obcmA5tYoAOhxEcP2OW7it//uJg2bjXDyjowC2ufuQIWqLy8 Dl0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769181229; x=1769786029; 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=zvNgt0dSig6B7Nu6PvLNGlL7gGFTL3+8VUE7QsCnJn0=; b=RHNKnWrSyPY0ul0wyI43YM8kwCzIO0aWg9/Oo9PjDiZCipq+1nhCgmulxTlSW91GWZ epwp3IpPwIZkiuRj7MwyoN0EMuQYHVh6Hbp9LHndMUUyMyy81SdLE1VNmw5rrFuRLLhd yUuOVV6pfjsnvg4VyRd1vZ8FCPNfPaRBI9JJonQ86OcATNWYt4nG73zodzXRmqtM58Rc 9/b6k06XWg7SiIqVfK96qib8NNub33+yrNVZUiT6AtrhnY8TC3G1JGnqUOQWrNu99piN BbelxCLkGAvFC91ogONbtOnf7YNA83bVzKvHNx/zJQH2VTYkfME98ee8H37Z35wJ/nQF xjWA== X-Gm-Message-State: AOJu0YzIRt5w9pINZJW14IOvrrFT9645r8zayO4bDeE26xwkDVo9Y3EK 0hFGdlqwuoas6/DsPG2ie0S4VGlY6dDkbYVRBlH1n7+GatXtmKUy1kS78NlPEQ== X-Gm-Gg: AZuq6aKZmTRMrwdNNz1SkWKD8+amvSHyB9snCnTV7FX4+bYdzeoBZWqWdeFftuw2Iut mBol/RyOw34IbnCar7RhkibLu8h40Qbdlp+uIw9t9FpdH/0HEipHhA7/xX5WXkoaIOLTuuVc6Lj uF+Nn9KK6NHM9ODov+JqpwdHhWnI5FNwHHOrRGUcDcac2gaS8hf/Gh+jTjQA9VnW5GH+i/iR3ih /8gdPGZJ07shTUahDUrYSfy5OM5znpZSZT0YoXofmuUQolith4BoZa4jAbUlCKWLJ/BA/0Xy2Z6 QPneNw5VxvJQhoeyYA5j9998H8VpPwAaE6pHrLgK6+PeMlA+tBhPTYi5DhXtOMt7Kgp+62ngnqK ELweRrpSMMHOM54al0rFVpc9oEsxAvgdmA0XxcqHHnneKRZQNs3h/JRH92374Hdg7xi84CCKzGM 8I7TD66wdtepHVFtqU9gqR+kX8XzBeGTA= X-Received: by 2002:a05:7300:4351:b0:2b7:2bf3:ce05 with SMTP id 5a478bee46e88-2b7428539b7mr668709eec.28.1769181228546; Fri, 23 Jan 2026 07:13:48 -0800 (PST) From: Julio Faracco To: devel@lists.libvirt.org Subject: [PATCH v2] Standardize socket family checks Date: Fri, 23 Jan 2026 12:13:12 -0300 Message-ID: <20260123151340.72913-1-jcfaracco@gmail.com> X-Mailer: git-send-email 2.52.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Message-ID-Hash: QXOWVKVZ227AE3XQSO24TGC6LD3XOC3S X-Message-ID-Hash: QXOWVKVZ227AE3XQSO24TGC6LD3XOC3S 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: 1769181277557158500 Content-Type: text/plain; charset="utf-8" This commit standardizes socket family checks in rpc/virnetsocket.c and util/virsocketaddr.c with macro VIR_SOCKET_ADDR_IS_FAMILY. 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 1f203fb50d..929dd260af 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 : ":"); @@ -634,7 +634,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