From nobody Sun May 11 04:50:16 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Zw9K511wtz5wKmt; Sun, 11 May 2025 04:50:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Zw9K44PD1z3yj0; Sun, 11 May 2025 04:50:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746939016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EZv1/nTLsq0VULH/NBUyBMAmISbHLMKI3wd3x7rJlos=; b=HnTGIrLd/uhj4yVFe65gnmHkxn73alzJuHG1cASwOPTHlbyDO2achefmKc5Tzws+e9gIV5 dQQui5TQyuUoJvmETgAVGrClp3X7K1FCS9sciWBir0wqtkkYLn3vf5e1MM3yIbFwbT123g kmFSsVLvrVK675Jc5k/8nwYxzZ5+R6667ncfFUYfguGv2QwNq+ZW3oHKvpwP3Rf3uFLItF efY7E5XMA940KbB4QWqAzd9Jb0COs6NugHEBRNcsey0jNbr2a0+dWiLUWvlY8+DuL0HIGT emfbYqFwRQl6FwnEghED4Wr0y7CWVjOD36AnFQnwlXMYUDXguzc8pvHbnrDu+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746939016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EZv1/nTLsq0VULH/NBUyBMAmISbHLMKI3wd3x7rJlos=; b=M1Y0VY+AKapsgtcrcXBWcqt++jysmlux0hor421ON5EFHu7C2rTay+Rr1u4hbeDMQjSVGe +6mp3tifawxqlNRvBaN8VphN12cGje6rNzHzXO0MsQLD4sHLQaxcJ+dIK+IN/cbtRHGCEe 2VESm5fpqojV2+kaVsVuMy/lFvbWfrnFwxNX9NRah45wVed8JIL8r22uFEDc1jBNhhMNI7 GnXFro5ZKW9+T3+6tZELgz/NGWed7Z6Sd5hDXC+tdH0IRINAyIyTZwl/xP8peuwo6S+evb No00ELqCfv9Vn2nPqwEmXaheiTRJT21ZWomt2VAypHJAPAVOyXREG2tpgRbyFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746939016; a=rsa-sha256; cv=none; b=hGYvKtmQ89jVZczbFvSj+PVeSwvt9x3rUItWptpNs0l3Wu7PzMvSVTQh8s9x9R8Druy/Bj iJoYzWcWex4tKF10iofrtONpKBjVId6HB52CFiSbWnxImNmKywG5BguLagLTUXXVyX/Z2d BLEOlxkdSNo/FFBTJ4+B4l/kTkwjofHCDNcV4wckIqlhttHBnptZkObvOnvlkF4eLQFgkK PVqKaAAXNUS7rZrXS26DsHfBJ2Lp8sbMjzl18dW2SDItq6HKiqOQ0EfDCAzBtxByuyII0C y1bul8hqAYPUgUQNVYrxH8g8b0ighW2fHiyJ+tNI5MEfagyGJh4jyNiyUUa+Pw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Zw9K43lYGz2Kf; Sun, 11 May 2025 04:50:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54B4oGQV091484; Sun, 11 May 2025 04:50:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54B4oGfK091475; Sun, 11 May 2025 04:50:16 GMT (envelope-from git) Date: Sun, 11 May 2025 04:50:16 GMT Message-Id: <202505110450.54B4oGfK091475@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: 738c0bb0ad0b - stable/13 - wpa_supplicant: Use PF_LOCAL instead of PF_INET* List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 738c0bb0ad0b2a732841526f74af045703ec5236 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=738c0bb0ad0b2a732841526f74af045703ec5236 commit 738c0bb0ad0b2a732841526f74af045703ec5236 Author: Cy Schubert AuthorDate: 2025-04-28 01:16:37 +0000 Commit: Cy Schubert CommitDate: 2025-05-11 04:50:00 +0000 wpa_supplicant: Use PF_LOCAL instead of PF_INET* Using a local socket circumvents the issue of needing any Internet protocol (PF_INET or PF_INET6) support. We only use interface ("i" group) ioctls on this socket so we can get away with using PF_LOCAL instead of requring any Internet protocol (PF_INET or PF_INET6) support on the system. This simplifies the patch from 8c7149c73f8f. PR: 286259 Noted by: kevans Fixes: 8c7149c73f8f Reviewed by: kevans, philip, zarychtam_plan-b.pwste.edu.pl (mzar) Differential revision: https://reviews.freebsd.org/D50050 (cherry picked from commit 6aeec6a741975143f53feabceb1726d5033aafd6) --- contrib/wpa/src/drivers/driver_bsd.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/contrib/wpa/src/drivers/driver_bsd.c b/contrib/wpa/src/drivers/driver_bsd.c index e5ff319637c0..ab8f40cfd065 100644 --- a/contrib/wpa/src/drivers/driver_bsd.c +++ b/contrib/wpa/src/drivers/driver_bsd.c @@ -1767,21 +1767,11 @@ bsd_global_init(void *ctx) global->ctx = ctx; dl_list_init(&global->ifaces); - global->sock = socket(PF_INET, SOCK_DGRAM | SOCK_CLOEXEC, 0); + global->sock = socket(PF_LOCAL, SOCK_DGRAM | SOCK_CLOEXEC, 0); if (global->sock < 0) { - if (errno == EAFNOSUPPORT) { - wpa_printf(MSG_INFO, "INET not supported, trying INET6..."); - global->sock = socket(PF_INET6, SOCK_DGRAM | SOCK_CLOEXEC, 0); - if (global->sock < 0) { - wpa_printf(MSG_ERROR, "socket[PF_INET6,SOCK_DGRAM]: %s", - strerror(errno)); - goto fail1; - } - } else { - wpa_printf(MSG_ERROR, "socket[PF_INET,SOCK_DGRAM]: %s", + wpa_printf(MSG_ERROR, "socket[PF_LOCAL,SOCK_DGRAM]: %s", strerror(errno)); goto fail1; - } } global->route = socket(PF_ROUTE,