From nobody Mon Apr 28 17:58:24 2025 X-Original-To: dev-commits-src-main@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 4ZmWQT0FYPz5tfy0; Mon, 28 Apr 2025 17:58:25 +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 4ZmWQS69gYz3JZ2; Mon, 28 Apr 2025 17:58:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745863104; 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=a5lIwOj7yz0GM7Hbi+uYHV+rLwRmoDrRc76xK7xpEeg=; b=TYdmmP+71NyAxuQiM+0mzfy13Tk+KBJPvFuRMOcEVQbHsf6J0UM3R3zg6uf/11AcpfPkFu ZD3LWKP1RjB3evjPV0qHKXln6fJpkqIfcdoQ+y8IHenY6Pb45DVAfPfXB9IXpmV4lXMAAw fKww5D/iIcHn83NtvKzsawIOGieNN0cDDmOJVgXuDyDG1ltuXWrZ14BHwHOu27mZvC0r1e ZSdq36+83kOPpI7z9z0/snYlfqjzZgDlnT1pm2rmbfuSC6f1wDtUiycZ3G5VGVbfQMG+CY SBNm4XzG961WfC/0d0rfQ4xz3Q3kNoQItoyc41s1izoQCYRC6qg9Zy4NZjlFPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745863104; a=rsa-sha256; cv=none; b=f4tY4vEEbugvuMV06MS7HLz6lkewbkXOf4iZ+/lckuBEsh3EmEwtcu0/FSo4zPJwwubGpD 0bkMnutSYojY4WzaI0IDn2FFK5stKyQf3YQADkI9nd381hwkM0ZzkiR5ap598uxRg7jZ0Z 4Jd8KxiU+XrfB3MbZIE/68KDO2FVppW3rQnaCW+ZhdoSFgBMP9WntAeCbzIkay41MqNlqJ q85FbZaL7YTtfg2yzei2u2KHdiI/+F5gPRwRjpdd/xxpUZvlqlleNfOvT9R7m0JD2OrkR1 LCdfuxeBxvZqRMWn7E9WbJSK/PcgRhKAPMB9GW34G0ouX2mPmJu72cCjdbzkhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745863104; 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=a5lIwOj7yz0GM7Hbi+uYHV+rLwRmoDrRc76xK7xpEeg=; b=QF0P0uxlIhXrL98csISfh5KppYYx7+xjZk65gPL8e/56OWwAftIXH16wLgy6711f3Y120u LjjOESOrW6c2d37MCyMLwqGAy4TEcSAvEZM3WETpw7ymkLI55wYVPaYboYMZIlV3EuB+h2 HGZmVnV7ltwCZkAItrYtDsmyFEEY/sSFU6UUh1t/KKjLwvhm0GZzDT4QSlxVbeDqPDb5Oq 0Q9f1nlwfWPiT8DtFhKtYfpUPIDjQ3Qok9K6U9l/XG5FmV600iKQgUWHN6Z8f2B577WZtb BDhnZmKhLeijwR/xH1h73WXMwcXyQJk7888QhJxGQGjjgIwn9tQjoC//By+Gbw== 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 4ZmWQS5mZNzm9F; Mon, 28 Apr 2025 17:58:24 +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 53SHwOm8044996; Mon, 28 Apr 2025 17:58:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53SHwO6M044993; Mon, 28 Apr 2025 17:58:24 GMT (envelope-from git) Date: Mon, 28 Apr 2025 17:58:24 GMT Message-Id: <202504281758.53SHwO6M044993@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: 6aeec6a74197 - main - wpa_supplicant: Use PF_LOCAL instead of PF_INET* List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 6aeec6a741975143f53feabceb1726d5033aafd6 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=6aeec6a741975143f53feabceb1726d5033aafd6 commit 6aeec6a741975143f53feabceb1726d5033aafd6 Author: Cy Schubert AuthorDate: 2025-04-28 01:16:37 +0000 Commit: Cy Schubert CommitDate: 2025-04-28 17:19:50 +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 MFC after: 2 weeks Reviewed by: kevans, philip, zarychtam_plan-b.pwste.edu.pl (mzar) Differential revision: https://reviews.freebsd.org/D50050 --- 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 d23d720789f9..3c1ff1b88044 100644 --- a/contrib/wpa/src/drivers/driver_bsd.c +++ b/contrib/wpa/src/drivers/driver_bsd.c @@ -1798,21 +1798,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,